From 02652f74c79b07a13e7ebacd7d107566d6e66237 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Tue, 10 Aug 2021 16:02:26 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=BF=AE=E6=94=B9=20=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-analysis-pc/pom.xml | 30 ++++++------- .../controller/EpdcScreenController.java | 42 +++++++++++++++++++ .../modules/screen/dao/EpdcScreenDao.java | 26 ++++++++++++ .../screen/service/EpdcScreenService.java | 26 ++++++++++++ .../service/impl/EpdcScreenServiceImpl.java | 30 +++++++++++++ .../resources/mapper/screen/EpdcScreenDao.xml | 27 ++++++++++++ 6 files changed, 163 insertions(+), 18 deletions(-) create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java create mode 100644 epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml diff --git a/epdc-cloud-analysis-pc/pom.xml b/epdc-cloud-analysis-pc/pom.xml index c11057d..1f23ff2 100644 --- a/epdc-cloud-analysis-pc/pom.xml +++ b/epdc-cloud-analysis-pc/pom.xml @@ -128,21 +128,15 @@ dev - 9 - 114.215.125.123 - 9603 - epdc!redis@master1405 - - - - - yushan_epdc_test - elink-epdc@yushan + 8 + r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com + 10001 + elink!888 false - 47.104.224.45:8848 + 115.29.142.202:8848 - de000340-5fc4-45aa-bdbc-dd96852012ad + 8831513c-2f72-42e8-899f-eb6c2c5ae110 wx50ebeb95943868cd @@ -178,15 +172,15 @@ test - 9 - 114.215.125.123 - 9603 - epdc!redis@master1405 + 8 + r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com + 10001 + elink!888 true - 192.168.0.59:8848 - 192.168.0.59 + 115.29.142.202:8848 + 115.29.142.202 8831513c-2f72-42e8-899f-eb6c2c5ae110 44ebf984898c497280a149a57c1c7b34b324ba06451148a9a2304b2c0f0035c8 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java new file mode 100644 index 0000000..86bd95d --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -0,0 +1,42 @@ +package com.elink.esua.epdc.modules.screen.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.modules.screen.service.EpdcScreenService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 202108版大屏接口 + * + * @Author：liuchuang + * @Date：2021/8/10 14:53 + */ +@RestController +@RequestMapping("screen") +public class EpdcScreenController { + + @Autowired + private EpdcScreenService epdcScreenService; + + /** + * 网格治理-项目列表接口（事件总览最新列表、群众关心的事列表） + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/10 13:46 + */ + @GetMapping("gridGovernance/itemList") + public Result> gridGovernanceItemList(@RequestBody EpdcScreenGridGovernanceItemFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.gridGovernanceItemList(formDto); + } +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java new file mode 100644 index 0000000..8cbb0e9 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.modules.screen.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author：liuchuang + * @Date：2021/8/10 15:04 + */ +@Mapper +public interface EpdcScreenDao extends BaseDao { + + /** + * 网格治理-项目列表接口（事件总览最新列表、群众关心的事列表） + * + * @param formDto + * @return java.util.List + * @author Liuchuang + * @since 2021/8/10 15:09 + */ + List gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto); +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java new file mode 100644 index 0000000..80b493d --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.modules.screen.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; + +import java.util.List; + +/** + * 202108版大屏接口 + * + * @Author：liuchuang + * @Date：2021/8/10 14:54 + */ +public interface EpdcScreenService { + + /** + * 网格治理-项目列表接口（事件总览最新列表、群众关心的事列表） + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/10 13:49 + */ + Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto); +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java new file mode 100644 index 0000000..34301b2 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.modules.screen.service.impl; + +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.modules.screen.dao.EpdcScreenDao; +import com.elink.esua.epdc.modules.screen.service.EpdcScreenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 202108版大屏接口 + * + * @Author：liuchuang + * @Date：2021/8/10 14:54 + */ +@Service +public class EpdcScreenServiceImpl extends BaseServiceImpl implements EpdcScreenService { + + @Override + public Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.gridGovernanceItemList(formDto); + return new Result>().ok(data); + } +} diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml new file mode 100644 index 0000000..2827ac3 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -0,0 +1,27 @@ + + + + + + + + From f2ca6cf7f2ebaa17ee274b8c8d4908d6377047a2 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Tue, 10 Aug 2021 16:14:13 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=BF=AE=E6=94=B9=20=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 2b151d9..096ff38 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 2b151d97fc6d0d2068ed5f46934f41dd57d50c44 +Subproject commit 096ff38dd013a46809f94a815018b9ac3ea7f7ad diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 3c32a04..ffc7323 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 3c32a04b69a4bef06bc48c3d9c17a5a1d96a8fed +Subproject commit ffc7323ae85c274afed21d90e2cd744c2801a1a8 From cf4556d763de47ff8bbda1ca3595cf53603cc662 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 11 Aug 2021 13:58:43 +0800 Subject: [PATCH 03/12] =?UTF-8?q?202108=E7=89=88=E5=A4=A7=E5=B1=8F-?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B2=BB=E7=90=86=E6=9D=BF=E5=9D=97=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcScreenController.java | 56 ++++++++++- .../modules/screen/dao/EpdcScreenDao.java | 43 +++++++- .../screen/service/EpdcScreenService.java | 42 +++++++- .../service/impl/EpdcScreenServiceImpl.java | 32 +++++- .../resources/mapper/screen/EpdcScreenDao.xml | 99 +++++++++++++++++++ 5 files changed, 268 insertions(+), 4 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 86bd95d..11ce830 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -2,8 +2,10 @@ package com.elink.esua.epdc.modules.screen.controller; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.modules.screen.service.EpdcScreenService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -39,4 +41,56 @@ public class EpdcScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.gridGovernanceItemList(formDto); } + + /** + * 网格治理-事件总览-项目类别统计 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:46 + */ + @GetMapping("gridGovernance/itemCategoryStatistics") + public Result> itemCategoryStatistics() { + return epdcScreenService.itemCategoryStatistics(); + } + + /** + * 网格治理-事件总览-项目状态统计列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:47 + */ + @GetMapping("gridGovernance/itemStatusStatistics") + public Result> itemStatusStatistics() { + return epdcScreenService.itemStatusStatistics(); + } + + /** + * 网格治理-难点堵点 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:49 + */ + @GetMapping("gridGovernance/difficultItemList") + public Result> difficultItemList(@RequestBody EpdcScreenGridGovernanceItemDifficultFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.difficultItemList(formDto); + } + + /** + * 网格治理-治理情况排行 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:52 + */ + @GetMapping("gridGovernance/governanceRanking") + public Result> governanceRanking(@RequestBody EpdcScreenGridGovernanceRankingFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.governanceRanking(formDto); + } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index 8cbb0e9..9a40baa 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -1,8 +1,11 @@ package com.elink.esua.epdc.modules.screen.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -23,4 +26,42 @@ public interface EpdcScreenDao extends BaseDao gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto); + + /** + * 网格治理-事件总览-项目类别统计 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:46 + */ + List itemCategoryStatistics(); + + /** + * 网格治理-事件总览-项目状态统计列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:47 + */ + List itemStatusStatistics(); + + /** + * 网格治理-难点堵点 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:49 + */ + List difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto); + + /** + * 网格治理-治理情况排行 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:52 + */ + List governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index 80b493d..55c3ff1 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -1,8 +1,10 @@ package com.elink.esua.epdc.modules.screen.service; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import java.util.List; @@ -23,4 +25,42 @@ public interface EpdcScreenService { * @since 2021/8/10 13:49 */ Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto); + + /** + * 网格治理-事件总览-项目类别统计 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:46 + */ + Result> itemCategoryStatistics(); + + /** + * 网格治理-事件总览-项目状态统计列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:47 + */ + Result> itemStatusStatistics(); + + /** + * 网格治理-难点堵点 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:49 + */ + Result> difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto); + + /** + * 网格治理-治理情况排行 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:52 + */ + Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index 34301b2..bd130c6 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -3,8 +3,10 @@ package com.elink.esua.epdc.modules.screen.service.impl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.modules.screen.dao.EpdcScreenDao; import com.elink.esua.epdc.modules.screen.service.EpdcScreenService; import org.springframework.stereotype.Service; @@ -27,4 +29,32 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl data = baseDao.gridGovernanceItemList(formDto); return new Result>().ok(data); } + + @Override + public Result> itemCategoryStatistics() { + List data = baseDao.itemCategoryStatistics(); + return new Result>().ok(data); + } + + @Override + public Result> itemStatusStatistics() { + List data = baseDao.itemStatusStatistics(); + return new Result>().ok(data); + } + + @Override + public Result> difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.difficultItemList(formDto); + return new Result>().ok(data); + } + + @Override + public Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.governanceRanking(formDto); + return new Result>().ok(data); + } } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 2827ac3..ddcca01 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -24,4 +24,103 @@ LIMIT #{pageIndex}, #{pageSize} + + + + + + + + From cd61543d72eab633f61f769e243a08ea4a03cc5d Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 11 Aug 2021 19:16:55 +0800 Subject: [PATCH 04/12] =?UTF-8?q?202108=E7=89=88=E5=A4=A7=E5=B1=8F-?= =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=BC=95=E9=A2=86=E6=9D=BF=E5=9D=97=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcScreenController.java | 83 +++++++++++- .../modules/screen/dao/EpdcScreenDao.java | 61 ++++++++- .../screen/service/EpdcScreenService.java | 62 ++++++++- .../service/impl/EpdcScreenServiceImpl.java | 47 ++++++- .../resources/mapper/screen/EpdcScreenDao.xml | 118 ++++++++++++++++++ 5 files changed, 359 insertions(+), 12 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 11ce830..96f6c33 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -2,9 +2,7 @@ package com.elink.esua.epdc.modules.screen.controller; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.modules.screen.service.EpdcScreenService; import org.springframework.beans.factory.annotation.Autowired; @@ -93,4 +91,83 @@ public class EpdcScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.governanceRanking(formDto); } + + /** + * 党建引领-内容列表接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:31 + */ + @GetMapping("partyBuilding/noticeList") + public Result> noticeList(@RequestBody EpdcScreenPartyBuildingNoticeListFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.noticeList(formDto); + } + + /** + * 党建引领-党组织活动排名接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 16:52 + */ + @GetMapping("partyBuilding/partyOrgActList") + public Result> partyOrgActList(@RequestBody EpdcScreenPartyBuildingPartyOrgActFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.partyOrgActList(formDto); + } + + /** + * 党建引领-党组织类型列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + @GetMapping("partyBuilding/partyOrgTypeList") + public Result> partyOrgTypeList() { + return epdcScreenService.partyOrgTypeList(); + } + + /** + * 党建引领-党组织列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + @GetMapping("partyBuilding/partyOrgList") + public Result> partyOrgList() { + return epdcScreenService.partyOrgList(); + } + + /** + * 党建引领-党员亮身份列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + @GetMapping("partyBuilding/brightIdentity") + public Result> brightIdentity(@RequestBody EpdcScreenPartyBuildingBrightIdentityFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.brightIdentity(formDto); + } + + /** + * 党建引领-党员画像 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + @GetMapping("partyBuilding/partyMemberAge") + public Result> partyMemberAge() { + return epdcScreenService.partyMemberAge(); + } + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index 9a40baa..99ab86b 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -2,9 +2,7 @@ package com.elink.esua.epdc.modules.screen.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import org.apache.ibatis.annotations.Mapper; @@ -64,4 +62,61 @@ public interface EpdcScreenDao extends BaseDao governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto); + + /** + * 党建引领-内容列表接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:31 + */ + List noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto); + + /** + * 党建引领-党组织活动排名接口 + * + * @param formDto + * @return java.util.List + * @author Liuchuang + * @since 2021/8/11 16:57 + */ + List partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto); + + /** + * 党建引领-党组织类型列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + List partyOrgTypeList(); + + /** + * 党建引领-党组织列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + List partyOrgList(); + + /** + * 党建引领-党员亮身份列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + List brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto); + + /** + * 党建引领-党员画像 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + List partyMemberAge(); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index 55c3ff1..4119800 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -1,9 +1,7 @@ package com.elink.esua.epdc.modules.screen.service; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import java.util.List; @@ -63,4 +61,62 @@ public interface EpdcScreenService { * @since 2021/8/11 9:52 */ Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto); + + /** + * 党建引领-内容列表接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:31 + */ + Result> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto); + + /** + * 党建引领-党组织活动排名接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 16:52 + */ + Result> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto); + + /** + * 党建引领-党组织类型列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + Result> partyOrgTypeList(); + + /** + * 党建引领-党组织列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + Result> partyOrgList(); + + /** + * 党建引领-党员亮身份列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto); + + /** + * 党建引领-党员画像 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + Result> partyMemberAge(); + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index bd130c6..64b43bf 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -3,9 +3,8 @@ package com.elink.esua.epdc.modules.screen.service.impl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.modules.screen.dao.EpdcScreenDao; import com.elink.esua.epdc.modules.screen.service.EpdcScreenService; @@ -57,4 +56,46 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl data = baseDao.governanceRanking(formDto); return new Result>().ok(data); } + + @Override + public Result> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.noticeList(formDto); + return new Result>().ok(data); + } + + @Override + public Result> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.partyOrgActList(formDto); + return new Result>().ok(data); + } + + @Override + public Result> partyOrgTypeList() { + List data = baseDao.partyOrgTypeList(); + return new Result>().ok(data); + } + + @Override + public Result> partyOrgList() { + List data = baseDao.partyOrgList(); + return new Result>().ok(data); + } + + @Override + public Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.brightIdentity(formDto); + return new Result>().ok(data); + } + + @Override + public Result> partyMemberAge() { + List data = baseDao.partyMemberAge(); + return new Result>().ok(data); + } } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index ddcca01..8329329 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -123,4 +123,122 @@ LIMIT #{pageIndex}, #{pageSize} + + + + + + + + + + + + From f1a321858ae3b8789eb812341b7a3028a228f17d Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 11 Aug 2021 19:54:46 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20analysis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcScreenController.java | 17 +++ .../modules/screen/dao/EpdcScreenDao.java | 16 +++ .../screen/service/EpdcScreenService.java | 16 +++ .../service/impl/EpdcScreenServiceImpl.java | 12 ++ .../resources/mapper/screen/EpdcScreenDao.xml | 115 ++++++++++++------ epdc-cloud-client-yushan | 2 +- 6 files changed, 138 insertions(+), 40 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 11ce830..457bab2 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -93,4 +93,21 @@ public class EpdcScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.governanceRanking(formDto); } + + /** + *首页-组织信息接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/11 15:23 + */ + @GetMapping("frontPage/deptInfoList") + public Result> frontPageDeptInfoList(){ + return epdcScreenService.frontPageDeptInfoList(); + } + + @GetMapping("frontPage/personInfoStatistics") + public Result> frontPagePersonInfoStatisticsList(){ + return epdcScreenService.frontPagePersonInfoStatisticsList(); + } + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index 9a40baa..cf5c9e3 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -64,4 +64,20 @@ public interface EpdcScreenDao extends BaseDao governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto); + + /** + * 首页-组织信息接口 + * @return java.util.List + * @author zhangfenghe + * @since 2021/8/11 15:42 + */ + List frontPageDeptInfoList(); + + /** + * 首页-人口类型统计接口 + * @return java.util.List + * @author zhangfenghe + * @since 2021/8/11 17:46 + */ + List frontPagePersonInfoStatisticsList(); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index 55c3ff1..30c1e11 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -63,4 +63,20 @@ public interface EpdcScreenService { * @since 2021/8/11 9:52 */ Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto); + + /** + * 首页-组织信息接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/11 15:26 + */ + Result> frontPageDeptInfoList(); + + /** + * 首页-人口类型统计接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/11 17:38 + */ + Result> frontPagePersonInfoStatisticsList(); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index bd130c6..ee40b30 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -57,4 +57,16 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl data = baseDao.governanceRanking(formDto); return new Result>().ok(data); } + + @Override + public Result> frontPageDeptInfoList() { + List data = baseDao.frontPageDeptInfoList(); + return new Result>().ok(data); + } + + @Override + public Result> frontPagePersonInfoStatisticsList() { + List data = baseDao.frontPagePersonInfoStatisticsList(); + return new Result>().ok(data); + } } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index ddcca01..f698328 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -3,28 +3,30 @@ - SELECT - i.ID, - i.ITEM_CONTENT, - c.CATEGORY_NAME, - i.DISTRIBUTE_TIME, - IFNULL(e.APPROVE_NUM + e.OPPOSE_NUM + e.COMMENT_NUM, 0) AS attentionNum + i.ID, + i.ITEM_CONTENT, + c.CATEGORY_NAME, + i.DISTRIBUTE_TIME, + IFNULL(e.APPROVE_NUM + e.OPPOSE_NUM + e.COMMENT_NUM, 0) AS attentionNum FROM - yushan_esua_epdc_events.epdc_item i - LEFT JOIN yushan_esua_epdc_events.epdc_category c ON c.CATEGORY_CODE = i.CATEGORY_CODE - LEFT JOIN yushan_esua_epdc_events.epdc_events e ON e.ID = i.EVENT_ID + yushan_esua_epdc_events.epdc_item i + LEFT JOIN yushan_esua_epdc_events.epdc_category c ON c.CATEGORY_CODE = i.CATEGORY_CODE + LEFT JOIN yushan_esua_epdc_events.epdc_events e ON e.ID = i.EVENT_ID WHERE - i.DEL_FLAG = '0' + i.DEL_FLAG = '0' ORDER BY attentionNum DESC, - i.DISTRIBUTE_TIME DESC + i.DISTRIBUTE_TIME DESC LIMIT #{pageIndex}, #{pageSize} - SELECT ec.CATEGORY_NAME, t.itemNum @@ -48,7 +50,8 @@ AND ec.CATEGORY_TYPE = '0' - SELECT IFNULL(SUM(ITEM_STATE = 0), 0) AS processingNum, IFNULL(SUM(ITEM_STATE = 5 OR ITEM_STATE = 10), 0) AS completedNum @@ -58,23 +61,24 @@ DEL_FLAG = '0' - SELECT - di.EVENT_ID, - di.ITEM_CONTENT, - di.DISTRIBUTE_TIME, - di.SPEND_TIME, - di.HANDLE_TOTAL, - di.DEPT_TOTAL + di.EVENT_ID, + di.ITEM_CONTENT, + di.DISTRIBUTE_TIME, + di.SPEND_TIME, + di.HANDLE_TOTAL, + di.DEPT_TOTAL FROM - yushan_esua_epdc_analysis.epdc_difficult_item di, - yushan_esua_epdc_analysis.epdc_item_difficult_config dc + yushan_esua_epdc_analysis.epdc_difficult_item di, + yushan_esua_epdc_analysis.epdc_item_difficult_config dc WHERE - di.DEL_FLAG = '0' - AND ( - di.SPEND_TIME >= dc.MIN_SPEND_TIME - OR di.HANDLE_TOTAL >= dc.MIN_HANDLE_TOTAL - OR di.DEPT_TOTAL >= dc.MIN_DEPT_TOTAL) + di.DEL_FLAG = '0' + AND ( + di.SPEND_TIME >= dc.MIN_SPEND_TIME + OR di.HANDLE_TOTAL >= dc.MIN_HANDLE_TOTAL + OR di.DEPT_TOTAL >= dc.MIN_DEPT_TOTAL) ORDER BY di.SPEND_TIME DESC, @@ -85,24 +89,25 @@ di.HANDLE_TOTAL DESC, - di.DISTRIBUTE_TIME DESC + di.DISTRIBUTE_TIME DESC LIMIT #{pageIndex}, #{pageSize} - SELECT - DEPT_ID, - DEPT_NAME, - REGISTRATION_RATE, - RESPONSE_RATE, - RESOLUTION_RATE, - SATISFACTION_RATE, - AUTONOMY_RATE + DEPT_ID, + DEPT_NAME, + REGISTRATION_RATE, + RESPONSE_RATE, + RESOLUTION_RATE, + SATISFACTION_RATE, + AUTONOMY_RATE FROM - yushan_esua_epdc_analysis.epdc_screen_governance_ranking + yushan_esua_epdc_analysis.epdc_screen_governance_ranking WHERE - DEL_FLAG = '0' - AND STATISTIC_TYPE = #{statisticType} + DEL_FLAG = '0' + AND STATISTIC_TYPE = #{statisticType} ORDER BY REGISTRATION_RATE DESC, @@ -123,4 +128,36 @@ LIMIT #{pageIndex}, #{pageSize} + + + diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 096ff38..387fab2 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 096ff38dd013a46809f94a815018b9ac3ea7f7ad +Subproject commit 387fab21c68235b15c886a70359a22c2ad91caa4 From cb9baa662d14fe7702f3bc798ce128e8ca2a262f Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 12 Aug 2021 13:45:57 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20analysis=20=E7=96=AB?= =?UTF-8?q?=E6=83=85=E9=98=B2=E6=8E=A7-=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E6=83=85=E5=86=B5=E7=BB=9F=E8=AE=A1=E3=80=81=E7=96=AB?= =?UTF-8?q?=E6=83=85=E9=98=B2=E6=8E=A7-=E7=A4=BE=E5=8C=BA=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E6=83=85=E5=86=B5=E7=BB=9F=E8=AE=A1=E3=80=81=E7=96=AB?= =?UTF-8?q?=E6=83=85=E9=98=B2=E6=8E=A7-=E6=8E=A5=E7=A7=8D=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=BB=9F=E8=AE=A1=E3=80=81=E7=96=AB=E6=83=85=E9=98=B2?= =?UTF-8?q?=E6=8E=A7-=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E5=B9=B4?= =?UTF-8?q?=E9=BE=84=E5=88=86=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcScreenController.java | 72 +++++++++++++++- .../modules/screen/dao/EpdcScreenDao.java | 50 ++++++++++- .../screen/service/EpdcScreenService.java | 49 ++++++++++- .../service/impl/EpdcScreenServiceImpl.java | 44 ++++++++-- .../resources/mapper/screen/EpdcScreenDao.xml | 85 ++++++++++++++++++- epdc-cloud-client-yushan | 2 +- 6 files changed, 281 insertions(+), 21 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 457bab2..1fbb2b3 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -2,9 +2,7 @@ package com.elink.esua.epdc.modules.screen.controller; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.modules.screen.service.EpdcScreenService; import org.springframework.beans.factory.annotation.Autowired; @@ -105,9 +103,75 @@ public class EpdcScreenController { return epdcScreenService.frontPageDeptInfoList(); } + /** + *首页-人口类型统计接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/11 20:01 + */ @GetMapping("frontPage/personInfoStatistics") - public Result> frontPagePersonInfoStatisticsList(){ + public Result frontPagePersonInfoStatisticsList(){ return epdcScreenService.frontPagePersonInfoStatisticsList(); } + /** + * 首页-房屋类型统计接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/11 20:02 + */ + @GetMapping("frontPage/houseTypeStatistics") + public Result frontPageHouseTypeStatistics(){ + return epdcScreenService.frontPageHouseTypeStatistics(); + } + + /** + * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据） + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/12 10:10 + */ + @GetMapping("epidemic/vaccinationStatistics") + public Result epidemicVaccinationStatistics(){ + return epdcScreenService.epidemicVaccinationStatistics(); + } + + /** + * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据） + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/12 10:26 + */ + @GetMapping("epidemic/communityVaccinationStatistics") + public Result> epidemicCommunityVaccinationStatisticsList(@RequestBody EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.epidemicCommunityVaccinationStatisticsList(formDto); + } + + /** + * 疫情防控-接种企业统计 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author jyyzz + * @since 2021/8/12 11:26 + */ + @GetMapping("epidemic/companyVaccinationStatistics") + public Result> epidemicCompanyVaccinationStatisticsList(){ + return epdcScreenService.epidemicCompanyVaccinationStatisticsList(); + } + + /** + * 疫情防控-疫苗接种年龄分布 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author jyyzz + * @since 2021/8/12 12:35 + */ + @GetMapping("vaccination/ageVaccinationStatistics") + public Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.vaccinationAgeVaccinationStatistics(formDto); + } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index cf5c9e3..00d769f 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -2,9 +2,7 @@ package com.elink.esua.epdc.modules.screen.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import org.apache.ibatis.annotations.Mapper; @@ -79,5 +77,49 @@ public interface EpdcScreenDao extends BaseDao frontPagePersonInfoStatisticsList(); + EpdcScreenFrontPagePersonInfoStatisticsResultDTO frontPagePersonInfoStatisticsList(); + + /** + * 首页-房屋类型统计接口 + * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO + * @author zhangfenghe + * @since 2021/8/11 20:07 + */ + EpdcScreenFrontPageHouseTypeStatisticsResultDTO frontPageHouseTypeStatistics(); + + /** + * 疫情防控-疫苗接种情况统计 + * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicVaccinationStatisticsResultDTO + * @author zhangfenghe + * @since 2021/8/11 23:41 + */ + EpdcScreenEpidemicVaccinationStatisticsResultDTO epidemicVaccinationStatistics(); + + /** + * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据） + * @params [formDTO] + * @return java.util.List + * @author jyyzz + * @since 2021/8/12 10:41 + */ + List epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDTO); + + /** + * 疫情防控-接种企业统计 + * @params [] + * @return java.util.List + * @author jyyzz + * @since 2021/8/12 11:31 + */ + List epidemicCompanyVaccinationStatisticsList(); + + /** + *疫情防控-疫苗接种年龄分布 + * @params [formDto] + * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO + * @author jyyzz + * @since 2021/8/12 12:41 + */ + EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto); + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index 30c1e11..32ae2bc 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -1,10 +1,9 @@ package com.elink.esua.epdc.modules.screen.service; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; +import org.springframework.web.bind.annotation.GetMapping; import java.util.List; @@ -78,5 +77,47 @@ public interface EpdcScreenService { * @author zhangfenghe * @since 2021/8/11 17:38 */ - Result> frontPagePersonInfoStatisticsList(); + Result frontPagePersonInfoStatisticsList(); + + /** + * 首页-房屋类型统计接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/11 20:03 + */ + Result frontPageHouseTypeStatistics(); + /** + * 疫情防控-疫苗接种情况统计 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/11 23:39 + */ + Result epidemicVaccinationStatistics(); + + /** + * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据） + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author jyyzz + * @since 2021/8/12 10:31 + */ + Result> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto); + + /** + * 疫情防控-接种企业统计 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author jyyzz + * @since 2021/8/12 11:27 + */ + Result> epidemicCompanyVaccinationStatisticsList(); + + /** + * 疫情防控-疫苗接种年龄分布 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author jyyzz + * @since 2021/8/12 12:36 + */ + Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index ee40b30..c2909ae 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -3,9 +3,7 @@ package com.elink.esua.epdc.modules.screen.service.impl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.modules.screen.dao.EpdcScreenDao; import com.elink.esua.epdc.modules.screen.service.EpdcScreenService; @@ -65,8 +63,42 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl> frontPagePersonInfoStatisticsList() { - List data = baseDao.frontPagePersonInfoStatisticsList(); - return new Result>().ok(data); + public Result frontPagePersonInfoStatisticsList() { + EpdcScreenFrontPagePersonInfoStatisticsResultDTO data = baseDao.frontPagePersonInfoStatisticsList(); + return new Result().ok(data); } + + @Override + public Result frontPageHouseTypeStatistics() { + EpdcScreenFrontPageHouseTypeStatisticsResultDTO data = baseDao.frontPageHouseTypeStatistics(); + return new Result().ok(data); + } + + @Override + public Result epidemicVaccinationStatistics() { + EpdcScreenEpidemicVaccinationStatisticsResultDTO data = baseDao.epidemicVaccinationStatistics(); + return new Result().ok(data); + } + + @Override + public Result> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE)*formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.epidemicCommunityVaccinationStatisticsList(formDto); + return new Result>().ok(data); + } + + @Override + public Result> epidemicCompanyVaccinationStatisticsList() { + List data = baseDao.epidemicCompanyVaccinationStatisticsList() + return new Result>().ok(data); + } + + @Override + public Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto) { + EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO data = baseDao.vaccinationAgeVaccinationStatistics(formDto); + return new Result().ok(data); + } + + } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index f698328..838a00e 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -155,9 +155,90 @@ + + + + + + + + + + diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 387fab2..e538352 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 387fab21c68235b15c886a70359a22c2ad91caa4 +Subproject commit e5383528fa125ed6da9fdae023c5432bc38ee154 From 71fee45aacf8505c202fe41b6ddfb27ec2b55bce Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 12 Aug 2021 17:03:39 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20analysis=20=E7=96=AB?= =?UTF-8?q?=E6=83=85=E9=98=B2=E6=8E=A7-=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E4=BA=BA=E5=8F=A3=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcScreenController.java | 18 +++++++++-- .../modules/screen/dao/EpdcScreenDao.java | 15 +++++++-- .../screen/service/EpdcScreenService.java | 13 ++++++-- .../service/impl/EpdcScreenServiceImpl.java | 8 ++++- .../resources/mapper/screen/EpdcScreenDao.xml | 31 ++++++++++++------- 5 files changed, 65 insertions(+), 20 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 9d20969..8a6de62 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -233,7 +233,7 @@ public class EpdcScreenController { * 疫情防控-接种企业统计 * @params [] * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 11:26 */ @GetMapping("epidemic/companyVaccinationStatistics") @@ -245,12 +245,24 @@ public class EpdcScreenController { * 疫情防控-疫苗接种年龄分布 * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 12:35 */ @GetMapping("vaccination/ageVaccinationStatistics") - public Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto){ + public Result vaccinationAgeVaccinationStatistics(@RequestBody EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto){ ValidatorUtils.validateEntity(formDto); return epdcScreenService.vaccinationAgeVaccinationStatistics(formDto); } + + /** + *疫情防控-疫苗接种人口类型统计 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/12 15:29 + */ + public Result vaccinationPersonVaccinationStatistics(@RequestBody EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.vaccinationPersonVaccinationStatistics(formDto); + } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index e8f8199..60dfc38 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -156,7 +156,7 @@ public interface EpdcScreenDao extends BaseDao - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 10:41 */ List epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDTO); @@ -165,7 +165,7 @@ public interface EpdcScreenDao extends BaseDao - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 11:31 */ List epidemicCompanyVaccinationStatisticsList(); @@ -174,9 +174,18 @@ public interface EpdcScreenDao extends BaseDao> - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 10:31 */ Result> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto); @@ -165,7 +165,7 @@ public interface EpdcScreenService { * 疫情防控-接种企业统计 * @params [] * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 11:27 */ Result> epidemicCompanyVaccinationStatisticsList(); @@ -178,4 +178,13 @@ public interface EpdcScreenService { * @since 2021/8/12 12:36 */ Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto); + + /** + *疫情防控-疫苗接种人口类型统计 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/12 15:30 + */ + Result vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index 3a1a55e..996d8db 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -134,7 +134,7 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl> epidemicCompanyVaccinationStatisticsList() { - List data = baseDao.epidemicCompanyVaccinationStatisticsList() + List data = baseDao.epidemicCompanyVaccinationStatisticsList(); return new Result>().ok(data); } @@ -144,5 +144,11 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl().ok(data); } + @Override + public Result vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto) { + EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO data = baseDao.vaccinationPersonVaccinationStatistics(formDto); + return new Result().ok(data); + } + } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 7810b71..031ba82 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -316,16 +316,16 @@ WHERE DEL_FLAG = '0' ORDER BY - VACCINATION_COMPLETED_NUM DESC + VACCINATION_COMPLETED_NUM DESC, - ONE_SHOT_NUM DESC + ONE_SHOT_NUM DESC, - TWO_SHOTS_NUM DESC + TWO_SHOTS_NUM DESC, - NOT_VACCINATED_NUM DESC + NOT_VACCINATED_NUM DESC, DEPT_NAME LIMIT #{pageIndex}, #{pageSize} @@ -342,16 +342,25 @@ + + From 8d00c71da428eb454f4dcf83f4930fa1fe71b94a Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 12 Aug 2021 18:47:26 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20analysis=20=E9=A6=96?= =?UTF-8?q?=E9=A1=B5-=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=9B=B4=E6=96=B0sql=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/screen/EpdcScreenDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 031ba82..3389bbc 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -258,8 +258,8 @@ edi.IMG_URL, edi.IMG_TYPE FROM sys_dept_info sdi - LEFT JOIN sys_dept sd WHERE sd.ID = sdi.DEPR_ID - LEFT JOIN epdc_admin_img edi WHERE edi.REFERENCE_ID = sdi.ID + LEFT JOIN sys_dept sd ON sd.ID = sdi.DEPT_ID + LEFT JOIN epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID WHERE sd.del_flag = '0' AND sdi.DEL_FLAG = '0' AND edi.DEL_FLAG = '0' From 54ac0a6fa8175e3c5c9ca27a93b7c9a7cb3fdee1 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Fri, 13 Aug 2021 16:21:15 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcScreenController.java | 1 + .../resources/mapper/screen/EpdcScreenDao.xml | 27 +++++++++---------- epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 8a6de62..e0dd2f9 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -261,6 +261,7 @@ public class EpdcScreenController { * @author zhangfenghe * @since 2021/8/12 15:29 */ + @GetMapping("vaccination/personVaccinationStatistics") public Result vaccinationPersonVaccinationStatistics(@RequestBody EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto){ ValidatorUtils.validateEntity(formDto); return epdcScreenService.vaccinationPersonVaccinationStatistics(formDto); diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 3389bbc..d28f636 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -244,9 +244,9 @@ @@ -283,20 +283,19 @@ sum(if(HOUSE_TYPE ='2',HOUSE_NUM ,0)) as dormitoryNum, sum(if(HOUSE_TYPE ='3',HOUSE_NUM ,0)) as vacantNum, sum(if(HOUSE_TYPE ='4',HOUSE_NUM ,0)) as otherNum - FROM epdc_screen_house_type_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_house_type_statistics WHERE DEL_FLAG = '0' @@ -348,7 +347,7 @@ SUM(AGE_FORTY_ONE_FIFTY) AS ageFortyOneFifty, SUM(AGE_FIFTY_ONE_SIXTY) AS ageFiftyOneSixty, SUM(AGE_OVER_SIXTY) AS ageOverSixty - FROM epdc_screen_vaccination_age_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_age_statistics WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -359,7 +358,7 @@ SUM(PERMANENT_RESIDENCE_NUM) AS permanentResidenceNum, SUM(FLOATING_POPULATION_NUM) AS floatingPopulationNum, SUM(FOREIGN_POPULATION_NUM) AS foreignPopulationNum - FROM epdc_screen_vaccination_person_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_person_statistics WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index e538352..688b6ec 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit e5383528fa125ed6da9fdae023c5432bc38ee154 +Subproject commit 688b6ec20ea6e5868994c27d8d67cae5238654ed diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index ffc7323..b2a4ab3 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit ffc7323ae85c274afed21d90e2cd744c2801a1a8 +Subproject commit b2a4ab3cff9f848c77e7ec6b428321639270f734 From 3690d45e89e33710ab90f39dbd3d41954a06dca2 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Fri, 13 Aug 2021 17:29:10 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20=20=E9=A6=96=E9=A1=B5-?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/screen/EpdcScreenDao.xml | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index d28f636..3c10f99 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -2,7 +2,23 @@ - + + + + + + + + + + + + + + + + + - SELECT - sd.id, - sd.name, - sd.type_key, - sdi.introduction, - sdi.COMMUNITY_NUM, - sdi.GRID_NUM, - sdi.GRIDMAN_NUM, - sdi.PARTY_MEMBER_NUM, - sdi.LONGITUDE, - sdi.LATITUDE, - sdi.ACREAGE, - edi.IMG_URL, - edi.IMG_TYPE + sd.id AS id, + sd.name AS name, + sd.type_key AS typeKey, + sdi.introduction AS introduction, + sdi.COMMUNITY_NUM AS communityNum, + sdi.GRID_NUM AS gridNum, + sdi.GRIDMAN_NUM AS gridmanNum, + sdi.PARTY_MEMBER_NUM AS partyMemberNum, + sdi.LONGITUDE AS longitude, + sdi.LATITUDE AS latitude, + sdi.ACREAGE AS acreage, + edi.IMG_URL AS imgUrl, + edi.IMG_TYPE AS imgType FROM sys_dept_info sdi LEFT JOIN sys_dept sd ON sd.ID = sdi.DEPT_ID LEFT JOIN epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID From ea2256118689d229f4da084dd446187ef4557519 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 18 Aug 2021 15:47:28 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20=20=E9=A6=96=E9=A1=B5-?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=8F=82typeKey=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/screen/controller/EpdcScreenController.java | 5 +++-- .../elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java | 2 +- .../esua/epdc/modules/screen/service/EpdcScreenService.java | 2 +- .../modules/screen/service/impl/EpdcScreenServiceImpl.java | 4 ++-- .../src/main/resources/mapper/screen/EpdcScreenDao.xml | 3 +++ epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index e0dd2f9..c477ef4 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -178,8 +178,9 @@ public class EpdcScreenController { * @since 2021/8/11 15:23 */ @GetMapping("frontPage/deptInfoList") - public Result> frontPageDeptInfoList(){ - return epdcScreenService.frontPageDeptInfoList(); + public Result> frontPageDeptInfoList(@RequestBody EpdcScreenFrontPageDeptInfoFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.frontPageDeptInfoList(formDto); } /** diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index 60dfc38..8b44cec 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -126,7 +126,7 @@ public interface EpdcScreenDao extends BaseDao frontPageDeptInfoList(); + List frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto); /** * 首页-人口类型统计接口 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index ed9bb24..e2a7f0a 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -127,7 +127,7 @@ public interface EpdcScreenService { * @author zhangfenghe * @since 2021/8/11 15:26 */ - Result> frontPageDeptInfoList(); + Result> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto); /** * 首页-人口类型统计接口 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index 996d8db..b97fcbc 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -101,8 +101,8 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl> frontPageDeptInfoList() { - List data = baseDao.frontPageDeptInfoList(); + public Result> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto) { + List data = baseDao.frontPageDeptInfoList(formDto); return new Result>().ok(data); } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 3c10f99..3b3de69 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -278,6 +278,9 @@ WHERE sd.del_flag = '0' AND sdi.DEL_FLAG = '0' AND edi.DEL_FLAG = '0' + + AND sd.type_key = #{typeKey} +