diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 704976d9..e5e52a18 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -30,6 +30,12 @@ public class BaseEntity implements Serializable * 保存项目ID列表,用于B类用户 b.监理单位、总包单位、分包单位用户不展示项目概况菜单,二级菜单只展示自已参与的项目 */ private List prjIds; + + /** + * 项目类型 + */ + private String proType; + /** 搜索值 */ @JsonIgnore private String searchValue; @@ -192,4 +198,12 @@ public class BaseEntity implements Serializable { this.params = params; } + + public String getProType() { + return proType; + } + + public void setProType(String proType) { + this.proType = proType; + } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java index 465b327c..7b4d36ad 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java @@ -141,6 +141,6 @@ public class SecurityUtils public static boolean isUserB() { long roleId=getRoleId(); - return 5==roleId || 6==roleId || 7==roleId || 99==roleId||15==roleId||16==roleId||17==roleId; + return 5==roleId || 6==roleId || 7==roleId || 99==roleId || 15==roleId || 16==roleId || 17==roleId; } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java index f87bc815..22bd051a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java @@ -2,6 +2,10 @@ package com.ruoyi.common.utils.sign; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; +import java.util.List; +import java.util.Objects; + +import com.ruoyi.common.core.text.Convert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -82,6 +86,23 @@ public class Md5Utils } } + public static String hash(List objs) + { + if(objs==null){ + return null; + } + String s = objs.toString(); + try + { + return new String(toHex(md5(s)).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8); + } + catch (Exception e) + { + log.error("not supported charset...{}", e); + return s; + } + } + public static String hash(String s) { try diff --git a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml index e5f90ca7..87bb7455 100644 --- a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml @@ -152,8 +152,9 @@ SELECT a.dict_label taskName,b.cnt assigneeId,c.cnt procDefVersion FROM ( SELECT * FROM sys_dict_data WHERE dict_type = 'sys_process_category') a LEFT JOIN (SELECT category,COUNT(1) cnt FROM vw_flow_all WHERE finishTime IS NOT NULL - and businessDeptId=#{deployId} + and businessDeptId=#{projectDeptId} and businessKey=#{businessKey} + and businessType = #{proType} and businessKey in @@ -163,8 +164,9 @@ GROUP BY category) b ON a.dict_value=b.category LEFT JOIN (SELECT category,COUNT(1) cnt FROM vw_flow_all WHERE finishTime IS NULL AND taskName!='提交申请' - and businessDeptId=#{deployId} + and businessDeptId=#{projectDeptId} and businessKey=#{businessKey} + and businessType = #{proType} and businessKey in @@ -174,11 +176,13 @@ GROUP BY category) c ON a.dict_value=c.category + + + - SELECT * FROM vw_flow_all - and category = #{category} - and businessDeptId=#{deptId} - and businessKey=#{projectId} - - and businessKey in - - #{item} - - + and category = #{category} + and businessDeptId=#{deptId} + and businessType = #{proType} + and businessKey=#{projectId} + + and businessKey in + + #{item} + + - SELECT * FROM vw_flow_all WHERE finishTime IS NULL AND taskName LIKE '总包%' @@ -360,6 +383,7 @@ AND taskName LIKE '工程%' and businessDeptId=#{deptId} + and businessType = #{proType} and businessKey=#{projectId} and businessKey in @@ -368,16 +392,18 @@ + @@ -420,6 +447,7 @@ FROM vw_flow_all fa + and fa.businessType = #{proType} and fa.procDefKey = #{procDefKey} and fa.businessKey = #{businessKey} diff --git a/sql/SQL集合.txt b/sql/SQL集合.txt index da0231f7..12433971 100644 --- a/sql/SQL集合.txt +++ b/sql/SQL集合.txt @@ -52,6 +52,7 @@ CREATE VIEW vw_flow_all AS ( DEF.KEY_ AS procDefKey, sp.id AS businessKey, sp.deptId as businessDeptId, + sp.projectType as businessType, sp.projectName AS businessKeyName, ru.user_id AS startUserId, ru.nick_name AS startUserName, @@ -107,6 +108,7 @@ CREATE VIEW vw_flow_await AS (SELECT DEF.KEY_ AS procDefKey, sp.id AS businessKey, sp.deptId AS businessDeptId, + sp.projectType AS businessType, sp.projectName AS businessKeyName, ru.user_id AS startUserId, ru.nick_name AS startUserName, @@ -152,49 +154,6 @@ WHERE ##审批意见 DROP view vw_flow_comment; CREATE VIEW vw_flow_comment AS ( -SELECT - hc.ID_ AS commentId, - hc.TYPE_ AS commentType, - ht.ID_ AS taskId, - ht.NAME_ AS taskName, - ht.REV_ AS rev, - CASE -WHEN hc.TYPE_ = 1 -AND ht.REV_ != 2 THEN - '通过' -WHEN hc.TYPE_ != 1 THEN - '驳回' -END AS commentResult, - ht.PROC_INST_ID_ AS procInstId, - ht.TASK_DEF_KEY_ AS taskDefKey, - ht.EXECUTION_ID_ AS executionId, - ht.DELETE_REASON_ AS deleteReason, - DATE_FORMAT( - ht.START_TIME_, - '%Y-%m-%d %H:%i:%S' -) AS startTime, - DATE_FORMAT( - ht.END_TIME_, - '%Y-%m-%d %H:%i:%S' -) AS endTime, - ht.DURATION_ AS duration, - hc.MESSAGE_ AS message, - ru.nick_name AS assigneeName, - rd.dept_name AS deptName, -r.role_name as candidate -FROM - act_hi_taskinst ht -LEFT JOIN act_hi_comment hc ON hc.TASK_ID_ = ht.ID_ -LEFT JOIN act_hi_identitylink hi on hi.TASK_ID_ = ht.ID_ and hi.TYPE_ = 'candidate' -left JOIN sys_role r on r.role_id = hi.group_Id_ -LEFT JOIN sys_user ru ON ru.user_id = ht.ASSIGNEE_ -LEFT JOIN sys_dept rd ON rd.dept_id = ru.dept_id -where hc.TYPE_ is null or hc.TYPE_!='event' -) - -##审批意见V2 -DROP view vw_flow_comment; -CREATE VIEW vw_flow_comment AS ( SELECT hc.ID_ AS commentId, hc.TYPE_ AS commentType, @@ -264,6 +223,7 @@ DEF.END_TIME_ as finishTime, pd.KEY_ AS procDefKey, sp.id AS businessKey, sp.deptId AS businessDeptId, + sp.projectType AS businessType, sp.projectName AS businessKeyName, ru.user_id AS startUserId, ru.nick_name AS startUserName, @@ -279,6 +239,7 @@ LEFT JOIN sys_dept rd ON rd.dept_id = ru.dept_id WHERE RES.ASSIGNEE_ is not null and RES.END_TIME_ is not null) + ##君哥其它sql CREATE VIEW vw_smz_ssp_problemmodify_audit AS diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java index 94d4f80c..c2e406a0 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java @@ -1,8 +1,10 @@ package com.yanzhu.jh.bigscreen.web.controller; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.system.service.ISysDeptService; import com.yanzhu.jh.work.domain.WorkFile; @@ -13,6 +15,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.concurrent.TimeUnit; + /** * 工作传达文件Conller */ @@ -20,6 +25,9 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/bgscreen/workfile") public class BgWorkFileController extends BaseController { + @Autowired + private RedisCache redisCache; + @Autowired IWorkFileService workFileService; @@ -33,6 +41,11 @@ public class BgWorkFileController extends BaseController { */ @GetMapping("/getWorkFileList") public TableDataInfo getWorkFileList(String fileBelong,long deptId){ + String key="bgscreen_workfile_getWorkFileList_"+fileBelong+"-"+deptId; + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); + } WorkFile workFile = new WorkFile(); workFile.setFileBelong(fileBelong); workFile.setDeptId(deptId); @@ -41,7 +54,10 @@ public class BgWorkFileController extends BaseController { workFile.setDeptId(sysDeptService.getRootDept(getDeptId())); } } - return getDataTable(workFileService.selectWorkFileListLimit20(workFile)); + clearPage(); + List list = workFileService.selectWorkFileListLimit20(workFile); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return getDataTable(list); } /** diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java index 7bbfc137..116f763c 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java @@ -1,18 +1,25 @@ package com.yanzhu.jh.bigscreen.web.controller; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.page.TableSupport; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; -import com.yanzhu.jh.project.domain.SurProjectDeptWroks; +import com.ruoyi.common.utils.sign.Md5Utils; import com.yanzhu.jh.work.domain.WorkTrain; import com.yanzhu.jh.work.service.IWorkTrainService; +import liquibase.util.MD5Util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; +import java.util.concurrent.TimeUnit; /** * 培训演训Conller @@ -21,6 +28,9 @@ import java.util.List; @RequestMapping("/bgscreen/workTrain") public class BgWorkTrainController extends BaseController { + @Autowired + private RedisCache redisCache; + @Autowired IWorkTrainService workTrainService; @@ -30,7 +40,12 @@ public class BgWorkTrainController extends BaseController { * @return */ @GetMapping("/getWorkTrainList") - public TableDataInfo getWorkTrainList(String trainType,String deptId,String projectId){ + public TableDataInfo getWorkTrainList(String trainType,String deptId,String projectId,String proType){ + String key="bgscreen_workTrain_getWorkTrainList_"+trainType+"-"+deptId+"-"+projectId+"-"+proType; + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); + } WorkTrain workTrain = new WorkTrain(); workTrain.setTrainType(trainType); if(deptId!=null && !"0".equals(deptId)){ @@ -43,7 +58,12 @@ public class BgWorkTrainController extends BaseController { if(projectId!=null && !"0".equals(projectId)){ workTrain.setProjectId(Convert.toLong(projectId)); } - return getDataTable(workTrainService.selectBgscreenWorkTrainListv2(workTrain)); + if(proType!=null && !"0".equals(proType)){ + workTrain.setProType(projectId); + } + List list = workTrainService.selectBgscreenWorkTrainListv2(workTrain); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return getDataTable(list); } /** @@ -51,7 +71,7 @@ public class BgWorkTrainController extends BaseController { * @return */ @GetMapping("/getGroupByDataType") - public AjaxResult getGroupByDataType(String deptId, String projectId){ + public AjaxResult getGroupByDataType(String deptId, String projectId,String proType){ WorkTrain workTrain = new WorkTrain(); if(deptId!=null && !"0".equals(deptId)){ workTrain.setNowDept(deptId); @@ -60,14 +80,35 @@ public class BgWorkTrainController extends BaseController { workTrain.setPrjIds(getProjectIds()); } } + String key="bgscreen_workTrain_getGroupByDataType_"+deptId+"-"+projectId+"-"+proType+Md5Utils.hash(workTrain.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } if(projectId!=null && !"0".equals(projectId)){ workTrain.setProjectId(Convert.toLong(projectId)); } - return AjaxResult.success(workTrainService.getGroupByDataType(workTrain)); + if(proType!=null && !"0".equals(proType)){ + workTrain.setProType(projectId); + } + List list = workTrainService.getGroupByDataType(workTrain); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); } + /** + * deptId: this.deptId, + * projectId: this.projectId, + * trainType: this.trainType, + * dataType: this.nav + * @param where + * @return + */ @PostMapping("/queryWorkTrainList") public TableDataInfo queryWorkTrainList(@RequestBody WorkTrain where){ + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); Long deptId= where.getDeptId(); if(deptId!=null && deptId>0){ where.setNowDept(""+deptId); @@ -76,8 +117,18 @@ public class BgWorkTrainController extends BaseController { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_workTrain_queryWorkTrainList_"+pageNum+"-"+pageSize+"-"+where.getDeptId()+"-"+where.getProjectId()+"-"+where.getTrainType()+"-"+where.getDataType()+"-"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); + } + + if(StringUtils.isEmpty(where.getProType()) || "0".equals(where.getProType())){ + where.setProType(null); + } startPage(); List list=workTrainService.queryWorkTrainList(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return getDataTable(list); } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java index 4ee95d27..ae8d42e6 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java @@ -3,9 +3,12 @@ package com.yanzhu.jh.bigscreen.web.controller; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.page.TableSupport; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.sign.Md5Utils; import com.ruoyi.flowable.service.IFlowBusinessKeyService; import com.ruoyi.system.domain.FlowTaskEntity; import com.yanzhu.jh.bigscreen.web.vo.FlowTypeMapper; @@ -18,6 +21,7 @@ import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/bgscreen/flow") public class FloweController extends BaseController { + @Autowired IFlowBusinessKeyService flowBusinessKeyService; @@ -25,41 +29,43 @@ public class FloweController extends BaseController { private RedisCache redisCache; @GetMapping("/groupByCategory") - public AjaxResult groupByCategory(long deptId,long projectId){ - String key="bgscreen_flow_groupByCategory_"+deptId+"_"+projectId; - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } - + public AjaxResult groupByCategory(long deptId,long projectId,long proType){ FlowTaskEntity where=new FlowTaskEntity(); if(deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } - where.setDeployId(deptId<1?null:""+deptId); + String key="bgscreen_flow_groupByCategory_"+deptId+"_"+projectId+"_"+proType+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + where.setProjectDeptId(deptId<1?null:""+deptId); where.setBusinessKey(projectId<1?null:""+projectId); + where.setProType(proType<1?null:""+proType); List list=flowBusinessKeyService.groupByCategory(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } @GetMapping("/groupByUnit") - public AjaxResult groupByUnit(long deptId,long projectId){ - String key="bgscreen_flow_groupByUnit_"+deptId+"_"+projectId; - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } + public AjaxResult groupByUnit(long deptId,long projectId,long proType){ FlowTaskEntity where=new FlowTaskEntity(); if(deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } - where.setDeployId(deptId<1?"":""+deptId); + String key="bgscreen_flow_groupByUnit_"+deptId+"_"+projectId+"_"+proType+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + + where.setProjectDeptId(deptId<1?"":""+deptId); where.setBusinessKey(projectId<1?"":""+projectId); + where.setProType(proType<1?null:""+proType); List list=flowBusinessKeyService.groupByUnit(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); @@ -67,20 +73,22 @@ public class FloweController extends BaseController { @GetMapping("/groupByUnitFinish") - public AjaxResult groupByUnitFinish(long deptId,long projectId){ - String key="bgscreen_flow_groupByUnitFinish_"+deptId+"_"+projectId; - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } + public AjaxResult groupByUnitFinish(long deptId,long projectId,long proType){ FlowTaskEntity where=new FlowTaskEntity(); if(deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } - where.setDeployId(deptId<1?"":""+deptId); + String key="bgscreen_flow_groupByUnitFinish_"+deptId+"_"+projectId+"_"+proType+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + + where.setProjectDeptId(deptId<1?"":""+deptId); where.setBusinessKey(projectId<1?"":""+projectId); + where.setProType(proType<1?null:""+proType); List list=flowBusinessKeyService.groupByUnitFinish(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); @@ -88,68 +96,101 @@ public class FloweController extends BaseController { @GetMapping("/groupByUnitTotal") - public AjaxResult groupByUnitTotal(long deptId,long projectId){ - String key="bgscreen_flow_groupByUnitTotal_"+deptId+"_"+projectId; - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } + public AjaxResult groupByUnitTotal(long deptId,long projectId,long proType){ FlowTaskEntity where=new FlowTaskEntity(); if(deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } - where.setDeployId(deptId<1?"":""+deptId); + String key="bgscreen_flow_groupByUnitTotal_"+deptId+"_"+projectId+"_"+proType+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + + where.setProjectDeptId(deptId<1?"":""+deptId); where.setBusinessKey(projectId<1?"":""+projectId); + where.setProType(proType<1?null:""+proType); List list=flowBusinessKeyService.groupByUnitTotal(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } - - @PostMapping("/listByUnit") public TableDataInfo listByUnit(@RequestBody FlowTaskEntity where){ + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); if(where.getDeptId()<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_flow_listByUnit_"+pageNum+"-"+pageSize+"-"+where.getDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+"_"+where.getTaskId()+Md5Utils.hash(where.getPrjIds()); + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); + } + startPage(); List list=flowBusinessKeyService.listByUnit(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return getDataTable(list); } @PostMapping("/listByCategory") public TableDataInfo listByCategory(@RequestBody FlowTaskEntity where){ + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); if(where.getDeptId()<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_flow_listByCategory_"+pageNum+"-"+pageSize+"-"+where.getDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+"_"+where.getCategory()+Md5Utils.hash(where.getPrjIds()); + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); + } startPage(); List list=flowBusinessKeyService.listByCategory(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return getDataTable(list); } - @PostMapping("/listByState") public TableDataInfo listByState(@RequestBody FlowTaskEntity where){ - startPage(); - List list=flowBusinessKeyService.listByState(where); if(where.getDeptId()<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + String key="bgscreen_flow_listByState_"+pageNum+"-"+pageSize+"-"+where.getDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+"_"+where.getTaskId()+Md5Utils.hash(where.getPrjIds()); + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); + } + startPage(); + List list=flowBusinessKeyService.listByState(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return getDataTable(list); } @GetMapping("/groupByProject") public AjaxResult groupByProject(long deptId){ + String key="bgscreen_flow_groupByProject_"+deptId; + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } List list=flowBusinessKeyService.groupByProject(deptId); - return AjaxResult.success(list); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return success(list); } /** @@ -157,21 +198,23 @@ public class FloweController extends BaseController { * JiangYuQi */ @GetMapping("/findSafetyWorkList") - public AjaxResult findSafetyWorkList(long deptId,long projectId,String flowType){ - String key="bgscreen_flow_findSafetyWorkList_"+deptId+"_"+projectId+"_"+flowType; - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } + public AjaxResult findSafetyWorkList(long deptId,long projectId,String flowType,long proType){ FlowTaskEntity where=new FlowTaskEntity(); if(deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_flow_findSafetyWorkList_"+deptId+"_"+projectId+"_"+flowType+"_"+proType+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + where.setProcDefKey(FlowTypeMapper.getFlowProcdefKey(flowType)); where.setProjectDeptId(deptId<1?"":""+deptId); where.setBusinessKey(projectId<1?"":""+projectId); + where.setProType(proType<1?null:""+proType); List list=flowBusinessKeyService.findSafetyWorkList(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/JournalismConller.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/JournalismConller.java index a1bdfa3b..b6d7e327 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/JournalismConller.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/JournalismConller.java @@ -1,14 +1,22 @@ package com.yanzhu.jh.bigscreen.web.controller; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.page.TableSupport; +import com.ruoyi.common.core.redis.RedisCache; +import com.yanzhu.jh.work.domain.WorkJournalism; import com.yanzhu.jh.work.service.IWorkJournalismService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.concurrent.TimeUnit; + /** * 集团新闻Conller */ @@ -16,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/bgscreen/journalism") public class JournalismConller extends BaseController { + @Autowired + private RedisCache redisCache; + @Autowired IWorkJournalismService workJournalismService; @@ -25,7 +36,17 @@ public class JournalismConller extends BaseController { */ @GetMapping("/getJournalismList") public TableDataInfo getJournalismList(){ - return getDataTable(workJournalismService.selectBgscreenWorkJournalismList()); + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + String key="bgscreen_journalism_getJournalismList_"+pageNum+"-"+pageSize; + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); + } + List list = workJournalismService.selectBgscreenWorkJournalismList(); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return getDataTable(list); } /** 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 fd32d675..108f7e4e 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 @@ -1,6 +1,5 @@ package com.yanzhu.jh.bigscreen.web.controller; - import cn.hutool.core.date.DateUtil; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; @@ -8,52 +7,50 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.sign.Md5Utils; import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; import com.yanzhu.jh.trouble.domain.where.SmzSspProblemmodifyWhere; import com.yanzhu.jh.trouble.service.ISmzSspProblemmodifyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/bgscreen/problemmodify") public class ProblemmodifyController extends BaseController { + @Autowired private RedisCache redisCache; - @Autowired private ISmzSspProblemmodifyService smzSspProblemmodifyService; /** * 质量整改-安全分类汇总(按分类) - * @param deptId - * @param roleType + * @param where 查询条件 * @return */ @PostMapping("/safetySummary") public List safetySummary(@RequestBody SmzSspProblemmodifyWhere where) { - //3集团//4子公司//5监理单位//6总包//7分包 - where.setInfoType(0l); - String startDate=where.getStartDate()==null?"":DateUtil.format(where.getStartDate(),"yyyy-MM-dd"); - String endDate=where.getEndDate()==null?"":DateUtil.format(where.getEndDate(),"yyyy-MM-dd"); - String key="problemmodify_safetySummary-"+where.getDeptId()+"-"+where.getRoleType()+"_"+where.getProjectId()+"-"+startDate+"_"+endDate; - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return (List) obj; - } Long deptId=where.getDeptId(); if(deptId==null||deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + //3集团//4子公司//5监理单位//6总包//7分包 + where.setInfoType(0l); + String startDate=where.getStartDate()==null?"":DateUtil.format(where.getStartDate(),"yyyy-MM-dd"); + String endDate=where.getEndDate()==null?"":DateUtil.format(where.getEndDate(),"yyyy-MM-dd"); + String key="problemmodify_safetySummary-"+where.getDeptId()+"-"+where.getRoleType()+"_"+where.getProType()+"_"+where.getProjectId()+"-"+startDate+"_"+endDate+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return (List) obj; + } List list = smzSspProblemmodifyService.selectSummary(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return list; @@ -62,28 +59,27 @@ public class ProblemmodifyController extends BaseController { /** * 质量整改-质量分类汇总(按分类) - * @param deptId - * @param roleType + * @param where 查询条件 * @return */ @PostMapping("/qualitySummary") public List qualitySummary(@RequestBody SmzSspProblemmodifyWhere where) { - //3集团//4子公司//5监理单位//6总包//7分包 - where.setInfoType(1l); - String startDate=where.getStartDate()==null?"":DateUtil.format(where.getStartDate(),"yyyy-MM-dd"); - String endDate=where.getEndDate()==null?"":DateUtil.format(where.getEndDate(),"yyyy-MM-dd"); - String key="problemmodify_qualitySummary-"+where.getDeptId()+"-"+where.getRoleType()+"_"+where.getProjectId()+"-"+startDate+"_"+endDate; - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return (List) obj; - } Long deptId=where.getDeptId(); if(deptId==null||deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + //3集团//4子公司//5监理单位//6总包//7分包 + where.setInfoType(1l); + String startDate=where.getStartDate()==null?"":DateUtil.format(where.getStartDate(),"yyyy-MM-dd"); + String endDate=where.getEndDate()==null?"":DateUtil.format(where.getEndDate(),"yyyy-MM-dd"); + String key="problemmodify_qualitySummary-"+where.getDeptId()+"-"+where.getProType()+"-"+where.getRoleType()+"_"+where.getProjectId()+"-"+startDate+"_"+endDate+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return (List) obj; + } List list = smzSspProblemmodifyService.selectSummary(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return list; @@ -96,23 +92,23 @@ public class ProblemmodifyController extends BaseController { * @return */ @PostMapping("/safetySummaryByProject") - public List safetySummaryByProject(@RequestBody SmzSspProblemmodifyWhere where) + public List safetySummaryByProject(@RequestBody SmzSspProblemmodifyWhere where) { - //3集团//4子公司//5监理单位//6总包//7分包 - where.setInfoType(0l); - String startDate=where.getStartDate()==null?"":DateUtil.format(where.getStartDate(),"yyyy-MM-dd"); - String endDate=where.getEndDate()==null?"":DateUtil.format(where.getEndDate(),"yyyy-MM-dd"); - String key="problemmodify_safetySummaryByProject-"+where.getDeptId()+"-"+where.getRoleType()+"_"+where.getProjectId()+"-"+startDate+"_"+endDate; - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return (List) obj; - } Long deptId=where.getDeptId(); if(deptId==null||deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + //3集团//4子公司//5监理单位//6总包//7分包 + where.setInfoType(0l); + String startDate=where.getStartDate()==null?"":DateUtil.format(where.getStartDate(),"yyyy-MM-dd"); + String endDate=where.getEndDate()==null?"":DateUtil.format(where.getEndDate(),"yyyy-MM-dd"); + String key="problemmodify_safetySummaryByProject-"+where.getDeptId()+"-"+where.getProType()+"-"+where.getRoleType()+"_"+where.getProjectId()+"-"+startDate+"_"+endDate+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return (List) obj; + } List list = smzSspProblemmodifyService.selectSummaryByProject(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return list; @@ -121,29 +117,28 @@ public class ProblemmodifyController extends BaseController { /** * 质量整改-安全分类汇总(按项目) - * @param deptId - * @param roleType + * @param where 查询条件 * @return */ @PostMapping("/qualitySummaryByProject") public List qualitySummaryByProject(@RequestBody SmzSspProblemmodifyWhere where) { - //3集团//4子公司//5监理单位//6总包//7分包 int deptId,int roleType,int projectId - where.setInfoType(1l); - String startDate=where.getStartDate()==null?"":DateUtil.format(where.getStartDate(),"yyyy-MM-dd"); - String endDate=where.getEndDate()==null?"":DateUtil.format(where.getEndDate(),"yyyy-MM-dd"); - String key="problemmodify_qualitySummaryByProject-"+where.getDeptId()+"-"+where.getRoleType()+"_"+where.getProjectId()+"-"+startDate+"_"+endDate; - - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return (List) obj; - } Long deptId=where.getDeptId(); if(deptId==null||deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + //3集团//4子公司//5监理单位//6总包//7分包 int deptId,int roleType,int projectId + where.setInfoType(1l); + String startDate=where.getStartDate()==null?"":DateUtil.format(where.getStartDate(),"yyyy-MM-dd"); + String endDate=where.getEndDate()==null?"":DateUtil.format(where.getEndDate(),"yyyy-MM-dd"); + String key="problemmodify_qualitySummaryByProject-"+where.getDeptId()+"-"+where.getProType()+"-"+where.getRoleType()+"_"+where.getProjectId()+"-"+startDate+"_"+endDate+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return (List) obj; + } + List list = smzSspProblemmodifyService.selectSummaryByProject(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return list; @@ -151,27 +146,43 @@ public class ProblemmodifyController extends BaseController { @PostMapping("/countByDate") public AjaxResult countByDate(@RequestBody SmzSspProblemmodifyWhere where){ - List list=smzSspProblemmodifyService.countByDate(where); Long deptId=where.getDeptId(); if(deptId==null||deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + + String key="problemmodify_countByDate-"+where.getDeptId()+"-"+where.getProjectId()+"-"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + + List list=smzSspProblemmodifyService.countByDate(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } @PostMapping("/countByDateRange") public AjaxResult countByDateRange(@RequestBody SmzSspProblemmodifyWhere where){ - List list=smzSspProblemmodifyService.countByDateRange(where); Long deptId=where.getDeptId(); if(deptId==null||deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="problemmodify_countByDateRange-"+where.getDeptId()+"-"+where.getProjectId()+"-"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + + List list=smzSspProblemmodifyService.countByDateRange(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } + @PostMapping("/groupByInfotypeCheckState") public AjaxResult groupByInfotypeCheckState(@RequestBody SmzSspProblemmodifyWhere where){ Long deptId=where.getDeptId(); @@ -180,12 +191,19 @@ public class ProblemmodifyController extends BaseController { where.setPrjIds(getProjectIds()); } } + String key="problemmodify_groupByInfotypeCheckState-"+where.getDeptId()+"-"+where.getProjectId()+"-"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + List list=smzSspProblemmodifyService.groupByInfotypeCheckState(where); - SmzSspProblemmodify obj=new SmzSspProblemmodify(); - obj.setId(smzSspProblemmodifyService.countTimeout(where)); - obj.setCheckState(5l); - obj.setInfoType(where.getInfoType()); - list.add(obj); + SmzSspProblemmodify spObj=new SmzSspProblemmodify(); + spObj.setId(smzSspProblemmodifyService.countTimeout(where)); + spObj.setCheckState(5l); + spObj.setInfoType(where.getInfoType()); + list.add(spObj); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } @@ -195,21 +213,25 @@ public class ProblemmodifyController extends BaseController { * @return */ @GetMapping("/getMonitAndWarning") - public AjaxResult getMonitAndWarning(long deptId,long projectId){ - String key="problemmodify_getMonitAndWarning-"+deptId+"_"+projectId; - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } + public AjaxResult getMonitAndWarning(long deptId,long projectId,String proType){ SmzSspProblemmodifyWhere where=new SmzSspProblemmodifyWhere(); - where.setDeptId(deptId); - where.setProjectId(projectId); - where.setStartDate(new Date()); if(deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="problemmodify_getMonitAndWarning-"+deptId+"_"+projectId+"_"+proType+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + + where.setDeptId(deptId); + where.setProjectId(projectId); + where.setStartDate(new Date()); + if(StringUtils.isNotNull(proType) && Objects.equals(proType,"0")){ + where.setProType(proType); + } Map>> map=new HashMap<>(); //map.put("today",smzSspProblemmodifyService.countByDate(where)); @@ -233,6 +255,14 @@ public class ProblemmodifyController extends BaseController { where.setPrjIds(getProjectIds()); } } - return AjaxResult.success(smzSspProblemmodifyService.selectSmzSspProblemmodifyListAndUnitName(where)); + String params = Md5Utils.hash(deptId+"_"+where.getProjectId()+"_"+where.getInfoType()+"_"+where.getRoleType()+"_"+where.getActiveName()+"_"+where.getCheckState()+"_"+where.getStartDate()+"_"+where.getEndDate()+where.getProType()+Md5Utils.hash(where.getPrjIds())); + String key="problemmodify_getMonitAndWarning-"+params; + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List list = smzSspProblemmodifyService.selectSmzSspProblemmodifyListAndUnitName(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); } } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java index 71b18c3c..0492f5f8 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java @@ -2,13 +2,18 @@ package com.yanzhu.jh.bigscreen.web.controller; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.page.TableSupport; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.sign.Md5Utils; import com.yanzhu.jh.project.domain.SurProjectAttendanceData; import com.yanzhu.jh.project.domain.SurProjectAttendanceUser; import com.yanzhu.jh.project.domain.SurProjectDeptWroks; @@ -20,9 +25,9 @@ import com.yanzhu.jh.project.service.ISurProjectWorkAttendanceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; +import java.util.concurrent.TimeUnit; /** * 在岗出勤Conller @@ -31,6 +36,9 @@ import java.util.List; @RequestMapping("/bgscreen/attendance") public class ProjectAttendanceController extends BaseController { + @Autowired + private RedisCache redisCache; + @Autowired ISurProjectWorkAttendanceService surProjectWorkAttendanceService; @@ -43,9 +51,8 @@ public class ProjectAttendanceController extends BaseController { @Autowired ISurProjectAttendanceUserService attendanceUserService; - @Autowired - HttpServletRequest request; /** + * ---------------------【暂停使用】 * 查询在岗人数 * @param deptId * @param projectId @@ -54,7 +61,6 @@ public class ProjectAttendanceController extends BaseController { @GetMapping("/getDeptWorksList") public TableDataInfo getDeptWorksList(String deptId,String projectId){ SurProjectDeptWroks surProjectDeptWroks = new SurProjectDeptWroks(); - if(deptId!=null && !"0".equals(deptId)){ surProjectDeptWroks.setDeptId(Convert.toLong(deptId)); }else{ @@ -68,6 +74,12 @@ public class ProjectAttendanceController extends BaseController { return getDataTable(surProjectDeptWroksService.selectBgscreenDeptWroksList(surProjectDeptWroks)); } + /** + * ---------------------【暂停使用】 + * 查询在岗人员列表 + * @param where 查询条件 + * @return + */ @PostMapping("selectList") public TableDataInfo selectList(@RequestBody SurProjectDeptWroks where){ startPage(); @@ -82,6 +94,7 @@ public class ProjectAttendanceController extends BaseController { } /** + * ---------------------【暂停使用】 * 查询出勤列表 * @param deptId * @param projectId @@ -116,14 +129,21 @@ public class ProjectAttendanceController extends BaseController { */ @PostMapping("/groupByComany") public AjaxResult groupByComany(@RequestBody SurProjectAttendanceData where){ - Long deptId= where.getDeptId(); + Long deptId = where.getDeptId(); if(deptId==null || deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_attendance_groupByComany-"+where.getDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + where.setAttendanceTime(DateUtil.formatDate(DateTime.now())); List list=attendanceDataService.groupTodayCompanyTypeId(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } @@ -135,7 +155,13 @@ public class ProjectAttendanceController extends BaseController { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_attendance_groupAllByComany-"+where.getDeptId()+"-"+where.getSubDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } List list=attendanceDataService.groupAllByComany(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } @@ -153,12 +179,21 @@ public class ProjectAttendanceController extends BaseController { where.setPrjIds(getProjectIds()); } } + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + String key="bgscreen_attendance_workerOnDuty-"+pageNum+"-"+pageSize+"-"+where.getId()+"-"+where.getDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); + } + startPage(); List list=attendanceUserService.queryWorkerOnDuty(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return getDataTable(list); } - /** * 按部门汇总在岗人数 * @param where @@ -172,7 +207,14 @@ public class ProjectAttendanceController extends BaseController { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_attendance_groupByWorkerOnDuty-"+where.getDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + List list=attendanceUserService.groupByWorkerOnDutyByDept(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } /** @@ -185,9 +227,19 @@ public class ProjectAttendanceController extends BaseController { where.setPrjIds(getProjectIds()); } } + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + String key="bgscreen_attendance_todayAttendance-"+pageNum+"-"+pageSize+"-"+where.getId()+"-"+where.getDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); + } + startPage(); where.setAttendanceTime(DateUtil.formatDate(DateTime.now())); - List list=attendanceDataService.todayAttendance(where); + List list = attendanceDataService.todayAttendance(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return getDataTable(list); } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java index b0ea35a5..b1957aba 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.sign.Md5Utils; import com.yanzhu.jh.project.domain.SurProjectBuildNodeData; import com.yanzhu.jh.project.service.ISurProjectBuildNodeDataService; import org.springframework.beans.factory.annotation.Autowired; @@ -18,10 +19,12 @@ import java.util.concurrent.TimeUnit; public class ProjectBuildNodeController extends BaseController { - @Autowired - ISurProjectBuildNodeDataService surProjectBuildNodeDataService; @Autowired private RedisCache redisCache; + + @Autowired + ISurProjectBuildNodeDataService surProjectBuildNodeDataService; + /** * 节点计划预警 * @param where @@ -35,7 +38,15 @@ public class ProjectBuildNodeController extends BaseController { where.setPrjIds(getProjectIds()); } } - return AjaxResult.success(surProjectBuildNodeDataService.selectScheduledAlerts(where)); + String key="bgscreen_projectBuildNode_selectScheduledAlerts_"+where.getId()+"-"+where.getProjectId()+"-"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + + List list = surProjectBuildNodeDataService.selectScheduledAlerts(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(); } /** @@ -51,8 +62,17 @@ public class ProjectBuildNodeController extends BaseController { where.setPrjIds(getProjectIds()); } } - return AjaxResult.success(surProjectBuildNodeDataService.countCompletionRate(where)); + String key="bgscreen_projectBuildNode_countCompletionRate_"+where.getId()+"-"+where.getProjectId()+"-"+where.getProType()+ Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + + List list = surProjectBuildNodeDataService.countCompletionRate(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); } + /** * 获取当前节点及叶子节点 * @param where @@ -60,7 +80,14 @@ public class ProjectBuildNodeController extends BaseController { */ @PostMapping("/selectCurrent") public AjaxResult selectCurrent(@RequestBody SurProjectBuildNodeData where){ - return AjaxResult.success(surProjectBuildNodeDataService.selectCurrent(where)); + String key="bgscreen_projectBuildNode_selectCurrent_"+where.getProjectId(); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List list = surProjectBuildNodeDataService.selectCurrent(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(); } /** @@ -70,6 +97,11 @@ public class ProjectBuildNodeController extends BaseController { */ @GetMapping("/listByProject") public AjaxResult listByProject(long projectId){ + String key="bgscreen_projectBuildNode_listByProject_"+projectId; + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } SurProjectBuildNodeData surProjectBuildNodeData=new SurProjectBuildNodeData(); surProjectBuildNodeData.setProjectId(projectId); List list=surProjectBuildNodeDataService.selectSurProjectBuildNodeDataList(surProjectBuildNodeData); @@ -78,6 +110,7 @@ public class ProjectBuildNodeController extends BaseController { } surProjectBuildNodeDataService.addProjectNodes(projectId); list=surProjectBuildNodeDataService.selectSurProjectBuildNodeDataList(surProjectBuildNodeData); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java index f4c431b2..17b9af0a 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.sign.Md5Utils; import com.yanzhu.jh.project.domain.SurProjectCheckDetection; import com.yanzhu.jh.project.service.ISurProjectCheckDetectionService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,11 +21,13 @@ import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/bgscreen/checkDetection") public class ProjectCheckDetectionController extends BaseController { - @Autowired - ISurProjectCheckDetectionService checkDetectionService; + @Autowired private RedisCache redisCache; + @Autowired + ISurProjectCheckDetectionService checkDetectionService; + /** * 按送检类型分类汇总 * @param where checkType送检类型 deptId部门编号 projectId项目编号 @@ -32,34 +35,43 @@ public class ProjectCheckDetectionController extends BaseController { */ @PostMapping("/groupByCheckType") public AjaxResult groupByCheckType(@RequestBody SurProjectCheckDetection where){ - String key="bgscreen_checkDetection_groupMeasureInfo_"+where.getCheckType()+"_"+where.getDeptId()+"_"+where.getProjectId(); - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } Long deptId= where.getDeptId(); if(deptId==null || deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_checkDetection_groupMeasureInfo_"+where.getCheckType()+"_"+where.getDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List list=checkDetectionService.groupByCheckType(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } + + /** + * 查询材料取样复试数据列表 + * @param where + * @return + */ @PostMapping("/getList") public AjaxResult getList(@RequestBody SurProjectCheckDetection where){ - String key="bgscreen_getList_groupMeasureInfo_"+where.getCheckType()+"_"+where.getDeptId()+"_"+where.getProjectId(); - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } Long deptId= where.getDeptId(); if(deptId==null || deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_checkDetection_getList_"+where.getCheckType()+"_"+where.getDeptId()+"_"+where.getProjectId()+where + .getProType()+ Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List list=checkDetectionService.getList(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java index 8c650f8c..d3925785 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java @@ -1,15 +1,25 @@ package com.yanzhu.jh.bigscreen.web.controller; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.page.TableSupport; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.sign.Md5Utils; import com.yanzhu.jh.project.domain.SurProjectChecking; import com.yanzhu.jh.project.service.ISurProjectCheckingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + /** * 项目验收Conller */ @@ -17,6 +27,9 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/bgscreen/projectChecking") public class ProjectCheckingController extends BaseController { + @Autowired + private RedisCache redisCache; + @Autowired private ISurProjectCheckingService surProjectCheckingService; @@ -27,7 +40,10 @@ public class ProjectCheckingController extends BaseController { * @return */ @GetMapping("/getProjectCheckingList") - public TableDataInfo getProjectCheckingList(String deptId, String projectId){ + public TableDataInfo getProjectCheckingList(String deptId, String projectId,String proType){ + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); SurProjectChecking surProjectChecking = new SurProjectChecking(); if(deptId!=null && !"0".equals(deptId)){ surProjectChecking.setProjectDeptId(deptId); @@ -36,10 +52,20 @@ public class ProjectCheckingController extends BaseController { surProjectChecking.setPrjIds(getProjectIds()); } } + String key="bgscreen_projectChecking_getProjectCheckingList_"+pageNum+"-"+pageSize+"-"+"_"+surProjectChecking.getProjectDeptId()+deptId+"_"+projectId+"_"+proType+ Md5Utils.hash(surProjectChecking.getPrjIds()); + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); + } if(projectId!=null && !"0".equals(projectId)){ surProjectChecking.setProjectId(Convert.toLong(projectId)); } - return getDataTable(surProjectCheckingService.selectBgscreenProjectCheckingList(surProjectChecking)); + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + surProjectChecking.setProType(proType); + } + List list = surProjectCheckingService.selectBgscreenProjectCheckingList(surProjectChecking); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return getDataTable(list); } /** @@ -49,7 +75,7 @@ public class ProjectCheckingController extends BaseController { * @return */ @GetMapping("/getProjectCheckingView") - public AjaxResult getProjectCheckingView(String deptId, String projectId){ + public AjaxResult getProjectCheckingView(String deptId, String projectId,String proType){ SurProjectChecking surProjectChecking = new SurProjectChecking(); if(deptId!=null && !"0".equals(deptId)){ surProjectChecking.setProjectDeptId(deptId); @@ -58,10 +84,21 @@ public class ProjectCheckingController extends BaseController { surProjectChecking.setPrjIds(getProjectIds()); } } + String key="bgscreen_projectChecking_getProjectCheckingView_"+deptId+"_"+surProjectChecking.getProjectDeptId()+"_"+projectId+"_"+proType+Md5Utils.hash(surProjectChecking.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + if(projectId!=null && !"0".equals(projectId)){ surProjectChecking.setProjectId(Convert.toLong(projectId)); } - return success(surProjectCheckingService.selectBgscreenProjectCheckingView(surProjectChecking)); + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + surProjectChecking.setProType(proType); + } + Map data = surProjectCheckingService.selectBgscreenProjectCheckingView(surProjectChecking); + redisCache.setCacheObject(key, data, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return success(data); } /** @@ -71,7 +108,7 @@ public class ProjectCheckingController extends BaseController { * @return */ @GetMapping("/getProjectCheckingGroupFoChart") - public AjaxResult getProjectCheckingGroupFoChart(String deptId, String projectId){ + public AjaxResult getProjectCheckingGroupFoChart(String deptId, String projectId,String proType){ SurProjectChecking surProjectChecking = new SurProjectChecking(); if(deptId!=null && !"0".equals(deptId)){ surProjectChecking.setProjectDeptId(deptId); @@ -80,10 +117,21 @@ public class ProjectCheckingController extends BaseController { surProjectChecking.setPrjIds(getProjectIds()); } } + String key="bgscreen_projectChecking_getProjectCheckingGroupFoChart_"+deptId+"_"+surProjectChecking.getProjectDeptId()+"_"+projectId+"_"+proType+Md5Utils.hash(surProjectChecking.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + if(projectId!=null && !"0".equals(projectId)){ surProjectChecking.setProjectId(Convert.toLong(projectId)); } - return success(surProjectCheckingService.getProjectCheckingGroupFoChart(surProjectChecking)); + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + surProjectChecking.setProType(proType); + } + List list = surProjectCheckingService.getProjectCheckingGroupFoChart(surProjectChecking); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return success(list); } /** @@ -93,7 +141,7 @@ public class ProjectCheckingController extends BaseController { * @return */ @GetMapping("/groupCheckingByProjectId") - public AjaxResult groupCheckingByProjectId(String lvl,String deptId, String projectId){ + public AjaxResult groupCheckingByProjectId(String lvl,String deptId, String projectId,String proType){ SurProjectChecking surProjectChecking = new SurProjectChecking(); surProjectChecking.setDataTypeLvl2(lvl); if(deptId!=null && !"0".equals(deptId)){ @@ -103,15 +151,33 @@ public class ProjectCheckingController extends BaseController { surProjectChecking.setPrjIds(getProjectIds()); } } + String key="bgscreen_projectChecking_groupCheckingByProjectId_"+lvl+"-"+deptId+"_"+surProjectChecking.getProjectDeptId()+"_"+projectId+"_"+proType+Md5Utils.hash(surProjectChecking.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + if(projectId!=null && !"0".equals(projectId)){ surProjectChecking.setProjectId(Convert.toLong(projectId)); } - return success(surProjectCheckingService.groupCheckingByProjectId(surProjectChecking)); + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + surProjectChecking.setProType(proType); + } + List list = surProjectCheckingService.groupCheckingByProjectId(surProjectChecking); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return success(list); } - + /** + * 查询项目举牌验收列表 + * @param where + * @return + */ @PostMapping("/queryProjectCheckingList") public TableDataInfo queryProjectCheckingList(@RequestBody SurProjectChecking where){ + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); Long deptId=where.getDeptId(); Long projectId=where.getProjectId(); if(deptId!=null && deptId.equals(0)){ @@ -122,10 +188,17 @@ public class ProjectCheckingController extends BaseController { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_projectChecking_groupCheckingByProjectId_"+pageNum+"-"+pageSize+"_"+where.getDeptId()+"_"+where.getProjectDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); + } if(projectId!=null && projectId.equals(0)){ where.setProjectId(Convert.toLong(projectId)); } startPage(); - return getDataTable(surProjectCheckingService.selectBgscreenProjectCheckingListByPage(where)); + List list = surProjectCheckingService.selectBgscreenProjectCheckingListByPage(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return getDataTable(list); } } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java index 0346f622..21c705e2 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java @@ -5,6 +5,8 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.sign.Md5Utils; import com.yanzhu.jh.project.domain.SurProject; import com.yanzhu.jh.project.domain.SurProjectUserinfo; import com.yanzhu.jh.project.service.ISurProjectService; @@ -34,9 +36,8 @@ public class ProjectController extends BaseController { @Autowired private RedisCache redisCache; - - @GetMapping("findProjectByDept") - public AjaxResult findProjectByDept(Long deptId){ + @GetMapping("/findProjectByDept") + public AjaxResult findProjectByDept(Long deptId,String proType){ SurProject surProject=new SurProject(); if(deptId==-1){ long roleId= SecurityUtils.getRoleId(); @@ -45,41 +46,37 @@ public class ProjectController extends BaseController { }else{ surProject.setId(SecurityUtils.getUserId()); } - return AjaxResult.success(isurProjectService.selectSurProjectListByBuser(surProject)); + return success(isurProjectService.selectSurProjectListByBuser(surProject)); } if(deptId!=null && deptId.longValue()>0){ surProject.setDeptId(deptId); } - return AjaxResult.success(isurProjectService.selectSurProjectList(surProject)); + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + surProject.setProjectType(proType); + } + return success(isurProjectService.selectSurProjectList(surProject)); } - @GetMapping("getProjectBuildNode") + @GetMapping("/getProjectBuildNode") public AjaxResult getProjectBuildNode(Long projectId){ SurProjectBuildNodeData nodeData=new SurProjectBuildNodeData(); nodeData.setProjectId(projectId); List list=surProjectBuildNodeDataService.selectSurProjectBuildNodeDataList(nodeData); if(list.size()>0){ - return AjaxResult.success(list); + return success(list); } surProjectBuildNodeDataService.addProjectNodes(projectId); list=surProjectBuildNodeDataService.selectSurProjectBuildNodeDataList(nodeData); - return AjaxResult.success(list); + return success(list); } - /** * 获取进度显示的项目 * @return */ - @GetMapping("getProgressProjects") - public AjaxResult getProgressProjects(long deptId){ - String key="bgscreen_prj_getProgressProjects_"+deptId; - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } - + @GetMapping("/getProgressProjects") + public AjaxResult getProgressProjects(long deptId,String proType){ SurProject where=new SurProject(); if(deptId<=0){ if (SecurityUtils.isUserB()) { @@ -88,19 +85,22 @@ public class ProjectController extends BaseController { }else{ where.setDeptId(deptId); } + String key="bgscreen_prj_getProgressProjects_"+deptId+"_"+proType+"_"+ Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + where.setProjectType(proType); + } List list= isurProjectService.selectProgressProjects(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); - return AjaxResult.success(list); + return success(list); } - @GetMapping("groupByProjectCategory") - public AjaxResult groupByProjectCategory(long deptId){ - String key="bgscreen_prj_groupByProjectCategory_"+deptId; - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } + @GetMapping("/groupByProjectCategory") + public AjaxResult groupByProjectCategory(long deptId,String proType){ SurProject where=new SurProject(); if(deptId<=0){ if (SecurityUtils.isUserB()) { @@ -109,41 +109,56 @@ public class ProjectController extends BaseController { }else{ where.setDeptId(deptId); } - - List list= isurProjectService.groupByProjectCategory(where); - redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); - return AjaxResult.success(list); - } - - @PostMapping("groupByCategory") - public AjaxResult groupByCategory(@RequestBody SurProject surProject){ - String key="bgscreen_prj_groupByProjectCategory_"+surProject.getId()+"_"+surProject.getDeptId(); + String key="bgscreen_prj_groupByProjectCategory_"+deptId+"_"+proType+"_"+ Md5Utils.hash(where.getPrjIds()); Object obj=redisCache.getCacheObject(key); if(obj!=null){ - return AjaxResult.success(obj); + return success(obj); + } + + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + where.setProjectType(proType); + } + List list= isurProjectService.groupByProjectCategory(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return success(list); + } + + @PostMapping("/groupByCategory") + public AjaxResult groupByCategory(@RequestBody SurProject surProject){ + String key="bgscreen_prj_groupByProjectCategory_"+surProject.getId()+"_"+surProject.getDeptId()+surProject.getProType(); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); } List list=isurProjectService.groupByCategory(surProject); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); - return AjaxResult.success(list); + return success(list); } - @PostMapping("groupByLevel") + @PostMapping("/groupByLevel") public AjaxResult groupByLevel(@RequestBody SurProject surProject){ - String key="bgscreen_prj_groupByLevel_"+surProject.getId()+"_"+surProject.getDeptId(); + String key="bgscreen_prj_groupByLevel_"+surProject.getId()+"_"+surProject.getDeptId()+surProject.getProType(); Object obj=redisCache.getCacheObject(key); if(obj!=null){ - return AjaxResult.success(obj); + return success(obj); } List list=isurProjectService.groupByLevel(surProject); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); - return AjaxResult.success(list); + return success(list); } @GetMapping("/getProjectUser") public AjaxResult getProjectUser(Long projectId){ + String key="bgscreen_prj_getProjectUser_"+projectId; + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } SurProjectUserinfo where=new SurProjectUserinfo(); where.setProjectId(projectId); - return AjaxResult.success( surProjectUserinfoService.selectSurProjectUserinfoList(where)); + List list = surProjectUserinfoService.selectSurProjectUserinfoList(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return success(list); } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java index d73be41c..6355fa19 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java @@ -3,7 +3,6 @@ package com.yanzhu.jh.bigscreen.web.controller; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; -import com.yanzhu.jh.project.domain.SurProject; import com.yanzhu.jh.project.domain.SurProjectCostOutput; import com.yanzhu.jh.project.service.ISurProjectCostOutputService; import com.yanzhu.jh.project.service.ISurProjectService; @@ -16,14 +15,16 @@ import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/bgscreen/costOut") public class ProjectCostOutputController { - @Autowired - private ISurProjectCostOutputService surProjectCostOutputService; + @Autowired private RedisCache redisCache; @Autowired private ISurProjectService projectService; + @Autowired + private ISurProjectCostOutputService surProjectCostOutputService; + @PostMapping("/selectYearAndMonth") public AjaxResult selectYearAndMonth(@RequestBody SurProjectCostOutput where){ String key="bgscreen_costOut_selectYearAndMonth_"+where.getYear()+"-"+where.getMonth()+"-"+where.getProjectId(); @@ -42,7 +43,7 @@ public class ProjectCostOutputController { @PostMapping("/sumByDeptId") public AjaxResult sumByDeptId(@RequestBody SurProjectCostOutput where){ - String key="bgscreen_costOut_sumByDeptId_"+where.getYear()+"-"+where.getMonth()+"-"+where.getId()+"-"+where.getProjectId(); + String key="bgscreen_costOut_sumByDeptId_"+where.getYear()+"-"+where.getMonth()+"-"+where.getId()+"-"+where.getProjectId()+"_"+where.getProType(); Object obj=redisCache.getCacheObject(key); if(obj!=null){ return AjaxResult.success(obj); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java index fd165d53..9d54afcf 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java @@ -8,6 +8,7 @@ import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.sign.Md5Utils; import com.yanzhu.jh.project.domain.SurProjectInsurance; import com.yanzhu.jh.project.service.ISurProjectInsuranceService; import org.springframework.beans.factory.annotation.Autowired; @@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; /** @@ -25,10 +27,12 @@ import java.util.concurrent.TimeUnit; @RequestMapping("/bgscreen/insurance") public class ProjectInsuranceController extends BaseController { - @Autowired - private ISurProjectInsuranceService surProjectInsuranceService; @Autowired private RedisCache redisCache; + + @Autowired + private ISurProjectInsuranceService surProjectInsuranceService; + /** * 根据条件查询项目保险 * @param deptId @@ -36,7 +40,7 @@ public class ProjectInsuranceController extends BaseController { * @return */ @GetMapping("/getProjectInsuranceList") - public TableDataInfo getProjectInsuranceList(String deptId,String projectId){ + public TableDataInfo getProjectInsuranceList(String deptId,String projectId,String proType){ SurProjectInsurance surProjectInsurance = new SurProjectInsurance(); if(deptId!=null && !"0".equals(deptId)){ surProjectInsurance.setNowDept(deptId); @@ -44,12 +48,21 @@ public class ProjectInsuranceController extends BaseController { if (SecurityUtils.isUserB()) { surProjectInsurance.setPrjIds(getProjectIds()); } - + } + String key="bgscreen_insurance_getProjectInsuranceList_"+deptId+"-"+projectId+"_"+proType+"_"+surProjectInsurance.getNowDept()+"_"+Md5Utils.hash(surProjectInsurance.getPrjIds()); + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); } if(projectId!=null && !"0".equals(projectId)){ surProjectInsurance.setProjectId(Convert.toLong(projectId)); } - return getDataTable(surProjectInsuranceService.selectBgscreenInsuranceList(surProjectInsurance)); + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + surProjectInsurance.setProType(proType); + } + List> list = surProjectInsuranceService.selectBgscreenInsuranceList(surProjectInsurance); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return getDataTable(list); } /** @@ -62,11 +75,11 @@ public class ProjectInsuranceController extends BaseController { String key="bgscreen_insurance_getProjectInsurance_"+id; Object obj=redisCache.getCacheObject(key); if(obj!=null){ - return AjaxResult.success(obj); + return success(obj); } List list=surProjectInsuranceService.selectProjectInsuranceListByProjectId(id); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); - return AjaxResult.success(list); + return success(list); } } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java index 2825a3ee..a15a0784 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java @@ -3,9 +3,12 @@ package com.yanzhu.jh.bigscreen.web.controller; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.page.TableSupport; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.sign.Md5Utils; import com.yanzhu.jh.project.domain.SurProjectMaterialSeal; import com.yanzhu.jh.project.service.ISurProjectMaterialSealService; import org.springframework.beans.factory.annotation.Autowired; @@ -30,48 +33,61 @@ public class ProjectMaterialSealController extends BaseController { @PostMapping("/selectTop20") public AjaxResult selectTop20(@RequestBody SurProjectMaterialSeal where){ - String key="bgscreen_materialSeal_selectTop20_"+where.getDeptId()+"-"+where.getProjectId(); - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } Long deptId=where.getDeptId(); if(deptId==null || deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_materialSeal_selectTop20_"+where.getDeptId()+"-"+where.getProjectId()+"_"+where.getProType()+"_"+ Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + clearPage(); List list=materialSealService.selectTop20(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } + @PostMapping("/groupTop12Month") public AjaxResult groupTop12Month(@RequestBody SurProjectMaterialSeal where){ - String key="bgscreen_materialSeal_groupTop12Month_"+where.getDeptId()+"-"+where.getProjectId(); - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } Long deptId=where.getDeptId(); if(deptId==null || deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_materialSeal_groupTop12Month_"+where.getDeptId()+"-"+where.getProjectId()+"_"+where.getProType()+"_"+ Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + + clearPage(); List list=materialSealService.groupTop12Month(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); - return AjaxResult.success(list); + return success(list); } @PostMapping("/selectTop12Month") public TableDataInfo selectTop12Month(@RequestBody SurProjectMaterialSeal where){ - startPage(); + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); Long deptId=where.getDeptId(); if(deptId==null || deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_materialSeal_selectTop12Month_"+pageNum+"_"+pageSize+"_"+where.getDeptId()+"-"+where.getProjectId()+"_"+where.getProType()+"_"+ Md5Utils.hash(where.getPrjIds()); + List objs=redisCache.getCacheObject(key); + if(objs!=null){ + return getDataTable(objs); + } + startPage(); List list=materialSealService.selectTop12Month(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return getDataTable(list); } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMeasureController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMeasureController.java index 55cc16bd..1c337358 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMeasureController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMeasureController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.sign.Md5Utils; import com.yanzhu.jh.project.domain.SurProjectMeasure; import com.yanzhu.jh.project.service.ISurProjectMeasureService; import org.springframework.beans.factory.annotation.Autowired; @@ -19,10 +20,13 @@ import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/bgscreen/measure") public class ProjectMeasureController extends BaseController { - @Autowired - ISurProjectMeasureService measureService; + @Autowired private RedisCache redisCache; + + @Autowired + ISurProjectMeasureService measureService; + /** * 按测量内容分组查询 * @param where measureType 测量类型 deptId部门编号 projectId项目编号 @@ -30,34 +34,36 @@ public class ProjectMeasureController extends BaseController { */ @PostMapping("/groupMeasureInfo") public AjaxResult groupMeasureInfo(@RequestBody SurProjectMeasure where){ - String key="bgscreen_measure_groupMeasureInfo_"+where.getMeasureType()+"_"+where.getDeptId()+"_"+where.getProjectId(); - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } Long deptId= where.getDeptId(); if(deptId==null || deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_measure_groupMeasureInfo_"+where.getMeasureType()+"_"+where.getDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+"_"+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List list=measureService.groupMeasureInfo(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } @PostMapping("/getList") public AjaxResult getList(@RequestBody SurProjectMeasure where){ - String key="bgscreen_measure_getList_"+where.getMeasureType()+"_"+where.getDeptId()+"_"+where.getProjectId(); - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } Long deptId= where.getDeptId(); if(deptId==null || deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_measure_getList_"+where.getMeasureType()+"_"+where.getDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+"_"+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List list=measureService.getList(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java index 3646669c..47824c24 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; import com.yanzhu.jh.project.domain.SmzProjectQuarterlyAssess; import com.yanzhu.jh.project.service.ISmzProjectQuarterlyAssessService; import org.springframework.beans.factory.annotation.Autowired; @@ -26,8 +27,8 @@ public class ProjectQuarterlyAssessController extends BaseController { @GetMapping("/currentListByDept") - public TableDataInfo currentListByDept(Long deptId){ - String key="bgscreen_asscess_currentListByDept"+deptId; + public TableDataInfo currentListByDept(Long deptId,String proType){ + String key="bgscreen_asscess_currentListByDept"+deptId+"_"+proType; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return getDataTable((List) obj); @@ -43,6 +44,10 @@ public class ProjectQuarterlyAssessController extends BaseController { smzProjectQuarterlyAssess.setYear((long)calendar.get(Calendar.YEAR)); int month=calendar.get(Calendar.MONTH)+1; smzProjectQuarterlyAssess.setQuarterly((long)(month+2)/3); + + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + smzProjectQuarterlyAssess.setProType(proType); + } List list= smzProjectQuarterlyAssessService.currentListByDept(smzProjectQuarterlyAssess); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return getDataTable(list); @@ -55,7 +60,7 @@ public class ProjectQuarterlyAssessController extends BaseController { */ @PostMapping("/queryByProjectType") public AjaxResult queryByProjectType(@RequestBody SmzProjectQuarterlyAssess where){ - String key="bgscreen_asscess_queryByProjectType_"+where.getId()+"_"+where.getYear()+"_"+where.getQuarterly()+"-"+where.getDeptId(); + String key="bgscreen_asscess_queryByProjectType_"+where.getId()+"_"+where.getYear()+"_"+where.getQuarterly()+"-"+where.getDeptId()+"_"+where.getProType(); Object obj=redisCache.getCacheObject(key); if(obj!=null){ return AjaxResult.success(obj); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java index 45b7a174..e17d8948 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; import com.yanzhu.jh.project.domain.SurProjectSchedule; import com.yanzhu.jh.project.domain.vo.SurProjectScheduleWhere; import com.yanzhu.jh.project.service.ISurProjectScheduleService; @@ -20,10 +21,12 @@ import java.util.concurrent.TimeUnit; @RequestMapping("/bgscreen/schedule") public class ProjectScheduleController extends BaseController { - @Autowired - private ISurProjectScheduleService isurProjectScheduleService; @Autowired private RedisCache redisCache; + + @Autowired + private ISurProjectScheduleService isurProjectScheduleService; + @GetMapping("/projectConstructionProgress") public AjaxResult getProjectConstructionProgress(Long projectId){ SurProjectSchedule surProjectSchedule= isurProjectScheduleService.getProjectConstructionProgress(projectId); @@ -31,7 +34,7 @@ public class ProjectScheduleController extends BaseController { } @GetMapping("/constructionProgressByDept") - public AjaxResult getConstructionProgressByDept(Long deptId){ + public AjaxResult getConstructionProgressByDept(Long deptId,String proType){ SurProjectSchedule where=new SurProjectSchedule(); if(deptId==null || deptId<=0){ if (SecurityUtils.isUserB()) { @@ -40,6 +43,9 @@ public class ProjectScheduleController extends BaseController { }else{ where.setDeptId(deptId); } + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + where.setProType(proType); + } List list=isurProjectScheduleService.getConstructionProgressByDept(where); return AjaxResult.success(list); } @@ -49,8 +55,8 @@ public class ProjectScheduleController extends BaseController { * @return */ @GetMapping("/selectByProjectType") - public AjaxResult selectByProjectType(Long type,Long deptId){ - String key="bgscreen_schedule_selectByProjectType_"+type+"_"+deptId; + public AjaxResult selectByProjectType(Long type,Long deptId,String proType){ + String key="bgscreen_schedule_selectByProjectType_"+type+"_"+deptId+"_"+proType; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return AjaxResult.success(obj); @@ -63,6 +69,9 @@ public class ProjectScheduleController extends BaseController { where.setPrjIds(getProjectIds()); } } + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + where.setProType(proType); + } List list=isurProjectScheduleService.selectByProjectType(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectSpecialController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectSpecialController.java index a61baed6..e0aa7632 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectSpecialController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectSpecialController.java @@ -30,7 +30,7 @@ public class ProjectSpecialController extends BaseController { * @return */ @GetMapping("/getProjectSpecialView") - public TableDataInfo getProjectSpecialView(String deptId,String projectId){ + public TableDataInfo getProjectSpecialView(String deptId,String projectId,String proType){ SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial(); if(deptId!=null && !"0".equals(deptId)){ surProjectWorkSpecial.setNowDept(deptId); @@ -42,6 +42,9 @@ public class ProjectSpecialController extends BaseController { if(projectId!=null && !"0".equals(projectId)){ surProjectWorkSpecial.setProjectId(Convert.toLong(projectId)); } + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + surProjectWorkSpecial.setProType(proType); + } return getDataTable(surProjectWorkSpecialService.selectBgscreenWorkSpecialList(surProjectWorkSpecial)); } @@ -51,7 +54,7 @@ public class ProjectSpecialController extends BaseController { * @return */ @GetMapping("/getProjectSpecialList") - public TableDataInfo getProjectSpecialList(String projectId, String activeName, String specialType){ + public TableDataInfo getProjectSpecialList(String projectId, String activeName, String specialType,String proType){ SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial(); if(projectId!=null && !"0".equals(projectId)){ surProjectWorkSpecial.setProjectId(Convert.toLong(projectId)); @@ -62,6 +65,9 @@ public class ProjectSpecialController extends BaseController { if(specialType!=null && !"0".equals(specialType)){ surProjectWorkSpecial.setSpecialType(specialType); } + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + surProjectWorkSpecial.setProType(proType); + } return getDataTable(surProjectWorkSpecialService.selectSurProjectWorkSpecialList(surProjectWorkSpecial)); } @@ -69,7 +75,7 @@ public class ProjectSpecialController extends BaseController { * 查询项目特种人员数量统计 */ @GetMapping("/findWorkSpecialCount") - public AjaxResult findWorkSpecialCount(String projectId, String specialType) + public AjaxResult findWorkSpecialCount(String projectId, String specialType,String proType) { SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial(); if(projectId!=null && !"0".equals(projectId)){ @@ -78,6 +84,9 @@ public class ProjectSpecialController extends BaseController { if(specialType!=null && !"0".equals(specialType)){ surProjectWorkSpecial.setSpecialType(specialType); } + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + surProjectWorkSpecial.setProType(proType); + } return success(surProjectWorkSpecialService.findWorkSpecialCount(surProjectWorkSpecial)); } } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectStandardController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectStandardController.java index 3ca6342d..8dda5aad 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectStandardController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectStandardController.java @@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.sign.Md5Utils; import com.yanzhu.jh.project.domain.SurProjectStandard; import com.yanzhu.jh.project.service.ISurProjectStandardService; import org.springframework.beans.factory.annotation.Autowired; @@ -25,11 +26,12 @@ public class ProjectStandardController extends BaseController { private RedisCache redisCache; @GetMapping("/getList") - public AjaxResult getList(Long deptId,Long projectId){ + public AjaxResult getList(Long deptId,Long projectId,String proType){ SurProjectStandard where=new SurProjectStandard(); where.setProjectId(projectId); where.setIsDel(0l); - String key="bgscreen_standard_getList_"+projectId; + + String key="bgscreen_standard_getList_"+projectId+proType; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return AjaxResult.success(obj); @@ -56,17 +58,18 @@ public class ProjectStandardController extends BaseController { @PostMapping("/groupByType") public AjaxResult groupByType(@RequestBody SurProjectStandard where){ - String key="bgscreen_standard_groupByType_"+where.getProjectId()+"_"+where.getDeptId(); - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } Long deptId= where.getDeptId(); if(deptId==null || deptId<=0){ if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } + String key="bgscreen_standard_groupByType_"+where.getProjectId()+"_"+where.getDeptId()+"_"+where.getProType()+"_"+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List list=standardService.groupByType(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoAiBoxController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoAiBoxController.java index c9d0334d..429212a8 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoAiBoxController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoAiBoxController.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.SysRoleEnum; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.service.ISysDeptService; import com.yanzhu.jh.video.domain.DevAiProjectData; import com.yanzhu.jh.video.domain.SurProjectVideoConfig; @@ -45,7 +46,7 @@ public class VideoAiBoxController extends BaseController { * 查询AI预警列表 */ @GetMapping("/listView") - public AjaxResult listView(String deptId, String projectId) + public AjaxResult listView(String deptId, String projectId,String proType) { DevAiProjectData devAiProjectData = new DevAiProjectData(); devAiProjectData.setNowRole(Convert.toStr(getUserFirstRole())); @@ -55,7 +56,7 @@ public class VideoAiBoxController extends BaseController { devAiProjectData.setNowDept(Convert.toStr(getDeptId())); } devAiProjectData.setNowUser(Convert.toStr(getUserId())); - String key="bgscreen_aiBoxVideo_listView_"+deptId+"_"+projectId+"_"+devAiProjectData.getNowRole()+"_"+devAiProjectData.getNowDept()+"_"+devAiProjectData.getNowUser(); + String key="bgscreen_aiBoxVideo_listView_"+deptId+"_"+projectId+"_"+devAiProjectData.getNowRole()+"_"+devAiProjectData.getNowDept()+"_"+devAiProjectData.getNowUser()+"_"+deptId+"_"+projectId+"_"+proType; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return success(obj); @@ -66,6 +67,9 @@ public class VideoAiBoxController extends BaseController { if(projectId!=null && !"0".equals(projectId)){ devAiProjectData.setProjectId(Convert.toLong(projectId)); } + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + devAiProjectData.setProType(proType); + } //默认查询当天数据 /*Map params = new HashMap<>(); params.put("date",new Date()); @@ -80,7 +84,7 @@ public class VideoAiBoxController extends BaseController { * 获取视频配置详细信息 */ @GetMapping(value = "/getVideoPassage") - public AjaxResult getVideoPassage(String deptId, String projectId, String passageType, String importance) + public AjaxResult getVideoPassage(String deptId, String projectId, String passageType, String importance,String proType) { Map map = new HashMap<>(); String nowRole = Convert.toStr(getUserFirstRole()); @@ -91,7 +95,7 @@ public class VideoAiBoxController extends BaseController { map.put("nowDept",Convert.toStr(getDeptId())); } map.put("nowUser",Convert.toStr(getUserId())); - String key="bgscreen_aiBoxVideo_getVideoPassage_"+deptId+"_"+projectId+"_"+passageType+"_"+importance+"_"+map.get("nowRole")+"_"+map.get("nowDept")+"_"+map.get("nowUser"); + String key="bgscreen_aiBoxVideo_getVideoPassage_"+deptId+"_"+projectId+"_"+passageType+"_"+importance+"_"+map.get("nowRole")+"_"+map.get("nowDept")+"_"+map.get("nowUser")+"_"+proType; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return success(obj); @@ -108,6 +112,9 @@ public class VideoAiBoxController extends BaseController { if(importance!=null && !"".equals(importance)){ map.put("importance",importance); } + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + map.put("proType",proType); + } clearPage(); List list = surProjectVideoConfigService.selectSurProjectVideoConfigByParams(map); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); @@ -118,7 +125,7 @@ public class VideoAiBoxController extends BaseController { * 查询视频配置列表 */ @GetMapping("/groupCountByAlarmType") - public AjaxResult groupCountByAlarmType(String deptId,String projectId,String now) + public AjaxResult groupCountByAlarmType(String deptId,String projectId,String now,String proType) { DevAiProjectData devAiProjectData = new DevAiProjectData(); devAiProjectData.setNowRole(Convert.toStr(getUserFirstRole())); @@ -128,7 +135,7 @@ public class VideoAiBoxController extends BaseController { devAiProjectData.setNowDept(Convert.toStr(getDeptId())); } devAiProjectData.setNowUser(Convert.toStr(getUserId())); - String key="bgscreen_aiBoxVideo_groupCountByAlarmType_"+deptId+"_"+projectId+"_"+now+"_"+devAiProjectData.getNowRole()+"_"+devAiProjectData.getNowDept()+"_"+devAiProjectData.getNowUser(); + String key="bgscreen_aiBoxVideo_groupCountByAlarmType_"+deptId+"_"+projectId+"_"+now+"_"+devAiProjectData.getNowRole()+"_"+devAiProjectData.getNowDept()+"_"+devAiProjectData.getNowUser()+"_"+proType; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return success(obj); @@ -139,6 +146,9 @@ public class VideoAiBoxController extends BaseController { if(projectId!=null && !"0".equals(projectId)){ devAiProjectData.setProjectId(Convert.toLong(projectId)); } + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + devAiProjectData.setProType(proType); + } //查询当天数据 if(now!=null && "Y".equals(now)){ Map params = new HashMap<>(); @@ -154,7 +164,7 @@ public class VideoAiBoxController extends BaseController { * 查询视频配置列表汇总 */ @GetMapping("/selectGroupCountVideoConfig") - public AjaxResult selectGroupCountVideoConfig(String deptId,String projectId) + public AjaxResult selectGroupCountVideoConfig(String deptId,String projectId,String proType) { Map map = new HashMap<>(); String nowRole = Convert.toStr(getUserFirstRole()); @@ -165,7 +175,7 @@ public class VideoAiBoxController extends BaseController { map.put("nowDept",Convert.toStr(getDeptId())); } map.put("nowUser",Convert.toStr(getUserId())); - String key="bgscreen_aiBoxVideo_selectGroupCountVideoConfig_"+deptId+"_"+projectId+"_"+map.get("nowRole")+"_"+map.get("nowDept")+"_"+map.get("nowUser"); + String key="bgscreen_aiBoxVideo_selectGroupCountVideoConfig_"+deptId+"_"+projectId+"_"+map.get("nowRole")+"_"+map.get("nowDept")+"_"+map.get("nowUser")+"_"+proType; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return success(obj); @@ -176,6 +186,9 @@ public class VideoAiBoxController extends BaseController { if(projectId!=null && !"0".equals(projectId)){ map.put("projectId",projectId); } + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + map.put("proType",proType); + } List> list = surProjectVideoConfigService.selectGroupCountVideoConfig(map); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return success(list); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoController.java index 46ca3bee..fd92f83d 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoController.java @@ -1,20 +1,23 @@ package com.yanzhu.jh.bigscreen.web.controller; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.SysRoleEnum; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.service.ISysDeptService; import com.yanzhu.jh.video.domain.SurProjectVideoConfig; import com.yanzhu.jh.video.domain.SurProjectVideoPassage; import com.yanzhu.jh.video.service.ISurProjectVideoConfigService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; +import java.util.concurrent.TimeUnit; /** * 实时视频Conller @@ -23,6 +26,9 @@ import java.util.Map; @RequestMapping("/bgscreen/video") public class VideoController extends BaseController { + @Autowired + private RedisCache redisCache; + @Autowired private ISysDeptService sysDeptService; @@ -33,15 +39,9 @@ public class VideoController extends BaseController { * 查询视频配置列表 */ @GetMapping("/listView") - public AjaxResult listView(String deptId,String projectId) + public AjaxResult listView(String deptId,String projectId,String proType) { SurProjectVideoConfig surProjectVideoConfig = new SurProjectVideoConfig(); - if(deptId!=null && !"0".equals(deptId)){ - surProjectVideoConfig.setProjectDeptId(deptId); - } - if(projectId!=null && !"0".equals(projectId)){ - surProjectVideoConfig.setProjectId(Convert.toLong(projectId)); - } surProjectVideoConfig.setNowRole(Convert.toStr(getUserFirstRole())); if(SysRoleEnum.ZGS.getCode().equals(surProjectVideoConfig.getNowRole())){ surProjectVideoConfig.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); @@ -49,7 +49,23 @@ public class VideoController extends BaseController { surProjectVideoConfig.setNowDept(Convert.toStr(getDeptId())); } surProjectVideoConfig.setNowUser(Convert.toStr(getUserId())); + + String key="bgscreen_video_listView_"+surProjectVideoConfig.getNowRole()+"_"+surProjectVideoConfig.getNowDept()+"_"+surProjectVideoConfig.getNowUser()+"_"+deptId+"_"+projectId+"_"+proType; + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + if(deptId!=null && !"0".equals(deptId)){ + surProjectVideoConfig.setProjectDeptId(deptId); + } + if(projectId!=null && !"0".equals(projectId)){ + surProjectVideoConfig.setProjectId(Convert.toLong(projectId)); + } + if(StringUtils.isNotNull(proType) && !"0".equals(proType)){ + surProjectVideoConfig.setProType(proType); + } List list = surProjectVideoConfigService.selectSurProjectVideoConfigList(surProjectVideoConfig); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return success(list); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java index 7f376b67..98fe1f6d 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java @@ -111,7 +111,6 @@ public class SurProjectCheckingServiceImpl extends WxMessageImpl implements ISur for(Map map:list){ sum += Convert.toInt(map.get("total")); //"1"为验收合格 - if(map.get("check_result")!=null && "1".equals(map.get("check_result").toString())){ okSum+=Convert.toInt(map.get("total")); } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml index 1bde75d1..c41b9f1a 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml @@ -56,13 +56,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, project_id, year, quarterly, date, plan_target, cur_progress, lagging_matters, problem, plan_date, finish_date, status, remark, is_del, create_by, create_time, update_by, update_time from smz_project_quarterly_assess + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml index 65eaf4eb..da2b9b67 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml @@ -511,7 +511,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml index cc3600c0..9dcada83 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml @@ -147,74 +147,80 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -222,7 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml index 461c4568..d879c806 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml @@ -232,63 +232,72 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -296,10 +305,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.dict_value data_type_lvl2,dict_label main_image,a.css_class check_type,b.cnt id from ( @@ -365,6 +369,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.is_del=0 and a.project_id = #{projectId} and b.deptId = #{projectDeptId} + and b.projectType = #{proType} and a.project_id in @@ -375,12 +380,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) b on a.dict_value=b.data_type_lvl2 + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml index 461c7e73..910300bc 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml @@ -112,33 +112,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select spme.id, spme.project_id, spme.dept_id, spme.main_image, spme.image_urls, spme.material_name, spme.use_position, spme.contract_brand, spme.use_brand, spme.seal_date, spme.sign_files, spme.alteration_files, spme.is_del, spme.create_by, spme.create_time, spme.update_by, spme.update_time, spme.remark, spme.projectName, spme.dept_name @@ -188,6 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where spme.is_del=0 and sp.deptId = #{deptId} and sp.id = #{projectId} + and sp.projectType = #{proType} and sp.id in @@ -198,21 +200,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by spme.create_time desc LIMIT 0,20 - + select year(spms.seal_date) project_id, month(spms.seal_date) dept_id,count(1) id + from sur_project_material_seal spms + left join sur_project sp on spms.project_id = sp.id + where spms.is_del=0 + and sp.deptId= #{deptId} + and sp.projectType = #{proType} + and spms.project_id = #{projectId} - and project_id in + and spms.project_id in #{item} - and project_id = #{projectId} - and seal_date>=DATE_SUB(CURDATE(),interval 12 month) - group by year(seal_date),month(seal_date) - order by year(seal_date) desc,month(seal_date) desc + and spms.seal_date >= DATE_SUB(CURDATE(),interval 12 month) + group by year(spms.seal_date),month(spms.seal_date) + order by year(spms.seal_date) desc,month(spms.seal_date) desc @@ -220,14 +222,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dict_data sdd2 ON sdd2.dict_type = 'project_measure_info_type' AND sdd2.dict_value = spm.measure_info LEFT JOIN sys_user u1 ON spm.create_by=u1.phonenumber LEFT JOIN sys_user u2 ON spm.update_by=u2.phonenumber - - WHERE IF(spm.is_del IS NULL,0,spm.is_del)=0 + WHERE spm.is_del=0 and spm.measure_type = #{measureType} - AND spm.project_id IN (SELECT id FROM sur_project WHERE deptid=#{deptId}) + AND sp.deptId=#{deptId} + and sp.projectType = #{proType} and spm.project_id in diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml index 4a0336c0..78f2d80f 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml @@ -175,44 +175,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml index 23fa0706..2a3f5c65 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml @@ -26,14 +26,15 @@ select sps.id, sps.project_id, sps.dept_id, sd.dept_name, sps.image_file, sps.standard_desc, sps.ord, sps.standard_type, sdd.dict_label as standard_type_name, sdd.remark as standard_type_remark, sps.is_del, sps.create_by, sps.create_time, sps.update_by, sps.update_time from sur_project_standard sps left join sys_dict_data sdd on sps.standard_type = sdd.dict_value and sdd.dict_type='prj_standard_type' left join sys_dept sd on sd.dept_id = sps.dept_id + left join sur_project sp on sp.id = sps.project_id select count(1) cnt - FROM vw_smz_ssp_problemmodify_audit WHERE isDel=0 - and infoType=#{infoType} - and roleType=#{roleType} - and DATE(createtime)>=DATE(#{startDate}) - and DATE(createtime) <= DATE(#{endDate}) - and ((updateTime is null and date(nickedTime) < date(now()) ) or date(updateTime )>date(nickedTime)) - and projectId=#{projectId} - - AND projectId IN ( - SELECT id FROM sur_project WHERE isdel=0 - AND deptid = #{deptId} - ) - + FROM smz_ssp_problemmodify ssp + left join sur_project sp on p.projectId=sp.id + WHERE ssp.isDel=0 + and ssp.infoType=#{infoType} + and ssp.roleType=#{roleType} + and DATE(ssp.createtime) >= DATE(#{startDate}) + and DATE(ssp.createtime) <= DATE(#{endDate}) + and ((ssp.updateTime is null and date(ssp.nickedTime) < date(now()) ) or date(ssp.updateTime ) > date(ssp.nickedTime)) + and ssp.projectId=#{projectId} + AND sp.deptid = #{deptId} + and sp.projectType = #{proType} - and projectId in + and ssp.projectId in #{item} - SELECT a.dict_value data_type,dict_label train_title,css_class train_type,b.cnt id FROM ( @@ -269,7 +271,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM work_train wt left join sur_project sp on sp.id = wt.project_id and sp.deptId = #{nowDept} - and wt.project_id = #{projectId} + and sp.id = #{projectId} + and sp.projectType = #{proType} and wt.project_id in @@ -280,6 +283,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY data_type ) b ON a.dict_value=b.data_type +