From e49e3fe4edff43e803bde29b8ead487bafa0baf1 Mon Sep 17 00:00:00 2001 From: haha Date: Thu, 17 Aug 2023 22:47:17 +0800 Subject: [PATCH] update code --- .../controller/ProblemmodifyController.java | 24 +++++++++---------- .../where/SurProjectBuildNodeDataExport.java | 4 ++++ .../service/ISmzSspProblemmodifyService.java | 4 ++-- .../impl/SmzSspProblemmodifyServiceImpl.java | 6 +++-- .../trouble/SmzSspProblemmodifyMapper.xml | 4 ++++ 5 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/where/SurProjectBuildNodeDataExport.java diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java index 17677847..94763c20 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java @@ -35,15 +35,15 @@ public class ProblemmodifyController extends BaseController { * @return */ @GetMapping("/safetySummary") - public List safetySummary(int deptId,int roleType) + public List safetySummary(int deptId,int roleType,int projectId) { //3集团//4子公司//5监理单位//6总包//7分包 - String key="problemmodify_safetySummary-"+deptId+'-'+roleType; + String key="problemmodify_safetySummary-"+deptId+"-"+roleType+"_"+projectId; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return (List) obj; } - List list = smzSspProblemmodifyService.selectSummary(deptId,roleType,0); + List list = smzSspProblemmodifyService.selectSummary(deptId,roleType,projectId,0); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return list; } @@ -56,15 +56,15 @@ public class ProblemmodifyController extends BaseController { * @return */ @GetMapping("/qualitySummary") - public List qualitySummary(int deptId,int roleType) + public List qualitySummary(int deptId,int roleType,int projectId) { //3集团//4子公司//5监理单位//6总包//7分包 - String key="problemmodify_qualitySummary-"+deptId+'-'+roleType; + String key="problemmodify_qualitySummary-"+deptId+"-"+roleType+"_"+projectId; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return (List) obj; } - List list = smzSspProblemmodifyService.selectSummary(deptId,roleType,1); + List list = smzSspProblemmodifyService.selectSummary(deptId,roleType,projectId,1); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return list; } @@ -77,15 +77,15 @@ public class ProblemmodifyController extends BaseController { * @return */ @GetMapping("/safetySummaryByProject") - public List safetySummaryByProject(int deptId,int roleType) + public List safetySummaryByProject(int deptId,int roleType,int projectId) { //3集团//4子公司//5监理单位//6总包//7分包 - String key="problemmodify_safetySummaryByProject-"+deptId+'-'+roleType; + String key="problemmodify_safetySummaryByProject-"+deptId+"-"+roleType+"_"+projectId; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return (List) obj; } - List list = smzSspProblemmodifyService.selectSummaryByProject(deptId,roleType,0); + List list = smzSspProblemmodifyService.selectSummaryByProject(deptId,roleType,projectId,0); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return list; } @@ -98,15 +98,15 @@ public class ProblemmodifyController extends BaseController { * @return */ @GetMapping("/qualitySummaryByProject") - public List qualitySummaryByProject(int deptId,int roleType) + public List qualitySummaryByProject(int deptId,int roleType,int projectId) { //3集团//4子公司//5监理单位//6总包//7分包 - String key="problemmodify_qualitySummaryByProject-"+deptId+'-'+roleType; + String key="problemmodify_qualitySummaryByProject-"+deptId+"-"+roleType+"_"+projectId; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return (List) obj; } - List list = smzSspProblemmodifyService.selectSummaryByProject(deptId,roleType,1); + List list = smzSspProblemmodifyService.selectSummaryByProject(deptId,roleType,projectId,1); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return list; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/where/SurProjectBuildNodeDataExport.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/where/SurProjectBuildNodeDataExport.java new file mode 100644 index 00000000..7717bed0 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/where/SurProjectBuildNodeDataExport.java @@ -0,0 +1,4 @@ +package com.yanzhu.jh.project.domain.where; + +public class SurProjectBuildNodeDataExport { +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java index 5bc0bd2d..93745c57 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java @@ -67,7 +67,7 @@ public interface ISmzSspProblemmodifyService * @param infoType 信息类型（0安全，1质量） * @return */ - public List selectSummary(int deptId, int roleType, int infoType); + public List selectSummary(int deptId, int roleType,int projectId, int infoType); /** * 分类汇总(按项目) @@ -76,7 +76,7 @@ public interface ISmzSspProblemmodifyService * @param infoType 信息类型（0安全，1质量） * @return */ - public List selectSummaryByProject(int deptId, int roleType, int infoType); + public List selectSummaryByProject(int deptId, int roleType,int projectId, int infoType); public List countByDate(SmzSspProblemmodifyWhere where); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java index eb618d55..f5fc80c6 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java @@ -96,18 +96,20 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi } @Override - public List selectSummary(int deptId, int roleType, int infoType) { + public List selectSummary(int deptId, int roleType,int projectId, int infoType) { SmzSspProblemmodify smzSspProblemmodify=new SmzSspProblemmodify(); smzSspProblemmodify.setRoleType(roleType); + smzSspProblemmodify.setProjectId((long)projectId); smzSspProblemmodify.setInfoType((long)infoType); smzSspProblemmodify.setId((long)deptId); return smzSspProblemmodifyMapper.selectSummary(smzSspProblemmodify); } @Override - public List selectSummaryByProject(int deptId, int roleType, int infoType) { + public List selectSummaryByProject(int deptId, int roleType,int projectId, int infoType) { SmzSspProblemmodify smzSspProblemmodify=new SmzSspProblemmodify(); smzSspProblemmodify.setRoleType(roleType); + smzSspProblemmodify.setProjectId((long)projectId); smzSspProblemmodify.setInfoType((long)infoType); smzSspProblemmodify.setId((long)deptId); return smzSspProblemmodifyMapper.selectSummaryByProject(smzSspProblemmodify); diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index 264fd264..e26f0494 100644 --- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -206,6 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ( SELECT danger_type,COUNT(1) cnt FROM smz_ssp_problemmodify WHERE projectId IN( SELECT id FROM sur_project where isDel=0 + and projectId=#{projectId} AND deptid = #{id} ) AND infotype=#{infoType} and isDel=0 @@ -218,6 +219,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ( select projectId,prjName,count(1) proble from vw_smz_ssp_problemmodify_audit where infoType=#{infoType} + and projectId=#{projectId} AND deptid = #{id} AND roletype=#{roleType} group by projectId,prjName @@ -227,6 +229,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select projectid,count(1) timoutNoComp from vw_smz_ssp_problemmodify_audit where ((updateTime is null and date(nickedTime) < date(now()) ) or date(updateTime )>date(nickedTime)) and infoType=#{infoType} + and projectId=#{projectId} AND deptid = #{id} AND roletype=#{roleType} group by projectId @@ -235,6 +238,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ( SELECT projectid,COUNT(1) timoutComp FROM vw_smz_ssp_problemmodify_audit WHERE (updateTime is null and date(nickedTime) < date(now()) ) and infoType=#{infoType} + and projectId=#{projectId} AND deptid = #{id} AND roletype=#{roleType} GROUP BY projectid