From 0fe04687f7e3ecd2978516798aa4599ec7596cb2 Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 22 Oct 2023 23:45:32 +0800 Subject: [PATCH] update code --- .../service/IFlowBusinessKeyService.java | 6 + .../impl/FlowBusinessKeyServiceImpl.java | 15 +++ .../system/mapper/FlowBusinessKeyMapper.java | 6 + .../mapper/flowable/FlowBusinessKeyMapper.xml | 117 ++++++++++++++++++ .../web/controller/FloweController.java | 49 ++++++++ .../controller/ProjectStandardController.java | 37 +++++- .../mapper/SurProjectStandardMapper.java | 6 + .../service/ISurProjectStandardService.java | 6 + .../impl/SurProjectStandardServiceImpl.java | 12 ++ .../project/SurProjectStandardMapper.xml | 28 +++++ 10 files changed, 278 insertions(+), 4 deletions(-) diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowBusinessKeyService.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowBusinessKeyService.java index 3904f9fe..372b552a 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowBusinessKeyService.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowBusinessKeyService.java @@ -60,4 +60,10 @@ public interface IFlowBusinessKeyService { public List listByUnit(FlowTaskEntity where); public List listByState(FlowTaskEntity where); + + public List groupByUnitTotal(FlowTaskEntity where); + + public List groupByUnitFinish(FlowTaskEntity where); + + public List groupByProject(); } diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java index fe3d4d34..67ea4ce4 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java @@ -118,4 +118,19 @@ public class FlowBusinessKeyServiceImpl implements IFlowBusinessKeyService { public List listByState(FlowTaskEntity where) { return flowBusinessKeyMapper.listByState(where); } + + @Override + public List groupByUnitTotal(FlowTaskEntity where) { + return flowBusinessKeyMapper.groupByUnitTotal(where); + } + + @Override + public List groupByUnitFinish(FlowTaskEntity where) { + return flowBusinessKeyMapper.groupByUnitFinish(where); + } + + @Override + public List groupByProject() { + return flowBusinessKeyMapper.groupByProject(); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowBusinessKeyMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowBusinessKeyMapper.java index 2a198879..19a28e81 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowBusinessKeyMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowBusinessKeyMapper.java @@ -52,4 +52,10 @@ public interface FlowBusinessKeyMapper { public List listByUnit(FlowTaskEntity where); public List listByState(FlowTaskEntity where); + + public List groupByUnitTotal(FlowTaskEntity where); + + public List groupByUnitFinish(FlowTaskEntity where); + + public List groupByProject(); } diff --git a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml index 98350016..7d7bb73c 100644 --- a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml @@ -188,6 +188,115 @@ ) a GROUP BY cat + + + + + \ No newline at end of file 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 2b080b50..6de2468b 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 @@ -65,6 +65,49 @@ 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); + } + FlowTaskEntity where=new FlowTaskEntity(); + if(deptId<=0){ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + } + where.setDeployId(deptId<1?"":""+deptId); + where.setBusinessKey(projectId<1?"":""+projectId); + List list=flowBusinessKeyService.groupByUnitFinish(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); + } + + + @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); + } + FlowTaskEntity where=new FlowTaskEntity(); + if(deptId<=0){ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + } + where.setDeployId(deptId<1?"":""+deptId); + where.setBusinessKey(projectId<1?"":""+projectId); + 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){ startPage(); @@ -89,4 +132,10 @@ public class FloweController extends BaseController { return getDataTable(list); } + @GetMapping("/groupByProject") + public AjaxResult groupByProject(){ + List list=flowBusinessKeyService.groupByProject(); + return AjaxResult.success(list); + } + } 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 5893efca..327194e2 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 @@ -1,21 +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.domain.entity.SysDictData; import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.SecurityUtils; import com.yanzhu.jh.project.domain.SurProjectStandard; import com.yanzhu.jh.project.service.ISurProjectStandardService; 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 org.springframework.web.bind.annotation.*; import java.util.List; import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/bgscreen/standard") -public class ProjectStandardController { +public class ProjectStandardController extends BaseController { @Autowired ISurProjectStandardService standardService; @@ -36,4 +37,32 @@ public class ProjectStandardController { redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } + + + @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()); + } + } + List list=standardService.groupByType(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); + } + + + @GetMapping("/groupByProject") + public AjaxResult groupByProject() { + List list=standardService.groupByProject(); + return AjaxResult.success(list); + } + + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectStandardMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectStandardMapper.java index 9d781eb7..9087bb46 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectStandardMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectStandardMapper.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.project.mapper; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysDictData; import com.yanzhu.jh.project.domain.SurProjectStandard; /** @@ -58,4 +60,8 @@ public interface SurProjectStandardMapper * @return 结果 */ public int deleteSurProjectStandardByIds(Long[] ids); + + public List groupByType(SurProjectStandard where); + + List groupByProject(); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectStandardService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectStandardService.java index 0aac8da8..bfccec8d 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectStandardService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectStandardService.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.project.service; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysDictData; import com.yanzhu.jh.project.domain.SurProjectStandard; /** @@ -60,4 +62,8 @@ public interface ISurProjectStandardService public int deleteSurProjectStandardById(Long id); public int insertSurProjectStandards(SurProjectStandard surProjectStandard); + + public List groupByType(SurProjectStandard where); + + public List groupByProject(); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java index 1d406842..fc521ba1 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.project.service.impl; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.utils.DateUtils; import org.apache.logging.log4j.util.Strings; import org.springframework.beans.factory.annotation.Autowired; @@ -111,4 +113,14 @@ public class SurProjectStandardServiceImpl implements ISurProjectStandardService } return n; } + + @Override + public List groupByType(SurProjectStandard where) { + return surProjectStandardMapper.groupByType(where); + } + + @Override + public List groupByProject() { + return surProjectStandardMapper.groupByProject(); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml index 65adbd41..47206cfb 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml @@ -100,4 +100,32 @@ #{id} + + + \ No newline at end of file