From 504b2810d5fab9d94d91f4ec767bc9d410e991d1 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 18 Aug 2020 10:39:52 +0800
Subject: [PATCH 001/127] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86+?=
=?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/screen/AgencyController.java | 15 +++
.../screen/DistributionController.java | 15 +++
.../screen/GrassRootsGovernController.java | 15 +++
.../screen/GrassrootsPartyDevController.java | 15 +++
.../controller/screen/IndexController.java | 15 +++
.../screen/PartyMemberLeadController.java | 15 +++
.../controller/screen/ProjectController.java | 15 +++
.../dao/screen/ScreenCpcBaseDataDao.java | 31 +++++
.../dao/screen/ScreenCustomerAgencyDao.java | 31 +++++
.../dao/screen/ScreenDifficultyDataDao.java | 31 +++++
.../epmet/dao/screen/ScreenEventDataDao.java | 31 +++++
.../dao/screen/ScreenEventImgDataDao.java | 31 +++++
.../dao/screen/ScreenGovernRankDataDao.java | 31 +++++
.../epmet/dao/screen/ScreenIndexDataDao.java | 31 +++++
.../dao/screen/ScreenOrgRankDataDao.java | 31 +++++
.../dao/screen/ScreenPartyBranchDataDao.java | 31 +++++
.../screen/ScreenPartyLinkMassesDataDao.java | 31 +++++
.../screen/ScreenPartyUserRankDataDao.java | 31 +++++
.../dao/screen/ScreenPioneerDataDao.java | 31 +++++
.../epmet/dao/screen/ScreenUserJoinDao.java | 31 +++++
.../dao/screen/ScreenUserTotalDataDao.java | 31 +++++
.../ScreenVoluntaryActivityDataDao.java | 31 +++++
.../epmet/service/screen/AgencyService.java | 10 ++
.../service/screen/DistributionService.java | 10 ++
.../screen/GrassRootsGovernService.java | 10 ++
.../screen/GrassrootsPartyDevService.java | 10 ++
.../epmet/service/screen/IndexService.java | 10 ++
.../screen/PartyMemberLeadService.java | 10 ++
.../epmet/service/screen/ProjectService.java | 10 ++
.../screen/impl/AgencyServiceImpl.java | 12 ++
.../screen/impl/DistributionServiceImpl.java | 12 ++
.../impl/GrassRootsGovernServiceImpl.java | 12 ++
.../impl/GrassrootsPartyDevServiceImpl.java | 12 ++
.../service/screen/impl/IndexServiceImpl.java | 12 ++
.../impl/PartyMemberLeadServiceImpl.java | 12 ++
.../screen/impl/ProjectServiceImpl.java | 12 ++
.../mapper/screen/ScreenCpcBaseDataDao.xml | 8 ++
.../mapper/screen/ScreenCustomerAgencyDao.xml | 8 ++
.../mapper/screen/ScreenDifficultyDataDao.xml | 7 +
.../mapper/screen/ScreenEventDataDao.xml | 8 ++
.../mapper/screen/ScreenEventImgDataDao.xml | 8 ++
.../mapper/screen/ScreenGovernRankDataDao.xml | 7 +
.../mapper/screen/ScreenIndexDataDao.xml | 8 ++
.../mapper/screen/ScreenOrgRankDataDao.xml | 8 ++
.../screen/ScreenPartyBranchDataDao.xml | 8 ++
.../screen/ScreenPartyLinkMassesDataDao.xml | 8 ++
.../screen/ScreenPartyUserRankDataDao.xml | 8 ++
.../mapper/screen/ScreenPioneerDataDao.xml | 7 +
.../mapper/screen/ScreenUserJoinDao.xml | 7 +
.../mapper/screen/ScreenUserTotalDataDao.xml | 8 ++
.../screen/ScreenVoluntaryActivityDataDao.xml | 8 ++
.../controller/ScreenCollController.java | 15 +++
.../dao/screen/ScreenCpcBaseDataDao.java | 33 +++++
.../dao/screen/ScreenCustomerAgencyDao.java | 33 +++++
.../dao/screen/ScreenDifficultyDataDao.java | 33 +++++
.../epmet/dao/screen/ScreenEventDataDao.java | 33 +++++
.../dao/screen/ScreenEventImgDataDao.java | 33 +++++
.../dao/screen/ScreenGovernRankDataDao.java | 33 +++++
.../epmet/dao/screen/ScreenIndexDataDao.java | 33 +++++
.../dao/screen/ScreenOrgRankDataDao.java | 33 +++++
.../dao/screen/ScreenPartyBranchDataDao.java | 33 +++++
.../screen/ScreenPartyLinkMassesDataDao.java | 33 +++++
.../screen/ScreenPartyUserRankDataDao.java | 33 +++++
.../dao/screen/ScreenPioneerDataDao.java | 33 +++++
.../epmet/dao/screen/ScreenUserJoinDao.java | 33 +++++
.../dao/screen/ScreenUserTotalDataDao.java | 33 +++++
.../ScreenVoluntaryActivityDataDao.java | 33 +++++
.../screen/ScreenCpcBaseDataEntity.java | 111 +++++++++++++++
.../screen/ScreenCustomerAgencyEntity.java | 100 ++++++++++++++
.../screen/ScreenDifficultyDataEntity.java | 116 ++++++++++++++++
.../entity/screen/ScreenEventDataEntity.java | 127 ++++++++++++++++++
.../screen/ScreenEventImgDataEntity.java | 56 ++++++++
.../screen/ScreenGovernRankDataEntity.java | 97 +++++++++++++
.../entity/screen/ScreenIndexDataEntity.java | 97 +++++++++++++
.../screen/ScreenOrgRankDataEntity.java | 112 +++++++++++++++
.../screen/ScreenPartyBranchDataEntity.java | 101 ++++++++++++++
.../ScreenPartyLinkMassesDataEntity.java | 76 +++++++++++
.../screen/ScreenPartyUserRankDataEntity.java | 96 +++++++++++++
.../screen/ScreenPioneerDataEntity.java | 91 +++++++++++++
.../entity/screen/ScreenUserJoinEntity.java | 97 +++++++++++++
.../screen/ScreenUserTotalDataEntity.java | 96 +++++++++++++
.../ScreenVoluntaryActivityDataEntity.java | 86 ++++++++++++
.../mapper/screen/ScreenCpcBaseDataDao.xml | 8 ++
.../mapper/screen/ScreenCustomerAgencyDao.xml | 8 ++
.../mapper/screen/ScreenDifficultyDataDao.xml | 8 ++
.../mapper/screen/ScreenEventDataDao.xml | 8 ++
.../mapper/screen/ScreenEventImgDataDao.xml | 7 +
.../mapper/screen/ScreenGovernRankDataDao.xml | 8 ++
.../mapper/screen/ScreenIndexDataDao.xml | 8 ++
.../mapper/screen/ScreenOrgRankDataDao.xml | 8 ++
.../screen/ScreenPartyBranchDataDao.xml | 8 ++
.../screen/ScreenPartyLinkMassesDataDao.xml | 7 +
.../screen/ScreenPartyUserRankDataDao.xml | 8 ++
.../mapper/screen/ScreenPioneerDataDao.xml | 8 ++
.../mapper/screen/ScreenUserJoinDao.xml | 8 ++
.../mapper/screen/ScreenUserTotalDataDao.xml | 8 ++
.../screen/ScreenVoluntaryActivityDataDao.xml | 8 ++
97 files changed, 2927 insertions(+)
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/AgencyController.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassRootsGovernController.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassrootsPartyDevController.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/IndexController.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/PartyMemberLeadController.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/ProjectController.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/AgencyService.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/DistributionService.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassRootsGovernService.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassrootsPartyDevService.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/IndexService.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/PartyMemberLeadService.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/ProjectService.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/AgencyServiceImpl.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/DistributionServiceImpl.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassRootsGovernServiceImpl.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassrootsPartyDevServiceImpl.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/IndexServiceImpl.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/PartyMemberLeadServiceImpl.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/ProjectServiceImpl.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCpcBaseDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerAgencyEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventImgDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenGovernRankDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenOrgRankDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyLinkMassesDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyUserRankDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPioneerDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserTotalDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenVoluntaryActivityDataEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/AgencyController.java
new file mode 100644
index 0000000000..73c93f89f5
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/AgencyController.java
@@ -0,0 +1,15 @@
+package com.epmet.controller.screen;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 组织相关api
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/18 10:15
+ */
+@RestController
+@RequestMapping("/screen/agency")
+public class AgencyController {
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java
new file mode 100644
index 0000000000..af386611f1
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java
@@ -0,0 +1,15 @@
+package com.epmet.controller.screen;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 中央区相关各指标查询
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/18 10:14
+ */
+@RestController
+@RequestMapping("/screen/distribution")
+public class DistributionController {
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassRootsGovernController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassRootsGovernController.java
new file mode 100644
index 0000000000..2d2c251a26
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassRootsGovernController.java
@@ -0,0 +1,15 @@
+package com.epmet.controller.screen;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 基层治理相关各指标查询
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/18 10:12
+ */
+@RestController
+@RequestMapping("/screen/grassrootsgovern")
+public class GrassRootsGovernController {
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassrootsPartyDevController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassrootsPartyDevController.java
new file mode 100644
index 0000000000..0eb55c6c2c
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/GrassrootsPartyDevController.java
@@ -0,0 +1,15 @@
+package com.epmet.controller.screen;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 基层党建相关各指标查询
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/18 10:11
+ */
+@RestController
+@RequestMapping("/screen/grassrootspartydev")
+public class GrassrootsPartyDevController {
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/IndexController.java
new file mode 100644
index 0000000000..6bd6faab9b
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/IndexController.java
@@ -0,0 +1,15 @@
+package com.epmet.controller.screen;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 指数相关相关各指标查询
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/18 10:13
+ */
+@RestController
+@RequestMapping("/screen/index")
+public class IndexController {
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/PartyMemberLeadController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/PartyMemberLeadController.java
new file mode 100644
index 0000000000..6f730e9711
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/PartyMemberLeadController.java
@@ -0,0 +1,15 @@
+package com.epmet.controller.screen;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 党建引领相关各指标查询
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/18 10:10
+ */
+@RestController
+@RequestMapping("/screen/partymemberlead")
+public class PartyMemberLeadController {
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/ProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/ProjectController.java
new file mode 100644
index 0000000000..20e5af2bf4
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/ProjectController.java
@@ -0,0 +1,15 @@
+package com.epmet.controller.screen;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 项目
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/18 10:16
+ */
+@RestController
+@RequestMapping("/screen/project")
+public class ProjectController {
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
new file mode 100644
index 0000000000..2210a3b541
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
new file mode 100644
index 0000000000..9fea45f98a
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
new file mode 100644
index 0000000000..f0d5d9ebc9
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
new file mode 100644
index 0000000000..a9c0339fa9
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
new file mode 100644
index 0000000000..c9fc631d95
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
new file mode 100644
index 0000000000..fdf84386af
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
new file mode 100644
index 0000000000..35275e613d
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
new file mode 100644
index 0000000000..60c597c6ac
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
new file mode 100644
index 0000000000..891493b386
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
new file mode 100644
index 0000000000..0d3af2a93d
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
new file mode 100644
index 0000000000..89abfabab4
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
new file mode 100644
index 0000000000..2761a3346f
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
new file mode 100644
index 0000000000..109f33a67a
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
new file mode 100644
index 0000000000..0bf7ed23aa
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
new file mode 100644
index 0000000000..416026256a
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
new file mode 100644
index 0000000000..616182f026
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
@@ -0,0 +1,15 @@
+package com.epmet.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 大屏数据采集api
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/18 10:25
+ */
+@RestController
+@RequestMapping("screencoll")
+public class ScreenCollController {
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
new file mode 100644
index 0000000000..f36b90de5a
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
new file mode 100644
index 0000000000..7c6b86064a
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
new file mode 100644
index 0000000000..59bf5ed908
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
new file mode 100644
index 0000000000..a1b422d57d
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java
new file mode 100644
index 0000000000..341a71e4fc
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
new file mode 100644
index 0000000000..c165a8c2e0
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java
new file mode 100644
index 0000000000..5824e61ce9
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
new file mode 100644
index 0000000000..416c1e73c5
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
new file mode 100644
index 0000000000..cd05f39bae
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
new file mode 100644
index 0000000000..59379fb5c2
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
new file mode 100644
index 0000000000..beb5c89990
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
new file mode 100644
index 0000000000..d5614450e5
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
new file mode 100644
index 0000000000..8d87e41a02
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
new file mode 100644
index 0000000000..67193fea32
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
new file mode 100644
index 0000000000..2d01356044
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCpcBaseDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCpcBaseDataEntity.java
new file mode 100644
index 0000000000..18eaf5d6e3
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCpcBaseDataEntity.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
new file mode 100644
index 0000000000..9fea45f98a
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
new file mode 100644
index 0000000000..9beabee8b7
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
new file mode 100644
index 0000000000..a9c0339fa9
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
new file mode 100644
index 0000000000..473e3165fa
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
new file mode 100644
index 0000000000..99af58be38
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
new file mode 100644
index 0000000000..35275e613d
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
new file mode 100644
index 0000000000..60c597c6ac
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
new file mode 100644
index 0000000000..891493b386
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
new file mode 100644
index 0000000000..48164dfcf2
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
new file mode 100644
index 0000000000..89abfabab4
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
new file mode 100644
index 0000000000..0fe5e969e3
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
new file mode 100644
index 0000000000..68b3c4133f
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
new file mode 100644
index 0000000000..0bf7ed23aa
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
new file mode 100644
index 0000000000..416026256a
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
From 02b1a3dd5ae8409bf133459a8224dc2d47dcd267 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 18 Aug 2020 13:52:06 +0800
Subject: [PATCH 002/127] =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E3=80=81?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=86=E5=B8=83=E3=80=81=E5=85=9A=E5=91=98?=
=?UTF-8?q?=E5=88=86=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epmet/screen/dto/form/BranchFormDTO.java | 24 +++++++++
.../screen/dto/form/ParymemberFormDTO.java | 24 +++++++++
.../epmet/screen/dto/form/UserFormDTO.java | 24 +++++++++
.../screen/dto/result/BranchResultDTO.java | 35 +++++++++++++
.../ParymemberDistributionResultDTO.java | 46 ++++++++++++++++
.../dto/result/ParymemberResultDTO.java | 36 +++++++++++++
.../dto/result/UserDistributionResultDTO.java | 46 ++++++++++++++++
.../screen/dto/result/UserResultDTO.java | 36 +++++++++++++
.../screen/DistributionController.java | 52 +++++++++++++++++++
.../service/screen/DistributionService.java | 32 ++++++++++++
.../screen/impl/DistributionServiceImpl.java | 39 ++++++++++++++
11 files changed, 394 insertions(+)
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchFormDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ParymemberFormDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/UserFormDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchFormDTO.java
new file mode 100644
index 0000000000..89a7bc5eaa
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 10:49 上午
+ */
+@Data
+public class BranchFormDTO implements Serializable {
+
+ private static final long serialVersionUID = -8256381995441422191L;
+
+ public interface Branch{}
+
+ /**
+ * 机关ID
+ */
+ @NotBlank(message = "机关ID不能为空",groups = {Branch.class})
+ private String agencyId;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ParymemberFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ParymemberFormDTO.java
new file mode 100644
index 0000000000..ee06b313d1
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ParymemberFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 10:49 上午
+ */
+@Data
+public class ParymemberFormDTO implements Serializable {
+
+ private static final long serialVersionUID = -5589396567320406525L;
+
+ public interface Parymember{}
+
+ /**
+ * 机关ID
+ */
+ @NotBlank(message = "机关ID不能为空",groups = {Parymember.class})
+ private String agencyId;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/UserFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/UserFormDTO.java
new file mode 100644
index 0000000000..4a3b23da00
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/UserFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 10:49 上午
+ */
+@Data
+public class UserFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 4863908542899315106L;
+
+ public interface User{}
+
+ /**
+ * 机关ID
+ */
+ @NotBlank(message = "机关ID不能为空",groups = {User.class})
+ private String agencyId;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
new file mode 100644
index 0000000000..a41d5111b0
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
@@ -0,0 +1,35 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 10:52 上午
+ */
+@Data
+public class BranchResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -8001714892170166320L;
+
+ /**
+ * 名称：根据当前所在组织，查询出的子级名称
+ */
+ private String name;
+
+ /**
+ * 可能是agencyId，也可以是gridId， 也可以是deptId
+ */
+ private String id;
+
+ /**
+ * 组织：agency 网格：grid 部门：dept
+ */
+ private String type;
+
+ /**
+ * 中心点位
+ */
+ private String centerMark;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java
new file mode 100644
index 0000000000..e663986791
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java
@@ -0,0 +1,46 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 11:06 上午
+ */
+@Data
+public class ParymemberDistributionResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 9180892033529262049L;
+
+ /**
+ * 可能是gridId,可能是agencyId
+ */
+ private String subId;
+
+ /**
+ * 中心点位
+ */
+ private String centerMark;
+
+ /**
+ * 党员总人数
+ */
+ private Integer totalNum;
+
+ /**
+ * 坐标区域
+ */
+ private String areaMarks;
+
+ /**
+ * 可以是网格的名称，可以是组织的名称
+ */
+ private String subName;
+
+ /**
+ * 组织：agency, 网格 ： grid；
+ */
+ private String type;
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java
new file mode 100644
index 0000000000..432d81f2ed
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 11:03 上午
+ */
+@Data
+public class ParymemberResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -7230556020628357047L;
+
+ /**
+ * 当前所选组织
+ */
+ private String agencyId;
+
+ /**
+ * 当前所选组织名称
+ */
+ private String name;
+
+ /**
+ * 当前所选组织的坐标区域
+ */
+ private String areaMarks;
+
+ /**
+ * 子级用户分布
+ */
+ private List userDistribution;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java
new file mode 100644
index 0000000000..15787f28ed
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java
@@ -0,0 +1,46 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 11:06 上午
+ */
+@Data
+public class UserDistributionResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -7679590088019724244L;
+
+ /**
+ * 可能是gridId,可能是agencyId
+ */
+ private String subId;
+
+ /**
+ * 中心点位
+ */
+ private String centerMark;
+
+ /**
+ * 用户总人数
+ */
+ private Integer totalNum;
+
+ /**
+ * 坐标区域
+ */
+ private String areaMarks;
+
+ /**
+ * 可以是网格的名称，可以是组织的名称
+ */
+ private String subName;
+
+ /**
+ * 组织：agency, 网格 ： grid；
+ */
+ private String type;
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java
new file mode 100644
index 0000000000..ea13de5f0c
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 11:03 上午
+ */
+@Data
+public class UserResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -6633682494274511121L;
+
+ /**
+ * 当前所选组织
+ */
+ private String agencyId;
+
+ /**
+ * 当前所选组织名称
+ */
+ private String name;
+
+ /**
+ * 当前所选组织的坐标区域
+ */
+ private String areaMarks;
+
+ /**
+ * 子级用户分布
+ */
+ private List userDistribution;
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java
index af386611f1..b142d14893 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java
@@ -1,5 +1,17 @@
package com.epmet.controller.screen;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.screen.dto.form.BranchFormDTO;
+import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.form.UserFormDTO;
+import com.epmet.screen.dto.result.BranchResultDTO;
+import com.epmet.screen.dto.result.ParymemberResultDTO;
+import com.epmet.screen.dto.result.UserResultDTO;
+import com.epmet.service.screen.DistributionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -12,4 +24,44 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/screen/distribution")
public class DistributionController {
+
+ @Autowired
+ private DistributionService distributionService;
+
+ /**
+ * @Description 1、党支部
+ * @param formDTO
+ * @author zxc
+ * @date 2020/8/18 10:59 上午
+ */
+ @PostMapping("branch")
+ public Result branch(@RequestBody BranchFormDTO formDTO){
+ ValidatorUtils.validateEntity(formDTO, BranchFormDTO.Branch.class);
+ return new Result().ok(distributionService.branch(formDTO));
+ }
+
+ /**
+ * @Description 2、用户分布
+ * @param userFormDTO
+ * @author zxc
+ * @date 2020/8/18 11:10 上午
+ */
+ @PostMapping("user")
+ public Result user(@RequestBody UserFormDTO userFormDTO){
+ ValidatorUtils.validateEntity(userFormDTO, UserFormDTO.User.class);
+ return new Result().ok(distributionService.user(userFormDTO));
+ }
+
+ /**
+ * @Description 3、党员分布
+ * @param parymemberFormDTO
+ * @author zxc
+ * @date 2020/8/18 11:20 上午
+ */
+ @PostMapping("parymember")
+ public Result parymember(@RequestBody ParymemberFormDTO parymemberFormDTO){
+ ValidatorUtils.validateEntity(parymemberFormDTO, ParymemberFormDTO.Parymember.class);
+ return new Result().ok(distributionService.parymember(parymemberFormDTO));
+ }
+
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/DistributionService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/DistributionService.java
index 138b0aeb1d..7aa880d9eb 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/DistributionService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/DistributionService.java
@@ -1,5 +1,12 @@
package com.epmet.service.screen;
+import com.epmet.screen.dto.form.BranchFormDTO;
+import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.form.UserFormDTO;
+import com.epmet.screen.dto.result.BranchResultDTO;
+import com.epmet.screen.dto.result.ParymemberResultDTO;
+import com.epmet.screen.dto.result.UserResultDTO;
+
/**
* 中央区相关各指标查询
*
@@ -7,4 +14,29 @@ package com.epmet.service.screen;
* @date 2020/8/18 10:19
*/
public interface DistributionService {
+
+ /**
+ * @Description 1、党支部
+ * @param formDTO
+ * @author zxc
+ * @date 2020/8/18 10:59 上午
+ */
+ BranchResultDTO branch(BranchFormDTO formDTO);
+
+ /**
+ * @Description 2、用户分布
+ * @param userFormDTO
+ * @author zxc
+ * @date 2020/8/18 11:10 上午
+ */
+ UserResultDTO user(UserFormDTO userFormDTO);
+
+ /**
+ * @Description 3、党员分布
+ * @param parymemberFormDTO
+ * @author zxc
+ * @date 2020/8/18 11:20 上午
+ */
+ ParymemberResultDTO parymember(ParymemberFormDTO parymemberFormDTO);
+
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/DistributionServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/DistributionServiceImpl.java
index a00c9d0665..1723fee251 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/DistributionServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/DistributionServiceImpl.java
@@ -1,5 +1,11 @@
package com.epmet.service.screen.impl;
+import com.epmet.screen.dto.form.BranchFormDTO;
+import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.form.UserFormDTO;
+import com.epmet.screen.dto.result.BranchResultDTO;
+import com.epmet.screen.dto.result.ParymemberResultDTO;
+import com.epmet.screen.dto.result.UserResultDTO;
import com.epmet.service.screen.DistributionService;
/**
@@ -9,4 +15,37 @@ import com.epmet.service.screen.DistributionService;
* @date 2020/8/18 10:19
*/
public class DistributionServiceImpl implements DistributionService {
+
+ /**
+ * @Description 1、党支部
+ * @param formDTO
+ * @author zxc
+ * @date 2020/8/18 10:59 上午
+ */
+ @Override
+ public BranchResultDTO branch(BranchFormDTO formDTO) {
+ return null;
+ }
+
+ /**
+ * @Description 2、用户分布
+ * @param userFormDTO
+ * @author zxc
+ * @date 2020/8/18 11:10 上午
+ */
+ @Override
+ public UserResultDTO user(UserFormDTO userFormDTO) {
+ return null;
+ }
+
+ /**
+ * @Description 3、党员分布
+ * @param parymemberFormDTO
+ * @author zxc
+ * @date 2020/8/18 11:20 上午
+ */
+ @Override
+ public ParymemberResultDTO parymember(ParymemberFormDTO parymemberFormDTO) {
+ return null;
+ }
}
From a7d58b956d7ee9cc1567f406118a516592935033 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 18 Aug 2020 14:24:35 +0800
Subject: [PATCH 003/127] =?UTF-8?q?=E4=BF=AE=E6=94=B9screen=5Fcustomer=5Fa?=
=?UTF-8?q?gency=E8=A1=A8=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/epmet/entity/screen/ScreenCustomerAgencyEntity.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerAgencyEntity.java
index 25134c12b0..91f37c37c1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerAgencyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerAgencyEntity.java
@@ -79,7 +79,7 @@ public class ScreenCustomerAgencyEntity extends BaseEpmetEntity {
private String centerMark;
/**
- * 党支部位置
+ * 党工委或者党委的位置，目前此阶段为预留字段
*/
private String partyMark;
From de50cf447d3c976bbb08a0db21ffc5d23bab8674 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 18 Aug 2020 14:50:20 +0800
Subject: [PATCH 004/127] =?UTF-8?q?=E6=96=B0=E5=A2=9Escreen=5Fcustomer=5Fd?=
=?UTF-8?q?ept=E3=80=81screen=5Fcustomer=5Fgrid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dao/screen/ScreenCustomerDeptDao.java | 31 ++++++++
.../dao/screen/ScreenCustomerGridDao.java | 31 ++++++++
.../mapper/screen/ScreenCustomerDeptDao.xml | 8 ++
.../mapper/screen/ScreenCustomerGridDao.xml | 8 ++
.../dao/screen/ScreenCustomerDeptDao.java | 33 ++++++++
.../dao/screen/ScreenCustomerGridDao.java | 33 ++++++++
.../screen/ScreenCustomerDeptEntity.java | 76 +++++++++++++++++++
.../screen/ScreenCustomerGridEntity.java | 76 +++++++++++++++++++
.../mapper/screen/ScreenCustomerDeptDao.xml | 8 ++
.../mapper/screen/ScreenCustomerGridDao.xml | 8 ++
10 files changed, 312 insertions(+)
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerDeptEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerGridEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
new file mode 100644
index 0000000000..3a0ac47e2a
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
new file mode 100644
index 0000000000..66c30e3e32
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
new file mode 100644
index 0000000000..7880a87e19
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
new file mode 100644
index 0000000000..be0e30d3b5
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerDeptEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerDeptEntity.java
new file mode 100644
index 0000000000..2dc5f09cc4
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerDeptEntity.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
new file mode 100644
index 0000000000..66c30e3e32
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
From e9dff01a4e4d3f6756bb0485518672b82e946f46 Mon Sep 17 00:00:00 2001
From: wangchao
Date: Tue, 18 Aug 2020 15:41:27 +0800
Subject: [PATCH 005/127] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=9F=BA=E6=9C=AC?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../result/PartymemberPercentResultDTO.java | 34 +++++++++++++++++++
.../dao/screen/ScreenUserTotalDataDao.java | 11 ++++++
.../screen/GrassrootsPartyDevService.java | 14 ++++++++
.../impl/GrassrootsPartyDevServiceImpl.java | 29 ++++++++++++++++
.../mapper/screen/ScreenUserTotalDataDao.xml | 13 ++++++-
5 files changed, 100 insertions(+), 1 deletion(-)
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberPercentResultDTO.java
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberPercentResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberPercentResultDTO.java
new file mode 100644
index 0000000000..eb8bc35184
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberPercentResultDTO.java
@@ -0,0 +1,34 @@
+package com.epmet.screen.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 1、党员基本情况-饼状图概况
+ * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321324
+ * @ClassName PartymemberPercentResultDTO
+ * @Auth wangc
+ * @Date 2020-08-18 14:54
+ */
+@Data
+public class PartymemberPercentResultDTO implements Serializable {
+ private static final long serialVersionUID = -2864099044581782674L;
+
+ /**
+ * 注册党员总数
+ * */
+ private Integer partyMemberTotal = NumConstant.ZERO;
+
+ /**
+ * 注册党员占比
+ * */
+ private String percentInPlatForm;
+
+ /**
+ * 注册用户总数
+ * */
+ private Integer platFormTotal = NumConstant.ZERO;
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
index ec1e99bcc1..3392dcdb9b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
@@ -17,7 +17,9 @@
package com.epmet.dao.screen;
+import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* 中央区-各类用户总数
@@ -28,4 +30,13 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface ScreenUserTotalDataDao {
+ /**
+ * @Description 党员基本情况-饼状图概况
+ * @param agencyId
+ * @return
+ * @author wangc
+ * @date 2020.08.18 15:17
+ **/
+ PartymemberPercentResultDTO selectAgencyPartymemberPercent(@Param("agencyId")String agencyId);
+
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassrootsPartyDevService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassrootsPartyDevService.java
index 31fe870770..ce74d350be 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassrootsPartyDevService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/GrassrootsPartyDevService.java
@@ -1,5 +1,8 @@
package com.epmet.service.screen;
+import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
+
/**
* 基层党建相关各指标查询
*
@@ -7,4 +10,15 @@ package com.epmet.service.screen;
* @date 2020/8/18 10:21
*/
public interface GrassrootsPartyDevService {
+
+ /**
+ * @Description 1、党员基本情况-饼状图概况
+ * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321324
+ * @param param
+ * @return
+ * @author wangc
+ * @date 2020.08.18 14:58
+ **/
+ PartymemberPercentResultDTO partymemberBaseInfo(ParymemberFormDTO param);
+
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassrootsPartyDevServiceImpl.java
index 191ac7c086..23c42f7bcf 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassrootsPartyDevServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/GrassrootsPartyDevServiceImpl.java
@@ -1,6 +1,13 @@
package com.epmet.service.screen.impl;
+import com.epmet.dao.screen.ScreenUserTotalDataDao;
+import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
import com.epmet.service.screen.GrassrootsPartyDevService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
/**
* 基层党建相关各指标查询
@@ -8,5 +15,27 @@ import com.epmet.service.screen.GrassrootsPartyDevService;
* @author yinzuomei@elink-cn.com
* @date 2020/8/18 10:21
*/
+@Service
public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService {
+
+ private static final Logger logger = LoggerFactory.getLogger(GrassrootsPartyDevServiceImpl.class);
+
+ @Autowired
+ private ScreenUserTotalDataDao screenUserTotalDataDao;
+
+ /**
+ * @Description 1、党员基本情况-饼状图概况
+ * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321324
+ * @param param
+ * @return
+ * @author wangc
+ * @date 2020.08.18 14:58
+ **/
+ @Override
+ public PartymemberPercentResultDTO partymemberBaseInfo(ParymemberFormDTO param) {
+
+ PartymemberPercentResultDTO result = screenUserTotalDataDao.selectAgencyPartymemberPercent(param.getAgencyId());
+
+ return null;
+ }
}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
index 0bf7ed23aa..276d649545 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
@@ -3,6 +3,17 @@
-
+
+
+ SELECT
+ SUM( PARTY_TOTAL ) AS partyMemberTotal,
+ SUM( USER_TOTAL ) AS platFormTotal
+ FROM
+ screen_user_total_data
+ WHERE
+ DEL_FLAG = '0'
+ AND ORG_TYPE = 'agency'
+ AND ORG_ID = #{agencyId}
+
\ No newline at end of file
From 5f16fa4d168e551ecf75b88c311e1c27f20178d4 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 18 Aug 2020 15:43:22 +0800
Subject: [PATCH 006/127] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?=
=?UTF-8?q?=E6=A0=91=EF=BC=8C=E7=BB=84=E7=BB=87=E5=8C=BA=E5=9F=9F=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../screen/dto/form/CompartmentFormDTO.java | 24 +++++++++
.../result/AgencyDistributionResultDTO.java | 40 ++++++++++++++
.../dto/result/CompartmentResultDTO.java | 36 +++++++++++++
.../screen/dto/result/TreeResultDTO.java | 36 +++++++++++++
.../controller/screen/AgencyController.java | 40 ++++++++++++++
.../dao/screen/ScreenCustomerAgencyDao.java | 16 +++++-
.../epmet/service/screen/AgencyService.java | 24 +++++++++
.../screen/impl/AgencyServiceImpl.java | 53 +++++++++++++++++++
.../mapper/screen/ScreenCustomerAgencyDao.xml | 25 +++++++++
9 files changed, 293 insertions(+), 1 deletion(-)
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/CompartmentFormDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/AgencyDistributionResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/CompartmentResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TreeResultDTO.java
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/CompartmentFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/CompartmentFormDTO.java
new file mode 100644
index 0000000000..3571ff7bb6
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/CompartmentFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 2:14 下午
+ */
+@Data
+public class CompartmentFormDTO implements Serializable {
+
+ private static final long serialVersionUID = -3354777434424878413L;
+
+ public interface Compartment{}
+
+ /**
+ * 机关ID
+ */
+ @NotBlank(message = "机关ID不能为空",groups = {Compartment.class})
+ private String agencyId;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/AgencyDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/AgencyDistributionResultDTO.java
new file mode 100644
index 0000000000..da0a5a389e
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/AgencyDistributionResultDTO.java
@@ -0,0 +1,40 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 2:20 下午
+ */
+@Data
+public class AgencyDistributionResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -8404806508669824731L;
+
+ /**
+ * 可能是gridId,可能是agencyId
+ */
+ private String subId;
+
+ /**
+ * 名称
+ */
+ private String subName;
+
+ /**
+ * 坐标区域
+ */
+ private String subAreaMarks;
+
+ /**
+ * 中心点位
+ */
+ private String subCenterMark;
+
+ /**
+ * 组织：agency; 网格：grid ; 部门：dept
+ */
+ private String type;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/CompartmentResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/CompartmentResultDTO.java
new file mode 100644
index 0000000000..2e55aaae56
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/CompartmentResultDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 14:18
+ */
+@Data
+public class CompartmentResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 7963177476365327829L;
+
+ /**
+ * 当前所选组织
+ */
+ private String agencyId;
+
+ /**
+ * 当前所选组织名称
+ */
+ private String name;
+
+ /**
+ * 当前所选组织的坐标区域
+ */
+ private String areaMarks;
+
+ /**
+ * 子级用户分布
+ */
+ private List userDistribution;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TreeResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TreeResultDTO.java
new file mode 100644
index 0000000000..72fd6a0dd9
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TreeResultDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.screen.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 2:00 下午
+ */
+@Data
+public class TreeResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 3860268744336541373L;
+
+ /**
+ * 显示名称
+ */
+ private String label;
+
+ /**
+ * agencyId下拉框value
+ */
+ private String value;
+
+ @JsonIgnore
+ private String pids;
+
+ /**
+ * 子目录
+ */
+ private List children;
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/AgencyController.java
index 73c93f89f5..410a8da660 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/AgencyController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/AgencyController.java
@@ -1,8 +1,21 @@
package com.epmet.controller.screen;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.screen.dto.form.CompartmentFormDTO;
+import com.epmet.screen.dto.result.CompartmentResultDTO;
+import com.epmet.screen.dto.result.TreeResultDTO;
+import com.epmet.service.screen.AgencyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+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;
+
/**
* 组织相关api
*
@@ -12,4 +25,31 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/screen/agency")
public class AgencyController {
+
+ @Autowired
+ private AgencyService agencyService;
+
+ /**
+ * @Description 1、组织机构树
+ * @param tokenDto
+ * @author zxc
+ * @date 2020/8/18 2:04 下午
+ */
+ @PostMapping("tree")
+ public Result> tree(@LoginUser TokenDto tokenDto){
+ return new Result>().ok(agencyService.tree(tokenDto));
+ }
+
+ /**
+ * @Description 2、组织区域查询
+ * @param compartmentFormDTO
+ * @author zxc
+ * @date 2020/8/18 2:33 下午
+ */
+ @PostMapping("compartment")
+ public Result compartment(@RequestBody CompartmentFormDTO compartmentFormDTO){
+ ValidatorUtils.validateEntity(compartmentFormDTO, CompartmentFormDTO.Compartment.class);
+ return new Result().ok(agencyService.compartment(compartmentFormDTO));
+ }
+
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
index 441e7e3ebc..be2e05d62b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
@@ -17,7 +17,11 @@
package com.epmet.dao.screen;
+import com.epmet.screen.dto.result.TreeResultDTO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 组织机构信息
@@ -27,5 +31,15 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenCustomerAgencyDao {
-
+
+ /**
+ * @Description 查询客户根组织ID
+ * @param customerId
+ * @author zxc
+ * @date 2020/8/18 2:44 下午
+ */
+ TreeResultDTO selectRootAgencyId(@Param("customerId")String customerId);
+
+ List selectSubAgencyList(@Param("subAgencyPids") String subAgencyPids);
+
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/AgencyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/AgencyService.java
index 99f32bef09..58f429eca7 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/AgencyService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/AgencyService.java
@@ -1,5 +1,12 @@
package com.epmet.service.screen;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.screen.dto.form.CompartmentFormDTO;
+import com.epmet.screen.dto.result.CompartmentResultDTO;
+import com.epmet.screen.dto.result.TreeResultDTO;
+
+import java.util.List;
+
/**
* 组织相关api
*
@@ -7,4 +14,21 @@ package com.epmet.service.screen;
* @date 2020/8/18 10:18
*/
public interface AgencyService {
+
+ /**
+ * @Description 1、组织机构树
+ * @param tokenDto
+ * @author zxc
+ * @date 2020/8/18 2:04 下午
+ */
+ List tree(TokenDto tokenDto);
+
+ /**
+ * @Description 2、组织区域查询
+ * @param compartmentFormDTO
+ * @author zxc
+ * @date 2020/8/18 2:33 下午
+ */
+ CompartmentResultDTO compartment(CompartmentFormDTO compartmentFormDTO);
+
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/AgencyServiceImpl.java
index e6fb4de7cb..2e732bba83 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/AgencyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/AgencyServiceImpl.java
@@ -1,6 +1,19 @@
package com.epmet.service.screen.impl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.screen.ScreenCustomerAgencyDao;
+import com.epmet.dto.result.AgencySubResultDTO;
+import com.epmet.dto.result.ProcessorListResultDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.screen.dto.form.CompartmentFormDTO;
+import com.epmet.screen.dto.result.CompartmentResultDTO;
+import com.epmet.screen.dto.result.TreeResultDTO;
import com.epmet.service.screen.AgencyService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
/**
* 组织相关api
@@ -9,4 +22,44 @@ import com.epmet.service.screen.AgencyService;
* @date 2020/8/18 10:18
*/
public class AgencyServiceImpl implements AgencyService {
+
+ @Autowired
+ private GovOrgOpenFeignClient govOrgOpenFeignClient;
+ @Autowired
+ private ScreenCustomerAgencyDao screenCustomerAgencyDao;
+
+ /**
+ * @Description 1、组织机构树
+ * @param tokenDto
+ * @author zxc
+ * @date 2020/8/18 2:04 下午
+ */
+ @Override
+ public List tree(TokenDto tokenDto) {
+ // 1. 查询客户根组织ID
+ TreeResultDTO rootAgency = screenCustomerAgencyDao.selectRootAgencyId(tokenDto.getCustomerId());
+ return this.getDepartmentList(("".equals(rootAgency.getPids()) ? "" : rootAgency.getPids() + ":") + rootAgency.getValue());
+ }
+
+ private List getDepartmentList(String subAgencyPids) {
+ List subAgencyList = screenCustomerAgencyDao.selectSubAgencyList(subAgencyPids);
+ if (subAgencyList.size() > NumConstant.ZERO) {
+ for (TreeResultDTO sub : subAgencyList) {
+ List subAgency = getDepartmentList(sub.getPids() + "," + sub.getValue());
+ sub.setChildren(subAgency);
+ }
+ }
+ return subAgencyList;
+ }
+
+ /**
+ * @Description 2、组织区域查询
+ * @param compartmentFormDTO
+ * @author zxc
+ * @date 2020/8/18 2:33 下午
+ */
+ @Override
+ public CompartmentResultDTO compartment(CompartmentFormDTO compartmentFormDTO) {
+ return null;
+ }
}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index 9fea45f98a..8b95789110 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -3,6 +3,31 @@
+
+
+ SELECT
+ agency_id AS value,
+ pids AS pids
+ FROM
+ screen_customer_agency
+ WHERE
+ del_flag = 0
+ AND pid = '0'
+ AND customer_id = #{customerId}
+
+
+ SELECT
+ agency_id AS value,
+ agency_name AS label,
+ pids AS pids
+ FROM
+ screen_customer_agency
+ WHERE
+ del_flag = '0'
+ AND pids = #{subAgencyPids}
+ ORDER BY
+ created_time DESC
+
\ No newline at end of file
From 6eb5008048a4464073943401b9c946021fbea67a Mon Sep 17 00:00:00 2001
From: jianjun
Date: Tue, 18 Aug 2020 16:10:43 +0800
Subject: [PATCH 007/127] =?UTF-8?q?dataport=E6=B7=BB=E5=8A=A0=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DataReportApplication.java | 2 +-
.../aspect/RequestLogAspect.java | 4 +--
.../config/ModuleConfigImpl.java | 2 +-
.../{ => datareport}/controller/.gitignore | 0
.../controller/group/GroupController.java | 2 +-
.../controller/issue/IssueController.java | 4 +--
.../controller/project/ProjectController.java | 0
.../publicity/PublicityController.java | 4 +--
.../controller/screen/AgencyController.java | 4 +--
.../screen/DistributionController.java | 4 +--
.../screen/GrassRootsGovernController.java | 2 +-
.../screen/GrassrootsPartyDevController.java | 2 +-
.../controller/screen/IndexController.java | 2 +-
.../screen/PartyMemberLeadController.java | 2 +-
.../controller/screen/ProjectController.java | 2 +-
.../controller/topic/TopicController.java | 4 +--
.../user/UserAnalysisController.java | 4 +--
.../com/epmet/{ => datareport}/dao/.gitignore | 0
.../{ => datareport}/dao/group/GroupDao.java | 2 +-
.../{ => datareport}/dao/issue/IssueDao.java | 2 +-
.../dao/project/ProjectDao.java | 2 +-
.../dao/publicity/PublicityDao.java | 2 +-
.../dao/screen/ScreenCpcBaseDataDao.java | 2 +-
.../dao/screen/ScreenCustomerAgencyDao.java | 2 +-
.../dao/screen/ScreenCustomerDeptDao.java | 2 +-
.../dao/screen/ScreenCustomerGridDao.java | 2 +-
.../dao/screen/ScreenDifficultyDataDao.java | 2 +-
.../dao/screen/ScreenEventDataDao.java | 2 +-
.../dao/screen/ScreenEventImgDataDao.java | 2 +-
.../dao/screen/ScreenGovernRankDataDao.java | 2 +-
.../dao/screen/ScreenIndexDataDao.java | 2 +-
.../dao/screen/ScreenOrgRankDataDao.java | 2 +-
.../dao/screen/ScreenPartyBranchDataDao.java | 2 +-
.../screen/ScreenPartyLinkMassesDataDao.java | 2 +-
.../screen/ScreenPartyUserRankDataDao.java | 2 +-
.../dao/screen/ScreenPioneerDataDao.java | 2 +-
.../dao/screen/ScreenUserJoinDao.java | 2 +-
.../dao/screen/ScreenUserTotalDataDao.java | 2 +-
.../ScreenVoluntaryActivityDataDao.java | 2 +-
.../{ => datareport}/dao/topic/TopicDao.java | 3 +-
.../dao/user/UserAnalysisDao.java | 2 +-
.../epmet/{ => datareport}/service/.gitignore | 0
.../service/group/GroupService.java | 2 +-
.../service/group/impl/GroupServiceImpl.java | 6 ++--
.../service/issue/IssueService.java | 2 +-
.../service/issue/impl/IssueServiceImpl.java | 8 ++----
.../service/project/ProjectService.java | 0
.../project/impl/ProjectServiceImpl.java | 4 +--
.../service/publicity/PublicityService.java | 2 +-
.../publicity/impl/PublicityServiceImpl.java | 6 ++--
.../service/screen/AgencyService.java | 2 +-
.../service/screen/DistributionService.java | 2 +-
.../screen/GrassRootsGovernService.java | 2 +-
.../screen/GrassrootsPartyDevService.java | 2 +-
.../service/screen/IndexService.java | 2 +-
.../screen/PartyMemberLeadService.java | 2 +-
.../service/screen/ProjectService.java | 2 +-
.../screen/impl/AgencyServiceImpl.java | 9 ++----
.../screen/impl/DistributionServiceImpl.java | 4 +--
.../impl/GrassRootsGovernServiceImpl.java | 4 +--
.../impl/GrassrootsPartyDevServiceImpl.java | 6 ++--
.../service/screen/impl/IndexServiceImpl.java | 4 +--
.../impl/PartyMemberLeadServiceImpl.java | 4 +--
.../screen/impl/ProjectServiceImpl.java | 4 +--
.../service/topic/TopicService.java | 2 +-
.../service/topic/impl/TopicServiceImpl.java | 9 ++----
.../service/user/UserAnalysisService.java | 2 +-
.../user/impl/UserAnalysisServiceImpl.java | 6 ++--
.../src/main/resources/logback-spring.xml | 28 +++++++++----------
.../main/resources/mapper/group/GroupDao.xml | 2 +-
.../main/resources/mapper/issue/IssueDao.xml | 2 +-
.../resources/mapper/project/ProjectDao.xml | 2 +-
.../mapper/publicity/PublicityDao.xml | 2 +-
.../mapper/screen/ScreenCpcBaseDataDao.xml | 2 +-
.../mapper/screen/ScreenCustomerAgencyDao.xml | 2 +-
.../mapper/screen/ScreenCustomerDeptDao.xml | 2 +-
.../mapper/screen/ScreenCustomerGridDao.xml | 2 +-
.../mapper/screen/ScreenDifficultyDataDao.xml | 2 +-
.../mapper/screen/ScreenEventDataDao.xml | 2 +-
.../mapper/screen/ScreenEventImgDataDao.xml | 2 +-
.../mapper/screen/ScreenGovernRankDataDao.xml | 2 +-
.../mapper/screen/ScreenIndexDataDao.xml | 2 +-
.../mapper/screen/ScreenOrgRankDataDao.xml | 2 +-
.../screen/ScreenPartyBranchDataDao.xml | 2 +-
.../screen/ScreenPartyLinkMassesDataDao.xml | 2 +-
.../screen/ScreenPartyUserRankDataDao.xml | 2 +-
.../mapper/screen/ScreenPioneerDataDao.xml | 2 +-
.../mapper/screen/ScreenUserJoinDao.xml | 2 +-
.../mapper/screen/ScreenUserTotalDataDao.xml | 2 +-
.../screen/ScreenVoluntaryActivityDataDao.xml | 2 +-
.../main/resources/mapper/topic/TopicDao.xml | 2 +-
.../resources/mapper/user/UserAnalysisDao.xml | 2 +-
92 files changed, 127 insertions(+), 136 deletions(-)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/DataReportApplication.java (94%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/aspect/RequestLogAspect.java (90%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/config/ModuleConfigImpl.java (92%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/.gitignore (100%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/group/GroupController.java (97%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/issue/IssueController.java (96%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/project/ProjectController.java (100%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/publicity/PublicityController.java (97%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/screen/AgencyController.java (94%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/screen/DistributionController.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/screen/GrassRootsGovernController.java (87%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/screen/GrassrootsPartyDevController.java (87%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/screen/IndexController.java (86%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/screen/PartyMemberLeadController.java (87%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/screen/ProjectController.java (85%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/topic/TopicController.java (96%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/controller/user/UserAnalysisController.java (97%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/.gitignore (100%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/group/GroupDao.java (97%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/issue/IssueDao.java (97%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/project/ProjectDao.java (97%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/publicity/PublicityDao.java (99%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenCpcBaseDataDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenCustomerAgencyDao.java (96%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenCustomerDeptDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenCustomerGridDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenDifficultyDataDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenEventDataDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenEventImgDataDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenGovernRankDataDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenIndexDataDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenOrgRankDataDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenPartyBranchDataDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenPartyLinkMassesDataDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenPartyUserRankDataDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenPioneerDataDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenUserJoinDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenUserTotalDataDao.java (96%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/screen/ScreenVoluntaryActivityDataDao.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/topic/TopicDao.java (97%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/dao/user/UserAnalysisDao.java (99%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/.gitignore (100%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/group/GroupService.java (96%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/group/impl/GroupServiceImpl.java (96%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/issue/IssueService.java (97%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/issue/impl/IssueServiceImpl.java (97%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/project/ProjectService.java (100%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/project/impl/ProjectServiceImpl.java (98%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/publicity/PublicityService.java (97%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/publicity/impl/PublicityServiceImpl.java (98%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/AgencyService.java (94%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/DistributionService.java (95%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/GrassRootsGovernService.java (77%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/GrassrootsPartyDevService.java (92%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/IndexService.java (75%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/PartyMemberLeadService.java (77%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/ProjectService.java (72%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/impl/AgencyServiceImpl.java (87%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/impl/DistributionServiceImpl.java (91%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/impl/GrassRootsGovernServiceImpl.java (61%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/impl/GrassrootsPartyDevServiceImpl.java (86%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/impl/IndexServiceImpl.java (60%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/impl/PartyMemberLeadServiceImpl.java (61%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/screen/impl/ProjectServiceImpl.java (56%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/topic/TopicService.java (96%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/topic/impl/TopicServiceImpl.java (97%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/user/UserAnalysisService.java (98%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{ => datareport}/service/user/impl/UserAnalysisServiceImpl.java (99%)
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/DataReportApplication.java
similarity index 94%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/DataReportApplication.java
index cee0ed9096..c8a3e68002 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/DataReportApplication.java
@@ -1,4 +1,4 @@
-package com.epmet;
+package com.epmet.datareport;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/aspect/RequestLogAspect.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/aspect/RequestLogAspect.java
similarity index 90%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/aspect/RequestLogAspect.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/aspect/RequestLogAspect.java
index 7d4ff2d7d4..d57b2833e5 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/aspect/RequestLogAspect.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/aspect/RequestLogAspect.java
@@ -1,4 +1,4 @@
-package com.epmet.aspect;
+package com.epmet.datareport.aspect;
import com.epmet.commons.tools.aspect.BaseRequestLogAspect;
import org.aspectj.lang.ProceedingJoinPoint;
@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
public class RequestLogAspect extends BaseRequestLogAspect {
@Override
- @Around(value = "execution(* com.epmet.controller.*.*Controller*.*(..)) ")
+ @Around(value = "execution(* com.epmet.datareport.controller.*.*Controller*.*(..)) ")
public Object proceed(ProceedingJoinPoint point) throws Throwable {
return super.proceed(point, getRequest());
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/ModuleConfigImpl.java
similarity index 92%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/ModuleConfigImpl.java
index c52ec15b50..10a4cdd6d7 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/ModuleConfigImpl.java
@@ -6,7 +6,7 @@
* 版权所有，侵权必究！
*/
-package com.epmet.config;
+package com.epmet.datareport.config;
import com.epmet.commons.tools.config.ModuleConfig;
import org.springframework.stereotype.Service;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/.gitignore b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/.gitignore
similarity index 100%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/.gitignore
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/.gitignore
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/group/GroupController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/group/GroupController.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/group/GroupController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/group/GroupController.java
index 88dd3bb376..1d269eddbd 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/group/GroupController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/group/GroupController.java
@@ -9,7 +9,7 @@ import com.epmet.group.dto.result.GroupIncrTrendResultDTO;
import com.epmet.group.dto.result.GroupSubAgencyResultDTO;
import com.epmet.group.dto.result.GroupSubGridResultDTO;
import com.epmet.group.dto.result.GroupSummaryInfoResultDTO;
-import com.epmet.service.group.GroupService;
+import com.epmet.datareport.service.group.GroupService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/issue/IssueController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/issue/IssueController.java
similarity index 96%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/issue/IssueController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/issue/IssueController.java
index c9fad20ce2..afc732802d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/issue/IssueController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/issue/IssueController.java
@@ -1,11 +1,11 @@
-package com.epmet.controller.issue;
+package com.epmet.datareport.controller.issue;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.issue.dto.form.IssueIncrtrendFormDTO;
import com.epmet.issue.dto.result.*;
-import com.epmet.service.issue.IssueService;
+import com.epmet.datareport.service.issue.IssueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/project/ProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
similarity index 100%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/project/ProjectController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/publicity/PublicityController.java
similarity index 97%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/publicity/PublicityController.java
index 8612d82002..f01540758c 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/publicity/PublicityController.java
@@ -15,7 +15,7 @@
* along with this program. If not, see
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml
index 49333cc3e4..02266e7884 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -1,7 +1,7 @@
-
+
SELECT AGENCY_ID,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
index 9ea5c548d6..21b472e4de 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml
index 165aab88fa..1c0c5700d4 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
index a44106f3f6..356c3bae7e 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index 8b95789110..9650c3f164 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
index 721653ca7f..58e2171c3d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
index 66c30e3e32..5a1a10b48d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index f0d5d9ebc9..c7551661f6 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
index a9c0339fa9..813b3f74a3 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
index c9fc631d95..a95efe13ad 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
index fdf84386af..bfca1475ee 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
index 35275e613d..f5e693fd42 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
index 60c597c6ac..82ef7d71dc 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
index 891493b386..bab712283c 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
index 0d3af2a93d..b690a6381d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 89abfabab4..1e42f6c61a 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
index 2761a3346f..b59d02f321 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
index 109f33a67a..6314cf2fdc 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
index 276d649545..72c533126d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
index 416026256a..f65cb61870 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml
index 01d4a5d335..3b96ffc150 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 29e482c554..8b967fa17d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -1,7 +1,7 @@
-
+
SELECT
From 347a16d7bb69d47cb8637be27a6b514ef031fc42 Mon Sep 17 00:00:00 2001
From: wangchao
Date: Tue, 18 Aug 2020 16:14:57 +0800
Subject: [PATCH 008/127] =?UTF-8?q?controller=E9=87=8D=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
epmet-module/data-report/data-report-server/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index 7f96938c28..690dfb72f3 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -112,7 +112,7 @@
123456
- true
+ false
122.152.200.70:8848
fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b
Date: Tue, 18 Aug 2020 16:24:04 +0800
Subject: [PATCH 009/127] =?UTF-8?q?controller=E9=87=8D=E5=91=BD=E5=90=8D?=
=?UTF-8?q?=20=20=E5=90=AF=E5=8A=A8=E7=B1=BB=E4=BF=AE=E6=94=B9=E4=BD=8D?=
=?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/epmet/{datareport => }/DataReportApplication.java | 2 +-
.../epmet/datareport/controller/screen/ProjectController.java | 2 +-
.../epmet/datareport/service/screen/impl/AgencyServiceImpl.java | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{datareport => }/DataReportApplication.java (94%)
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/DataReportApplication.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java
similarity index 94%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/DataReportApplication.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java
index c8a3e68002..cee0ed9096 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/DataReportApplication.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java
@@ -1,4 +1,4 @@
-package com.epmet.datareport;
+package com.epmet;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java
index 44f1a6407b..4bf4b33342 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
* @author yinzuomei@elink-cn.com
* @date 2020/8/18 10:16
*/
-@RestController
+@RestController("screeproject")
@RequestMapping("/screen/project")
public class ProjectController {
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
index 40260140d4..fdb36ae339 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
@@ -9,6 +9,7 @@ import com.epmet.screen.dto.result.CompartmentResultDTO;
import com.epmet.screen.dto.result.TreeResultDTO;
import com.epmet.datareport.service.screen.AgencyService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
import java.util.List;
@@ -18,6 +19,7 @@ import java.util.List;
* @author yinzuomei@elink-cn.com
* @date 2020/8/18 10:18
*/
+@Service
public class AgencyServiceImpl implements AgencyService {
@Autowired
From 3fd59b932ee08b4782f892d15b50fc40e814730b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 18 Aug 2020 16:31:41 +0800
Subject: [PATCH 010/127] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?=
=?UTF-8?q?=E6=A0=91=EF=BC=8C=E7=BB=84=E7=BB=87=E5=8C=BA=E5=9F=9F=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/screen/AgencyController.java | 6 +++---
...ntroller.java => ScreenProjectController.java} | 2 +-
.../datareport/service/screen/AgencyService.java | 4 ++--
...jectService.java => ScreenProjectService.java} | 2 +-
.../service/screen/impl/AgencyServiceImpl.java | 15 +++++++++++----
.../screen/impl/DistributionServiceImpl.java | 2 ++
.../screen/impl/GrassRootsGovernServiceImpl.java | 2 ++
.../service/screen/impl/IndexServiceImpl.java | 2 ++
.../screen/impl/PartyMemberLeadServiceImpl.java | 2 ++
.../service/screen/impl/ProjectServiceImpl.java | 12 ------------
.../screen/impl/ScreenProjectServiceImpl.java | 14 ++++++++++++++
.../mapper/screen/ScreenCustomerAgencyDao.xml | 1 +
12 files changed, 41 insertions(+), 23 deletions(-)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/{ProjectController.java => ScreenProjectController.java} (89%)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/{ProjectService.java => ScreenProjectService.java} (76%)
delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ProjectServiceImpl.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
index e69b0d51f1..c37a2ad225 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
@@ -31,13 +31,13 @@ public class AgencyController {
/**
* @Description 1、组织机构树
- * @param tokenDto
+ * @param
* @author zxc
* @date 2020/8/18 2:04 下午
*/
@PostMapping("tree")
- public Result> tree(@LoginUser TokenDto tokenDto){
- return new Result>().ok(agencyService.tree(tokenDto));
+ public Result tree(){
+ return new Result().ok(agencyService.tree());
}
/**
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java
similarity index 89%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java
index 4bf4b33342..a28be5899b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java
@@ -11,5 +11,5 @@ import org.springframework.web.bind.annotation.RestController;
*/
@RestController("screeproject")
@RequestMapping("/screen/project")
-public class ProjectController {
+public class ScreenProjectController {
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java
index 317cfde18d..5b7a48177a 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java
@@ -17,11 +17,11 @@ public interface AgencyService {
/**
* @Description 1、组织机构树
- * @param tokenDto
+ * @param
* @author zxc
* @date 2020/8/18 2:04 下午
*/
- List tree(TokenDto tokenDto);
+ TreeResultDTO tree();
/**
* @Description 2、组织区域查询
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ProjectService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ScreenProjectService.java
similarity index 76%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ProjectService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ScreenProjectService.java
index 6998572bde..51354ec4f6 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ProjectService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ScreenProjectService.java
@@ -6,5 +6,5 @@ package com.epmet.datareport.service.screen;
* @author yinzuomei@elink-cn.com
* @date 2020/8/18 10:22
*/
-public interface ProjectService {
+public interface ScreenProjectService {
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
index fdb36ae339..922b15000d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
@@ -29,15 +29,22 @@ public class AgencyServiceImpl implements AgencyService {
/**
* @Description 1、组织机构树
- * @param tokenDto
+ * @param
* @author zxc
* @date 2020/8/18 2:04 下午
*/
@Override
- public List tree(TokenDto tokenDto) {
+ public TreeResultDTO tree() {
// 1. 查询客户根组织ID
- TreeResultDTO rootAgency = screenCustomerAgencyDao.selectRootAgencyId(tokenDto.getCustomerId());
- return this.getDepartmentList(("".equals(rootAgency.getPids()) ? "" : rootAgency.getPids() + ":") + rootAgency.getValue());
+ // TODO 改成正式注解获取customerId
+ String customerId = "zxc";
+ TreeResultDTO rootAgency = screenCustomerAgencyDao.selectRootAgencyId(customerId);
+ if (null == rootAgency){
+ return new TreeResultDTO();
+ }
+ List departmentList = this.getDepartmentList(("".equals(rootAgency.getPids()) ? "" : rootAgency.getPids() + ":") + rootAgency.getValue());
+ rootAgency.setChildren(departmentList);
+ return rootAgency;
}
private List getDepartmentList(String subAgencyPids) {
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
index 7d2dad4706..c83c82aff7 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
@@ -7,6 +7,7 @@ import com.epmet.screen.dto.result.BranchResultDTO;
import com.epmet.screen.dto.result.ParymemberResultDTO;
import com.epmet.screen.dto.result.UserResultDTO;
import com.epmet.datareport.service.screen.DistributionService;
+import org.springframework.stereotype.Service;
/**
* 中央区相关各指标查询
@@ -14,6 +15,7 @@ import com.epmet.datareport.service.screen.DistributionService;
* @author yinzuomei@elink-cn.com
* @date 2020/8/18 10:19
*/
+@Service
public class DistributionServiceImpl implements DistributionService {
/**
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java
index 751b4b8c50..cb1e1fe160 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java
@@ -1,6 +1,7 @@
package com.epmet.datareport.service.screen.impl;
import com.epmet.datareport.service.screen.GrassRootsGovernService;
+import org.springframework.stereotype.Service;
/**
* 基层治理相关各指标查询
@@ -8,5 +9,6 @@ import com.epmet.datareport.service.screen.GrassRootsGovernService;
* @author yinzuomei@elink-cn.com
* @date 2020/8/18 10:20
*/
+@Service
public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java
index 370d60016d..042e9b2229 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java
@@ -1,6 +1,7 @@
package com.epmet.datareport.service.screen.impl;
import com.epmet.datareport.service.screen.IndexService;
+import org.springframework.stereotype.Service;
/**
* 指数相关相关各指标查询
@@ -8,5 +9,6 @@ import com.epmet.datareport.service.screen.IndexService;
* @author yinzuomei@elink-cn.com
* @date 2020/8/18 10:21
*/
+@Service
public class IndexServiceImpl implements IndexService {
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
index cb85f7e75c..33903007a5 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
@@ -1,6 +1,7 @@
package com.epmet.datareport.service.screen.impl;
import com.epmet.datareport.service.screen.PartyMemberLeadService;
+import org.springframework.stereotype.Service;
/**
* 党建引领相关各指标查询
@@ -8,5 +9,6 @@ import com.epmet.datareport.service.screen.PartyMemberLeadService;
* @author yinzuomei@elink-cn.com
* @date 2020/8/18 10:22
*/
+@Service
public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ProjectServiceImpl.java
deleted file mode 100644
index 44741a7921..0000000000
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ProjectServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.epmet.datareport.service.screen.impl;
-
-import com.epmet.datareport.service.screen.ProjectService;
-
-/**
- * 项目
- *
- * @author yinzuomei@elink-cn.com
- * @date 2020/8/18 10:23
- */
-public class ProjectServiceImpl implements ProjectService {
-}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
new file mode 100644
index 0000000000..5a09c8ce83
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
@@ -0,0 +1,14 @@
+package com.epmet.datareport.service.screen.impl;
+
+import com.epmet.datareport.service.screen.ScreenProjectService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/18 10:23
+ */
+@Service
+public class ScreenProjectServiceImpl implements ScreenProjectService {
+}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index 9650c3f164..fd9095fc7d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -6,6 +6,7 @@
SELECT
+ agency_name AS label,
agency_id AS value,
pids AS pids
FROM
From 51c6e136f5ea11e24b2c03ae3c7242804316a959 Mon Sep 17 00:00:00 2001
From: wxz
Date: Tue, 18 Aug 2020 17:07:46 +0800
Subject: [PATCH 011/127] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/epmet/constant/DataSourceConstant.java | 10 ++++++++++
epmet-module/data-report/data-report-server/pom.xml | 13 +++++++++++++
.../src/main/resources/bootstrap.yml | 9 +++++++++
3 files changed, 32 insertions(+)
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java
new file mode 100644
index 0000000000..3efb09b66c
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java
@@ -0,0 +1,10 @@
+package com.epmet.constant;
+
+public interface DataSourceConstant {
+
+ /**
+ * 统计数据库
+ */
+ String STATS_DISPLAY = "statsdisplay";
+
+}
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index 690dfb72f3..eedc7aa66e 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -62,6 +62,12 @@
0.3.1
+
+
+ com.epmet
+ epmet-commons-dynamic-datasource
+ 2.0.0
+
@@ -105,6 +111,13 @@
epmet_data_statistical_user
EpmEt-db-UsEr
+
+
+
+
+ epmet_data_statistical_user
+ EpmEt-db-UsEr
+
0
192.168.1.130
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
index 19e6e4b584..0d4f2911fd 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
@@ -91,6 +91,15 @@ mybatis-plus:
call-setters-on-nulls: true
jdbc-type-for-null: 'null'
+#动态数据源
+dynamic:
+ datasource:
+ statsdisplay:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: @datasource.druid.statsdisplay.url@
+ username: @datasource.druid.statsdisplay.username@
+ password: @datasource.druid.statsdisplay.password@
+
feign:
hystrix:
enabled: true
From c5d22cb697a38e2cb02fae132680bc40152d176b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 18 Aug 2020 17:45:59 +0800
Subject: [PATCH 012/127] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8C=BA=E5=9F=9F?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epmet/screen/constant/ScreenConstant.java | 11 +++++++
.../dto/result/CompartmentResultDTO.java | 14 ++++++++-
.../dao/screen/ScreenCustomerAgencyDao.java | 24 +++++++++++++++
.../dao/screen/ScreenCustomerGridDao.java | 12 ++++++++
.../screen/impl/AgencyServiceImpl.java | 26 ++++++++++++----
.../mapper/screen/ScreenCustomerAgencyDao.xml | 30 +++++++++++++++++++
.../mapper/screen/ScreenCustomerGridDao.xml | 16 ++++++++--
7 files changed, 125 insertions(+), 8 deletions(-)
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java
new file mode 100644
index 0000000000..fcbbfd7b35
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java
@@ -0,0 +1,11 @@
+package com.epmet.screen.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 5:02 下午
+ */
+public interface ScreenConstant {
+
+ String COMMUNITY = "community";
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/CompartmentResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/CompartmentResultDTO.java
index 2e55aaae56..aa55fe420e 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/CompartmentResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/CompartmentResultDTO.java
@@ -1,5 +1,6 @@
package com.epmet.screen.dto.result;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@@ -29,8 +30,19 @@ public class CompartmentResultDTO implements Serializable {
*/
private String areaMarks;
+ /**
+ * 机关级别
+ * 社区级：community，
+ * 乡（镇、街道）级:street,
+ * 区县级: district,
+ * 市级: city
+ * 省级:province
+ */
+ @JsonIgnore
+ private String level;
+
/**
* 子级用户分布
*/
- private List userDistribution;
+ private List agencyDistribution;
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java
index 26bc852633..dc08b40c34 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java
@@ -17,6 +17,8 @@
package com.epmet.datareport.dao.screen;
+import com.epmet.screen.dto.result.AgencyDistributionResultDTO;
+import com.epmet.screen.dto.result.CompartmentResultDTO;
import com.epmet.screen.dto.result.TreeResultDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -40,6 +42,28 @@ public interface ScreenCustomerAgencyDao {
*/
TreeResultDTO selectRootAgencyId(@Param("customerId")String customerId);
+ /**
+ * @Description 查询下级机关的 名称和id
+ * @param subAgencyPids
+ * @author zxc
+ * @date 2020/8/18 4:48 下午
+ */
List selectSubAgencyList(@Param("subAgencyPids") String subAgencyPids);
+ /**
+ * @Description 查询当前机关的区域信息
+ * @param agencyId
+ * @author zxc
+ * @date 2020/8/18 4:51 下午
+ */
+ CompartmentResultDTO getAgencyAreaInfo(@Param("agencyId")String agencyId);
+
+ /**
+ * @Description 查询子级区域分布信息【机关级别】
+ * @param agencyId
+ * @author zxc
+ * @date 2020/8/18 5:12 下午
+ */
+ List selectSubDistribution(@Param("agencyId")String agencyId);
+
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java
index 92489cffc5..5f33641d71 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java
@@ -17,7 +17,11 @@
package com.epmet.datareport.dao.screen;
+import com.epmet.screen.dto.result.AgencyDistributionResultDTO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 网格信息
@@ -27,5 +31,13 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenCustomerGridDao {
+
+ /**
+ * @Description 查询子级区域分布信息【网格级别】
+ * @param agencyId
+ * @author zxc
+ * @date 2020/8/18 5:12 下午
+ */
+ List selectSubDistribution(@Param("agencyId")String agencyId);
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
index 922b15000d..65682d4441 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
@@ -1,10 +1,11 @@
package com.epmet.datareport.service.screen.impl;
import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
-import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.datareport.dao.screen.ScreenCustomerGridDao;
import com.epmet.screen.dto.form.CompartmentFormDTO;
+import com.epmet.screen.dto.result.AgencyDistributionResultDTO;
+import com.epmet.screen.constant.*;
import com.epmet.screen.dto.result.CompartmentResultDTO;
import com.epmet.screen.dto.result.TreeResultDTO;
import com.epmet.datareport.service.screen.AgencyService;
@@ -22,10 +23,10 @@ import java.util.List;
@Service
public class AgencyServiceImpl implements AgencyService {
- @Autowired
- private GovOrgOpenFeignClient govOrgOpenFeignClient;
@Autowired
private ScreenCustomerAgencyDao screenCustomerAgencyDao;
+ @Autowired
+ private ScreenCustomerGridDao screenCustomerGridDao;
/**
* @Description 1、组织机构树
@@ -47,6 +48,12 @@ public class AgencyServiceImpl implements AgencyService {
return rootAgency;
}
+ /**
+ * @Description 递归查询填充下级
+ * @param subAgencyPids
+ * @author zxc
+ * @date 2020/8/18 4:42 下午
+ */
private List getDepartmentList(String subAgencyPids) {
List subAgencyList = screenCustomerAgencyDao.selectSubAgencyList(subAgencyPids);
if (subAgencyList.size() > NumConstant.ZERO) {
@@ -66,6 +73,15 @@ public class AgencyServiceImpl implements AgencyService {
*/
@Override
public CompartmentResultDTO compartment(CompartmentFormDTO compartmentFormDTO) {
- return null;
+ CompartmentResultDTO agencyAreaInfo = screenCustomerAgencyDao.getAgencyAreaInfo(compartmentFormDTO.getAgencyId());
+ if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){
+ // 当level为"community"时，查询screen_customer_grid表
+ List agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId());
+ agencyAreaInfo.setAgencyDistribution(agencyDistributionResultDTOS);
+ }else {
+ List agencyDistributionResultDTOS = screenCustomerAgencyDao.selectSubDistribution(compartmentFormDTO.getAgencyId());
+ agencyAreaInfo.setAgencyDistribution(agencyDistributionResultDTOS);
+ }
+ return agencyAreaInfo;
}
}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index fd9095fc7d..b92fc4e8c6 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -17,6 +17,7 @@
AND customer_id = #{customerId}
+
SELECT
agency_id AS value,
@@ -31,4 +32,33 @@
created_time DESC
+
+
+ SELECT
+ agency_id AS agencyId,
+ agency_name AS name,
+ area_marks AS areaMarks,
+ level AS level
+ FROM
+ screen_customer_agency
+ WHERE
+ del_flag = 0
+ AND agency_id = #{agencyId}
+
+
+
+
+ SELECT
+ agency_id AS subId,
+ agency_name AS subName,
+ area_marks AS subAreaMarks,
+ center_mark AS subCenterMark,
+ 'agency' AS type
+ FROM
+ screen_customer_agency
+ WHERE
+ del_flag = 0
+ AND pid = #{agencyId}
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
index 5a1a10b48d..df1a2fbe44 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@@ -3,6 +3,18 @@
-
-
+
+
+ SELECT
+ grid_id AS subId,
+ grid_name AS subName,
+ area_marks AS subAreaMarks,
+ center_mark AS subCenterMark,
+ 'grid' AS type
+ FROM
+ screen_customer_grid
+ WHERE
+ del_flag = 0
+ AND parent_agency_id = #{agencyId}
+
\ No newline at end of file
From 9a7248c4faa255db8f0963befaacbda27730fa28 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 19 Aug 2020 11:16:38 +0800
Subject: [PATCH 013/127] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E9=87=87=E9=9B=86=20=E5=85=A8=E9=83=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epmet/dto/screencoll/ImgDataListDTO.java | 31 ++
.../screencoll/form/CpcBaseDataFormDTO.java | 86 +++++
.../form/CustomerAgencyFormDTO.java | 71 ++++
.../screencoll/form/CustomerDeptFormDTO.java | 51 +++
.../screencoll/form/CustomerGridFormDTO.java | 51 +++
.../form/DifficultyDataFormDTO.java | 91 +++++
.../dto/screencoll/form/EventDataFormDTO.java | 109 ++++++
.../form/GovernRankDataFormDTO.java | 72 ++++
.../dto/screencoll/form/IndexDataFormDTO.java | 71 ++++
.../screencoll/form/OrgRankDataFormDTO.java | 87 +++++
.../form/PartyBranchDataFormDTO.java | 76 ++++
.../form/PartyLinkMassesDataFormDTO.java | 51 +++
.../form/PartyUserRankDataFormDTO.java | 71 ++++
.../screencoll/form/PioneerDataFormDTO.java | 66 ++++
.../dto/screencoll/form/UserJoinFormDTO.java | 72 ++++
.../screencoll/form/UserTotalDataFormDTO.java | 71 ++++
.../form/VoluntaryActivityDataFormDTO.java | 61 +++
.../controller/ScreenCollController.java | 221 +++++++++++
.../dao/screen/ScreenCpcBaseDataDao.java | 29 +-
.../dao/screen/ScreenCustomerAgencyDao.java | 29 +-
.../dao/screen/ScreenCustomerDeptDao.java | 29 +-
.../dao/screen/ScreenCustomerGridDao.java | 28 +-
.../dao/screen/ScreenDifficultyDataDao.java | 29 +-
.../epmet/dao/screen/ScreenEventDataDao.java | 29 +-
.../dao/screen/ScreenEventImgDataDao.java | 14 +-
.../dao/screen/ScreenGovernRankDataDao.java | 32 +-
.../epmet/dao/screen/ScreenIndexDataDao.java | 33 +-
.../dao/screen/ScreenOrgRankDataDao.java | 32 +-
.../dao/screen/ScreenPartyBranchDataDao.java | 32 +-
.../screen/ScreenPartyLinkMassesDataDao.java | 29 +-
.../screen/ScreenPartyUserRankDataDao.java | 33 +-
.../dao/screen/ScreenPioneerDataDao.java | 29 +-
.../epmet/dao/screen/ScreenUserJoinDao.java | 29 +-
.../dao/screen/ScreenUserTotalDataDao.java | 29 +-
.../ScreenVoluntaryActivityDataDao.java | 33 +-
.../service/screen/ScreenCollService.java | 201 ++++++++++
.../screen/impl/ScreenCollServiceImpl.java | 346 ++++++++++++++++++
.../mapper/screen/ScreenCpcBaseDataDao.xml | 63 +++-
.../mapper/screen/ScreenCustomerAgencyDao.xml | 55 ++-
.../mapper/screen/ScreenCustomerDeptDao.xml | 47 ++-
.../mapper/screen/ScreenCustomerGridDao.xml | 47 ++-
.../mapper/screen/ScreenDifficultyDataDao.xml | 59 ++-
.../mapper/screen/ScreenEventDataDao.xml | 63 +++-
.../mapper/screen/ScreenEventImgDataDao.xml | 6 +-
.../mapper/screen/ScreenGovernRankDataDao.xml | 59 ++-
.../mapper/screen/ScreenIndexDataDao.xml | 56 ++-
.../mapper/screen/ScreenOrgRankDataDao.xml | 61 ++-
.../screen/ScreenPartyBranchDataDao.xml | 58 ++-
.../screen/ScreenPartyLinkMassesDataDao.xml | 48 ++-
.../screen/ScreenPartyUserRankDataDao.xml | 55 ++-
.../mapper/screen/ScreenPioneerDataDao.xml | 53 ++-
.../mapper/screen/ScreenUserJoinDao.xml | 55 ++-
.../mapper/screen/ScreenUserTotalDataDao.xml | 55 ++-
.../screen/ScreenVoluntaryActivityDataDao.xml | 51 ++-
54 files changed, 3293 insertions(+), 52 deletions(-)
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/ImgDataListDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/ImgDataListDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/ImgDataListDTO.java
new file mode 100644
index 0000000000..fb63116850
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/ImgDataListDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.screencoll;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 图片列表
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class ImgDataListDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 原始事件id
+ */
+ private String eventId;
+
+ /**
+ * 图片地址
+ */
+ private String imgUrl;
+
+ /**
+ * 排序
+ */
+ private Integer sort;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java
new file mode 100644
index 0000000000..0efee2a896
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java
@@ -0,0 +1,86 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 2、党员基本情况 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class CpcBaseDataFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 注册用户数
+ */
+ private Integer registerUserCount;
+
+ /**
+ * 群众用户数
+ */
+ private Integer resiTotal;
+
+ /**
+ * 注册党员数
+ */
+ private Integer partyMemberCount;
+
+ /**
+ * 小于20岁
+ */
+ private Integer ageLevel1;
+
+ /**
+ * 20-30岁
+ */
+ private Integer ageLevel2;
+
+ /**
+ * 31-40岁
+ */
+ private Integer ageLevel3;
+
+ /**
+ * 41-50岁
+ */
+ private Integer ageLevel4;
+
+ /**
+ * 51-60岁
+ */
+ private Integer ageLevel5;
+
+ /**
+ * 60+岁
+ */
+ private Integer ageLevel6;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java
new file mode 100644
index 0000000000..7baff54308
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java
@@ -0,0 +1,71 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 14、组织层级 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class CustomerAgencyFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 组织id
+ */
+ private String agencyId;
+
+ /**
+ * 组织名称
+ */
+ private String agencyName;
+
+ /**
+ * 父级id ,顶级，此列为0
+ */
+ private String pid;
+
+ /**
+ * 所有上级ID，用逗号分开
+ */
+ private String pids;
+
+ /**
+ * 所有组织名称以-链接
+ */
+ private String allParentNames;
+
+ /**
+ * 坐标区域
+ */
+ private String areaMarks;
+
+ /**
+ * 中心点位
+ */
+ private String centerMark;
+
+ /**
+ * 党工委|街道党委的位置，预留字段
+ */
+ private String partyMark;
+
+ /**
+ * 机关级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province）
+ */
+ private String level;
+
+ /**
+ * 行政地区编码
+ */
+ private String areaCode;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java
new file mode 100644
index 0000000000..5566ea3ad7
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java
@@ -0,0 +1,51 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 16、部门信息上传 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class CustomerDeptFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 部门id
+ */
+ private String deptId;
+
+ /**
+ * 部门名称
+ */
+ private String deptName;
+
+ /**
+ * 部门所属组织id
+ */
+ private String parentAgencyId;
+
+ /**
+ * 坐标区域可空
+ */
+ private String areaMarks;
+
+ /**
+ * 中心点位
+ */
+ private String centerMark;
+
+ /**
+ * 部门所在位置
+ */
+ private String deptMark;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java
new file mode 100644
index 0000000000..13345ffaad
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java
@@ -0,0 +1,51 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 15、网格信息上传 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class CustomerGridFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 网格id
+ */
+ private String gridId;
+
+ /**
+ * 网格名称
+ */
+ private String gridName;
+
+ /**
+ * 网格所属组织id
+ */
+ private String parentAgencyId;
+
+ /**
+ * 坐标区域可空
+ */
+ private String areaMarks;
+
+ /**
+ * 中心点位
+ */
+ private String centerMark;
+
+ /**
+ * 党支部的位置！！！
+ */
+ private String partyMark;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java
new file mode 100644
index 0000000000..3053fe955a
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java
@@ -0,0 +1,91 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 3、难点赌点 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class DifficultyDataFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 事件原Id
+ */
+ private String eventId;
+
+ /**
+ * 事件图片 URL
+ */
+ private String eventImgUrl;
+
+ /**
+ * 事件来源 eg: XXX街道-xx社区-网格
+ */
+ private String eventSource;
+
+ /**
+ * 事件内容
+ */
+ private String eventContent;
+
+ /**
+ * 事件耗时单位：分钟
+ */
+ private Integer eventCostTime;
+
+ /**
+ * 事件设计部门数
+ */
+ private Integer eventReOrg;
+
+ /**
+ * 事件类别编码
+ */
+ private String eventCategoryCode;
+
+ /**
+ * 事件状态编码
+ */
+ private String eventStatusCode;
+
+ /**
+ * 事件类别名称
+ */
+ private String eventCategoryName;
+
+ /**
+ * 事件状态描述
+ */
+ private String eventStatusDesc;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
new file mode 100644
index 0000000000..1f56464806
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
@@ -0,0 +1,109 @@
+package com.epmet.dto.screencoll.form;
+
+import com.epmet.dto.screencoll.ImgDataListDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 4、事件数据(中央区-事件数据) 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class EventDataFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 原始事件Id
+ */
+ private String eventId;
+
+ /**
+ * 事件名称
+ */
+ private String eventTitle;
+
+ /**
+ * yyyy-MM-dd HH:mm:ss事件时间
+ */
+ private String eventCreateTime;
+
+ /**
+ * 联系人
+ */
+ private String linkMobile;
+
+ /**
+ * 事件内容
+ */
+ private String eventContent;
+
+ /**
+ * 事件图片（如果有图片，此列为第一张图片）
+ */
+ private String eventImgUrl;
+
+ /**
+ * 事件待处理级别 red:红；yellow：黄 , green绿色
+ */
+ private String eventLevel;
+
+ /**
+ * 事件发生的地址
+ */
+ private String eventAddress;
+
+ /**
+ * 经度
+ */
+ private BigDecimal longitude;
+
+ /**
+ * 维度
+ */
+ private BigDecimal latitude;
+
+ /**
+ * 最后处理的组织名称
+ */
+ private String lastProcessDept;
+
+ /**
+ * 最后处理的时间
+ */
+ private String lastProcessDate;
+
+ /**
+ * 图片列表
+ */
+ private List imgDataList;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java
new file mode 100644
index 0000000000..3976647f24
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java
@@ -0,0 +1,72 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 5、基层治理-治理能力数据 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class GovernRankDataFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 年Id ：yyyy
+ */
+ private String yearId;
+
+ /**
+ * 月份Id ：yyyyMM
+ */
+ private String monthId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 响应率，最大值100，保留小数点后4位
+ */
+ private BigDecimal responseRatio;
+
+ /**
+ * 解决率 最大值100，保留小数点后4位
+ */
+ private BigDecimal resolvedRatio;
+
+ /**
+ * 自治率 最大值100，保留小数点后4位
+ */
+ private BigDecimal governRatio;
+
+ /**
+ * 满意率，最大值100，保留小数点后四位
+ */
+ private BigDecimal satisfactionRatio;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataFormDTO.java
new file mode 100644
index 0000000000..d6d3065992
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataFormDTO.java
@@ -0,0 +1,71 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 1、指数相关 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class IndexDataFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * yyyy
+ */
+ private String yearId;
+
+ /**
+ * yyyyMM eg :202007
+ */
+ private String monthId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 总指数
+ */
+ private Integer indexTotal;
+
+ /**
+ * 党建能力指数
+ */
+ private Integer partyDevAblity;
+
+ /**
+ * 服务能力指数
+ */
+ private Integer serviceAblity;
+
+ /**
+ * 治理能力指数
+ */
+ private Integer governAblity;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java
new file mode 100644
index 0000000000..37386fcc6b
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java
@@ -0,0 +1,87 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 6、党建引领-组织排行 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class OrgRankDataFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 年Id ：yyyy
+ */
+ private String yearId;
+
+ /**
+ * 月份Id ：yyyyMM
+ */
+ private String monthId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 党员总数
+ */
+ private Integer partyTotal;
+
+ /**
+ * 小组（支部建设总数）
+ */
+ private Integer groupTotal;
+
+ /**
+ * 话题总数
+ */
+ private Integer topicTotal;
+
+ /**
+ * 议题总数
+ */
+ private Integer issueTotal;
+
+ /**
+ * 项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 结案率，最大值100，保留小数点后四位
+ */
+ private BigDecimal closeProjectRatio;
+
+ /**
+ * 满意率，最大值100，保留小数点后四位
+ */
+ private BigDecimal satisfactionRatio;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java
new file mode 100644
index 0000000000..956a1db6aa
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java
@@ -0,0 +1,76 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 7、基层党建-建设情况数据（支部、联建） 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class PartyBranchDataFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 年Id ：yyyy
+ */
+ private String yearId;
+
+ /**
+ * 月份Id ：yyyyMM
+ */
+ private String monthId;
+
+ /**
+ * 数据类别 party:支部建设;union:联合建设
+ */
+ private String type;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 议题分类名称
+ */
+ private String issueCategoryName;
+
+ /**
+ * 议题分类id
+ */
+ private String issueCategoryId;
+
+ /**
+ * 组织次数
+ */
+ private Integer organizeCount;
+
+ /**
+ * 参加人数
+ */
+ private Integer joinUserCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java
new file mode 100644
index 0000000000..bacca22874
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java
@@ -0,0 +1,51 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 8、党建引领-党员联系群众数据 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class PartyLinkMassesDataFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 建群总数
+ */
+ private Integer createGroupTotal;
+
+ /**
+ * 群成员总数
+ */
+ private Integer groupUserTotal;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
new file mode 100644
index 0000000000..6267736f51
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
@@ -0,0 +1,71 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 9、党建引领|基层治理-居民（党员）积分排行榜 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class PartyUserRankDataFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 年Id ：yyyy
+ */
+ private String yearId;
+
+ /**
+ * 月份Id ：yyyyMM
+ */
+ private String monthId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 用户身份 party:党员;resi：居民
+ */
+ private String userType;
+
+ /**
+ * 用户Id
+ */
+ private String userId;
+
+ /**
+ * 用户名称
+ */
+ private String userName;
+
+ /**
+ * 用户积分
+ */
+ private Integer pointTotal;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
new file mode 100644
index 0000000000..bde79f0baf
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
@@ -0,0 +1,66 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 10、党建引领-先锋模范数据
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class PioneerDataFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 用户总数
+ */
+ private Integer userTotal;
+
+ /**
+ * 议事数
+ */
+ private Integer issueTotal;
+
+ /**
+ * 话题总数
+ */
+ private Integer topicTotal;
+
+ /**
+ * 议题转项目数
+ */
+ private Integer shiftProjectTotal;
+
+ /**
+ * 解决项目总数
+ */
+ private Integer resolvedProjectTotal;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java
new file mode 100644
index 0000000000..65b563795d
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java
@@ -0,0 +1,72 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 11、基层治理-公众参与 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class UserJoinFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 总的参与次数
+ */
+ private Integer joinTotal;
+
+ /**
+ * 总的参与次数较上月增长率
+ */
+ private BigDecimal joinTotalUpRate;
+
+ /**
+ * 人均议题
+ */
+ private Integer avgIssue;
+
+ /**
+ * 人均议题较上月增长率
+ */
+ private BigDecimal avgIssueUpRate;
+
+ /**
+ * 平均参与度
+ */
+ private Integer avgJoin;
+
+ /**
+ * 平均参与度较上月增长率
+ */
+ private BigDecimal avgJoinUpRate;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java
new file mode 100644
index 0000000000..3cf171e6f7
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java
@@ -0,0 +1,71 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 12、中央区各类总数 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class UserTotalDataFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 用户总数
+ */
+ private Integer userTotal;
+
+ /**
+ * 注册党员数
+ */
+ private Integer partyTotal;
+
+ /**
+ * 小组（党群）总数
+ */
+ private Integer groupTotal;
+
+ /**
+ * 话题总数
+ */
+ private Integer topicTotal;
+
+ /**
+ * 议题总数
+ */
+ private Integer issueTotal;
+
+ /**
+ * 项目总数
+ */
+ private Integer projectTotal;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java
new file mode 100644
index 0000000000..6746a60303
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java
@@ -0,0 +1,61 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 13、党建引领-志愿活动服务数据 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class VoluntaryActivityDataFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * yyyy
+ */
+ private String yearId;
+
+ /**
+ * yyyyMM
+ */
+ private String monthId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 组织活动次数
+ */
+ private Integer activetyCount;
+
+ /**
+ * 活动参与人数
+ */
+ private Integer joinUserCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
index 616182f026..0052006dff 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
@@ -1,8 +1,16 @@
package com.epmet.controller;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.screencoll.form.*;
+import com.epmet.service.screen.ScreenCollService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+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;
+
/**
* 大屏数据采集api
*
@@ -12,4 +20,217 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("screencoll")
public class ScreenCollController {
+
+ @Autowired
+ private ScreenCollService screenCollService;
+
+ /**
+ * 9、党建引领|基层治理-居民（党员）积分排行榜
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("partyuserrankdata")
+ public Result partyUserRankData(@RequestBody List formDTO) {
+ return screenCollService.insertPartyUserRankData(formDTO);
+ }
+
+ /**
+ * 8、党建引领-党员联系群众数据
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("partylinkmassesdata")
+ public Result partyLinkMassesData(@RequestBody List formDTO) {
+ return screenCollService.insertPartyLinkMassesData(formDTO);
+ }
+
+ /**
+ * 7、基层党建-建设情况数据（支部、联建）
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("partybranchdata")
+ public Result partyBranchData(@RequestBody List formDTO) {
+ return screenCollService.insertPartyBranchData(formDTO);
+ }
+
+ /**
+ * 6、党建引领-组织排行
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("orgrankdata")
+ public Result orgRankData(@RequestBody List formDTO) {
+ return screenCollService.insertOrgRankData(formDTO);
+ }
+
+ /**
+ * 5、基层治理-治理能力数据
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("governrankdata")
+ public Result governRankData(@RequestBody List formDTO) {
+ return screenCollService.insertGovernRankData(formDTO);
+ }
+
+ /**
+ * 4、事件数据
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("eventdata")
+ public Result eventData(@RequestBody List formDTO) {
+ return screenCollService.insertEventData(formDTO);
+ }
+
+ /**
+ * 3、难点赌点
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("difficultydata")
+ public Result difficultyData(@RequestBody List formDTO) {
+ return screenCollService.insertDifficultyData(formDTO);
+ }
+
+ /**
+ * 2、党员基本情况
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("cpcbasedata")
+ public Result cpcbaseData(@RequestBody List formDTO) {
+ return screenCollService.insertCpcbaseData(formDTO);
+ }
+
+ /**
+ * 1、指数相关
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("indexdata")
+ public Result indexData(@RequestBody List formDTO) {
+ return screenCollService.insertIndexData(formDTO);
+ }
+
+ // --
+
+ /**
+ * 16、部门信息上传
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("customerdept")
+ public Result customerDept(@RequestBody List formDTO) {
+ return screenCollService.insertCustomerDept(formDTO);
+ }
+
+ /**
+ * 15、网格信息上传
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("customergrid")
+ public Result customerGrid(@RequestBody List formDTO) {
+ return screenCollService.insertCustomerGrid(formDTO);
+ }
+
+ /**
+ * 14、组织层级
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("customeragency")
+ public Result customerAgency(@RequestBody List formDTO) {
+ return screenCollService.insertCustomerAgency(formDTO);
+ }
+
+ /**
+ * 13、党建引领-志愿活动服务数据
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("voluntaryactivitydata")
+ public Result voluntaryActivityData(@RequestBody List formDTO) {
+ return screenCollService.insertVoluntaryActivityData(formDTO);
+ }
+
+ /**
+ * 12、中央区各类总数
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("usertotaldata")
+ public Result userTotalData(@RequestBody List formDTO) {
+ return screenCollService.insertUserTotalData(formDTO);
+ }
+
+ /**
+ * 11、基层治理-公众参与
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("userjoin")
+ public Result userJoin(@RequestBody List formDTO) {
+ return screenCollService.insertUserJoin(formDTO);
+ }
+
+ /**
+ * 10、党建引领-先锋模范数据
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("pioneerdata")
+ public Result pioneerData(@RequestBody List formDTO) {
+ return screenCollService.insertPioneerData(formDTO);
+ }
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
index f36b90de5a..fa30fdef44 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.CpcBaseDataFormDTO;
import com.epmet.entity.screen.ScreenCpcBaseDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 基层党建-党员基本情况
@@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenCpcBaseDataDao extends BaseDao {
-
-}
\ No newline at end of file
+
+ /**
+ * 2、党员基本情况
+ * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param orgIds 组织Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteCpcBaseData(@Param("customerId") String customerId,
+ @Param("orgIds") String[] orgIds);
+
+ /**
+ * 2、党员基本情况
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertCpcBaseData(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
index 7c6b86064a..240c48e041 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
@@ -18,8 +18,13 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.CustomerAgencyFormDTO;
+import com.epmet.dto.screencoll.form.CustomerGridFormDTO;
import com.epmet.entity.screen.ScreenCustomerAgencyEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 组织机构信息
@@ -29,5 +34,25 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenCustomerAgencyDao extends BaseDao {
-
-}
\ No newline at end of file
+ /**
+ *14、组织层级
+ * 1) 根据CUSTOMER_ID、AGENCY_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param agencyIds 组织id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteCustomerAgency(@Param("customerId") String customerId,
+ @Param("agencyIds") String[] agencyIds);
+
+ /**
+ * 14、组织层级
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertCustomerAgency(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
index 7880a87e19..84e641b47b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.CustomerDeptFormDTO;
import com.epmet.entity.screen.ScreenCustomerDeptEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 部门信息
@@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenCustomerDeptDao extends BaseDao {
-
-}
\ No newline at end of file
+
+ /**
+ *16、部门信息上传
+ * 1) 根据CUSTOMER_ID、DEPT_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param deptIds 部门Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteCustomerDept(@Param("customerId") String customerId,
+ @Param("deptIds") String[] deptIds);
+
+ /**
+ * 16、部门信息上传
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertCustomerDept(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
index be0e30d3b5..cfc0c7092c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.CustomerGridFormDTO;
import com.epmet.entity.screen.ScreenCustomerGridEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 网格信息
@@ -29,5 +33,25 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenCustomerGridDao extends BaseDao {
-
-}
\ No newline at end of file
+ /**
+ *15、网格信息上传
+ * 1) 根据CUSTOMER_ID、GRID_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param gridIds 网格Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteCustomerGrid(@Param("customerId") String customerId,
+ @Param("gridIds") String[] gridIds);
+
+ /**
+ * 15、网格信息上传
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertCustomerGrid(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
index 59bf5ed908..503f070506 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.DifficultyDataFormDTO;
import com.epmet.entity.screen.ScreenDifficultyDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 基层治理-难点堵点
@@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenDifficultyDataDao extends BaseDao {
-
-}
\ No newline at end of file
+ /**
+ * 3、难点赌点
+ * 1) 根据CUSTOMER_ID、EVENT_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * CUSTOMER_ID 一
+ * EVENT_ID 多
+ * ORG_ID 多
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteDifficultyData(DifficultyDataFormDTO list);
+
+ /**
+ * 3、难点赌点
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertDifficultyData(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
index a1b422d57d..20250bc7ff 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.EventDataFormDTO;
import com.epmet.entity.screen.ScreenEventDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 中央区-事件数据
@@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenEventDataDao extends BaseDao {
-
-}
\ No newline at end of file
+ /**
+ * 4、事件数据
+ * 1) 根据CUSTOMER_ID、EVENT_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * CUSTOMER_ID 一
+ * EVENT_ID 多
+ * ORG_ID 多
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteEventData(EventDataFormDTO list);
+
+ /**
+ * 4、事件数据
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertEventData(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java
index 341a71e4fc..42ca86859e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.screen.ScreenEventImgDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* 中央区-事件数据图片数据
@@ -29,5 +30,14 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenEventImgDataDao extends BaseDao {
-
-}
\ No newline at end of file
+
+ /**
+ * 根据原始事件Id，进行物理删除
+ *
+ * @param eventId
+ * @return void
+ * @Author zhangyong
+ * @Date 16:47 2020-08-18
+ **/
+ void delEventImgDataByEventId(@Param("eventId") String eventId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
index c165a8c2e0..295538b085 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.GovernRankDataFormDTO;
import com.epmet.entity.screen.ScreenGovernRankDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 基层治理-治理能力排行数据
@@ -29,5 +33,29 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenGovernRankDataDao extends BaseDao {
-
-}
\ No newline at end of file
+ /**
+ * 5、基层治理-治理能力数据
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param yearId
+ * @param monthId
+ * @param orgIds 组织Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteGovernRankData(@Param("customerId") String customerId,
+ @Param("yearId") String yearId,
+ @Param("monthId") String monthId,
+ @Param("orgIds") String[] orgIds);
+
+ /**
+ * 5、基层治理-治理能力数据
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertGovernRankData(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java
index 5824e61ce9..53a413b048 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.IndexDataFormDTO;
import com.epmet.entity.screen.ScreenIndexDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 指数-指数数据
@@ -29,5 +33,30 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenIndexDataDao extends BaseDao {
-
-}
\ No newline at end of file
+
+ /**
+ *1、指数相关
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param yearId
+ * @param monthId
+ * @param orgIds 组织Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteIndexData(@Param("customerId") String customerId,
+ @Param("yearId") String yearId,
+ @Param("monthId") String monthId,
+ @Param("orgIds") String[] orgIds);
+
+ /**
+ * 1、指数相关
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertIndexData(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
index 416c1e73c5..110d37c618 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.OrgRankDataFormDTO;
import com.epmet.entity.screen.ScreenOrgRankDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 党建引领-组织排行榜
@@ -29,5 +33,29 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenOrgRankDataDao extends BaseDao {
-
-}
\ No newline at end of file
+ /**
+ * 6、党建引领-组织排行
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param yearId
+ * @param monthId
+ * @param orgIds 组织Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteOrgRankData(@Param("customerId") String customerId,
+ @Param("yearId") String yearId,
+ @Param("monthId") String monthId,
+ @Param("orgIds") String[] orgIds);
+
+ /**
+ * 6、党建引领-组织排行
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertOrgRankData(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
index cd05f39bae..9dc6a142c1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.PartyBranchDataFormDTO;
import com.epmet.entity.screen.ScreenPartyBranchDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 基层党建-建设情况数据（支部，联建）
@@ -29,5 +33,29 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenPartyBranchDataDao extends BaseDao {
-
-}
\ No newline at end of file
+ /**
+ * 7、基层党建-建设情况数据（支部、联建）
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param yearId
+ * @param monthId
+ * @param orgIds 组织Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deletePartyBranchData(@Param("customerId") String customerId,
+ @Param("yearId") String yearId,
+ @Param("monthId") String monthId,
+ @Param("orgIds") String[] orgIds);
+
+ /**
+ * 7、基层党建-建设情况数据（支部、联建）
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertPartyBranchData(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
index 59379fb5c2..d100742ec8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.PartyLinkMassesDataFormDTO;
import com.epmet.entity.screen.ScreenPartyLinkMassesDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 党建引领-党员联系群众数据
@@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenPartyLinkMassesDataDao extends BaseDao {
-
-}
\ No newline at end of file
+
+ /**
+ * 8、党建引领-党员联系群众数据
+ * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param orgIds 组织Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deletePartyLinkMassesData(@Param("customerId") String customerId,
+ @Param("orgIds") String[] orgIds);
+
+ /**
+ * 8、党建引领-党员联系群众数据
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertPartyLinkMassesData(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
index beb5c89990..c0ab9db8c1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.PartyUserRankDataFormDTO;
import com.epmet.entity.screen.ScreenPartyUserRankDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 党建引领｜基层治理-市民（党员）积分排行榜
@@ -29,5 +33,30 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenPartyUserRankDataDao extends BaseDao {
-
-}
\ No newline at end of file
+
+ /**
+ * 9、党建引领|基层治理-居民（党员）积分排行榜
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param yearId
+ * @param monthId
+ * @param orgIds 组织Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deletePartyUserRankData(@Param("customerId") String customerId,
+ @Param("yearId") String yearId,
+ @Param("monthId") String monthId,
+ @Param("orgIds") String[] orgIds);
+
+ /**
+ * 9、党建引领|基层治理-居民（党员）积分排行榜
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertPartyUserRankData(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
index d5614450e5..ba6bfa532a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.PioneerDataFormDTO;
import com.epmet.entity.screen.ScreenPioneerDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 党建引领-先锋模范数据
@@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenPioneerDataDao extends BaseDao {
-
-}
\ No newline at end of file
+
+ /**
+ * 10、党建引领-先锋模范数据
+ * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param orgIds 组织Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deletePioneerData(@Param("customerId") String customerId,
+ @Param("orgIds") String[] orgIds);
+
+ /**
+ * 10、党建引领-先锋模范数据
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertPioneerData(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
index 8d87e41a02..440f611196 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.UserJoinFormDTO;
import com.epmet.entity.screen.ScreenUserJoinEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 基层治理-公众参与
@@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenUserJoinDao extends BaseDao {
-
-}
\ No newline at end of file
+
+ /**
+ * 11、基层治理-公众参与
+ * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param orgIds 组织Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteUserJoin(@Param("customerId") String customerId,
+ @Param("orgIds") String[] orgIds);
+
+ /**
+ * 11、基层治理-公众参与
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertUserJoin(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
index 67193fea32..ef7543555a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.UserTotalDataFormDTO;
import com.epmet.entity.screen.ScreenUserTotalDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 中央区-各类用户总数
@@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenUserTotalDataDao extends BaseDao {
-
-}
\ No newline at end of file
+
+ /**
+ * 12、中央区各类总数
+ * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param orgIds 组织Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteUserTotalData(@Param("customerId") String customerId,
+ @Param("orgIds") String[] orgIds);
+
+ /**
+ * 12、中央区各类总数
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertUserTotalData(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
index 2d01356044..13357e03c2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.VoluntaryActivityDataFormDTO;
import com.epmet.entity.screen.ScreenVoluntaryActivityDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 党建引领-志愿活动服务数据
@@ -29,5 +33,30 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenVoluntaryActivityDataDao extends BaseDao {
-
-}
\ No newline at end of file
+
+ /**
+ * 13、党建引领-志愿活动服务数据
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param yearId
+ * @param monthId
+ * @param orgIds 组织Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteVoluntaryActivityData(@Param("customerId") String customerId,
+ @Param("yearId") String yearId,
+ @Param("monthId") String monthId,
+ @Param("orgIds") String[] orgIds);
+
+ /**
+ * 13、党建引领-志愿活动服务数据
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertVoluntaryActivityData(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
new file mode 100644
index 0000000000..1c6c212588
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
@@ -0,0 +1,201 @@
+package com.epmet.service.screen;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.screencoll.form.*;
+
+import java.util.List;
+
+public interface ScreenCollService {
+
+ /**
+ * 9、党建引领|基层治理-居民（党员）积分排行榜
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertPartyUserRankData(List formDTO);
+
+ /**
+ * 8、党建引领-党员联系群众数据
+ * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertPartyLinkMassesData(List formDTO);
+
+ /**
+ * 7、基层党建-建设情况数据（支部、联建）
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertPartyBranchData(List formDTO);
+
+ /**
+ * 6、党建引领-组织排行
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertOrgRankData(List formDTO);
+
+ /**
+ * 5、基层治理-治理能力数据
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertGovernRankData(List formDTO);
+
+ /**
+ * 4、事件数据
+ * 1) 根据CUSTOMER_ID、EVENT_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertEventData(List formDTO);
+
+ /**
+ * 3、难点赌点
+ * 1) 根据CUSTOMER_ID、EVENT_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertDifficultyData(List formDTO);
+
+ /**
+ * 2、党员基本情况
+ * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertCpcbaseData(List formDTO);
+
+ /**
+ * 1、指数相关
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertIndexData(List formDTO);
+
+ /**
+ * 16、部门信息上传
+ * 1) 根据CUSTOMER_ID、DEPT_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertCustomerDept(List formDTO);
+
+ /**
+ * 15、网格信息上传
+ * 1) 根据CUSTOMER_ID、GRID_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertCustomerGrid(List formDTO);
+
+ /**
+ * 14、组织层级
+ * 1) 根据CUSTOMER_ID、AGENCY_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertCustomerAgency(List formDTO);
+
+ /**
+ * 13、党建引领-志愿活动服务数据
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertVoluntaryActivityData(List formDTO);
+
+ /**
+ * 12、中央区各类总数
+ * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertUserTotalData(List formDTO);
+
+ /**
+ * 11、基层治理-公众参与
+ * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertUserJoin(List formDTO);
+
+ /**
+ * 10、党建引领-先锋模范数据
+ * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertPioneerData(List formDTO);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
new file mode 100644
index 0000000000..922de2f876
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
@@ -0,0 +1,346 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] orgIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ orgIds[i] = formDTO.get(i).getOrgId();
+ }
+ screenPartyUserRankDataDao.deletePartyUserRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ formDTO.get(NumConstant.ZERO).getYearId(),
+ formDTO.get(NumConstant.ZERO).getMonthId(),
+ orgIds);
+
+ screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertPartyLinkMassesData(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] orgIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ orgIds[i] = formDTO.get(i).getOrgId();
+ }
+ screenPartyLinkMassesDataDao.deletePartyLinkMassesData(formDTO.get(NumConstant.ZERO).getCustomerId(), orgIds);
+
+ screenPartyLinkMassesDataDao.batchInsertPartyLinkMassesData(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ public Result insertPartyBranchData(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] orgIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ orgIds[i] = formDTO.get(i).getOrgId();
+ }
+ screenPartyBranchDataDao.deletePartyBranchData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ formDTO.get(NumConstant.ZERO).getYearId(),
+ formDTO.get(NumConstant.ZERO).getMonthId(),
+ orgIds);
+
+ screenPartyBranchDataDao.batchInsertPartyBranchData(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertOrgRankData(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] orgIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ orgIds[i] = formDTO.get(i).getOrgId();
+ }
+ screenOrgRankDataDao.deleteOrgRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ formDTO.get(NumConstant.ZERO).getYearId(),
+ formDTO.get(NumConstant.ZERO).getMonthId(),
+ orgIds);
+
+ screenOrgRankDataDao.batchInsertOrgRankData(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertGovernRankData(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] orgIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ orgIds[i] = formDTO.get(i).getOrgId();
+ }
+ screenGovernRankDataDao.deleteGovernRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ formDTO.get(NumConstant.ZERO).getYearId(),
+ formDTO.get(NumConstant.ZERO).getMonthId(),
+ orgIds);
+
+ screenGovernRankDataDao.batchInsertGovernRankData(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertEventData(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ screenEventDataDao.deleteEventData(formDTO.get(i));
+ }
+
+ screenEventDataDao.batchInsertEventData(formDTO);
+
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++) {
+ if (null != formDTO.get(i).getImgDataList() && formDTO.get(i).getImgDataList().size() > NumConstant.ZERO) {
+ // 根据原始事件ID，物理删除 - 事件数据图片数据
+ screenEventImgDataDao.delEventImgDataByEventId(formDTO.get(i).getEventId());
+ for (int j = NumConstant.ZERO; j < formDTO.get(i).getImgDataList().size(); j++){
+ // 新增 中央区-事件数据图片数据 表
+ ScreenEventImgDataEntity imgDataEntity = new ScreenEventImgDataEntity();
+ imgDataEntity.setEventId(formDTO.get(i).getImgDataList().get(j).getEventId());
+ imgDataEntity.setEventImgUrl(formDTO.get(i).getImgDataList().get(j).getImgUrl());
+ imgDataEntity.setSort(formDTO.get(i).getImgDataList().get(j).getSort());
+ screenEventImgDataDao.insert(imgDataEntity);
+ }
+ }
+ }
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertDifficultyData(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ screenDifficultyDataDao.deleteDifficultyData(formDTO.get(i));
+ }
+
+ screenDifficultyDataDao.batchInsertDifficultyData(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertCpcbaseData(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] orgIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ orgIds[i] = formDTO.get(i).getOrgId();
+ }
+ screenCpcBaseDataDao.deleteCpcBaseData(formDTO.get(NumConstant.ZERO).getCustomerId(), orgIds);
+
+ screenCpcBaseDataDao.batchInsertCpcBaseData(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertIndexData(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] orgIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ orgIds[i] = formDTO.get(i).getOrgId();
+ }
+ screenIndexDataDao.deleteIndexData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ formDTO.get(NumConstant.ZERO).getYearId(),
+ formDTO.get(NumConstant.ZERO).getMonthId(),
+ orgIds);
+
+ screenIndexDataDao.batchInsertIndexData(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertCustomerDept(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] deptIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ deptIds[i] = formDTO.get(i).getDeptId();
+ }
+ screenCustomerDeptDao.deleteCustomerDept(formDTO.get(NumConstant.ZERO).getCustomerId(), deptIds);
+
+ screenCustomerDeptDao.batchInsertCustomerDept(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertCustomerGrid(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] gridIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ gridIds[i] = formDTO.get(i).getGridId();
+ }
+ screenCustomerGridDao.deleteCustomerGrid(formDTO.get(NumConstant.ZERO).getCustomerId(), gridIds);
+
+ screenCustomerGridDao.batchInsertCustomerGrid(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertCustomerAgency(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] agencyIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ agencyIds[i] = formDTO.get(i).getAgencyId();
+ }
+ screenCustomerAgencyDao.deleteCustomerAgency(formDTO.get(NumConstant.ZERO).getCustomerId(), agencyIds);
+
+ screenCustomerAgencyDao.batchInsertCustomerAgency(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertVoluntaryActivityData(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] orgIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ orgIds[i] = formDTO.get(i).getOrgId();
+ }
+ screenVoluntaryActivityDataDao.deleteVoluntaryActivityData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ formDTO.get(NumConstant.ZERO).getYearId(),
+ formDTO.get(NumConstant.ZERO).getMonthId(),
+ orgIds);
+
+ screenVoluntaryActivityDataDao.batchInsertVoluntaryActivityData(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertUserTotalData(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] orgIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ orgIds[i] = formDTO.get(i).getOrgId();
+ }
+ screenUserTotalDataDao.deleteUserTotalData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ orgIds);
+
+ screenUserTotalDataDao.batchInsertUserTotalData(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertUserJoin(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] orgIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ orgIds[i] = formDTO.get(i).getOrgId();
+ }
+ screenUserJoinDao.deleteUserJoin(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ orgIds);
+
+ screenUserJoinDao.batchInsertUserJoin(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertPioneerData(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] orgIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ orgIds[i] = formDTO.get(i).getOrgId();
+ }
+ screenPioneerDataDao.deletePioneerData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ orgIds);
+
+ screenPioneerDataDao.batchInsertPioneerData(formDTO);
+ }
+ return new Result();
+ }
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
index a44106f3f6..de6f379dc4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
@@ -3,6 +3,67 @@
+
+ delete from screen_cpc_base_data
+ where CUSTOMER_ID = #{customerId}
+ AND ORG_ID IN
+
+ #{item}
+
+
+
+ insert into screen_cpc_base_data
+ (
+ ID,
+ CUSTOMER_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ REGISTER_USER_COUNT,
+ RESI_TOTAL,
+ PARTY_MEMBER_COUNT,
+ AGE_LEVEL_1,
+ AGE_LEVEL_2,
+ AGE_LEVEL_3,
+ AGE_LEVEL_4,
+ AGE_LEVEL_5,
+ AGE_LEVEL_6,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
+ #{item.registerUserCount},
+ #{item.resiTotal},
-
\ No newline at end of file
+ #{item.partyMemberCount},
+ #{item.ageLevel1},
+ #{item.ageLevel2},
+ #{item.ageLevel3},
+ #{item.ageLevel4},
+ #{item.ageLevel5},
+ #{item.ageLevel6},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
+
+
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index 9fea45f98a..c01c3dcc95 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -3,6 +3,59 @@
+
+ delete from screen_customer_agency
+ where CUSTOMER_ID = #{customerId}
+ AND AGENCY_ID IN
+
+ #{item}
+
+
+
+ insert into screen_customer_agency
+ (
+ ID,
+ CUSTOMER_ID,
+ AGENCY_ID,
+ AGENCY_NAME,
+ PID,
+ PIDS,
+ ALL_PARENT_NAMES,
+ AREA_MARKS,
+ CENTER_MARK,
+ PARTY_MARK,
+ `LEVEL`,
+ AREA_CODE,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.agencyId},
+ #{item.agencyName},
+ #{item.pid},
+ #{item.pids},
+ #{item.allParentNames},
+ #{item.areaMarks},
+ #{item.centerMark},
+ #{item.partyMark},
+ #{item.level},
+ #{item.areaCode},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
-
\ No newline at end of file
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
index 721653ca7f..267a118cd8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
@@ -3,6 +3,51 @@
+
+ delete from screen_customer_dept
+ where CUSTOMER_ID = #{customerId}
+ AND DEPT_ID IN
+
+ #{item}
+
+
+
+ insert into screen_customer_dept
+ (
+ ID,
+ CUSTOMER_ID,
+ DEPT_ID,
+ DEPT_NAME,
+ PARENT_AGENCY_ID,
+ AREA_MARKS,
+ CENTER_MARK,
+ DEPT_MARK,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.deptId},
+ #{item.deptName},
+ #{item.parentAgencyId},
+ #{item.areaMarks},
+ #{item.centerMark},
+ #{item.deptMark},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
-
\ No newline at end of file
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
index 66c30e3e32..5c96ed4ae8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@@ -3,6 +3,51 @@
+
+ delete from screen_customer_grid
+ where CUSTOMER_ID = #{customerId}
+ AND GRID_ID IN
+
+ #{item}
+
+
+
+ insert into screen_customer_grid
+ (
+ ID,
+ CUSTOMER_ID,
+ GRID_ID,
+ GRID_NAME,
+ PARENT_AGENCY_ID,
+ AREA_MARKS,
+ CENTER_MARK,
+ PARTY_MARK,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.gridId},
+ #{item.gridName},
+ #{item.parentAgencyId},
+ #{item.areaMarks},
+ #{item.centerMark},
+ #{item.partyMark},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
-
\ No newline at end of file
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index 9beabee8b7..5ec18b6c7b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -3,6 +3,63 @@
+
+ delete from screen_difficulty_data
+ where CUSTOMER_ID = #{customerId} AND EVENT_ID = #{eventId} AND ORG_ID = #{orgId}
+
+
+ insert into screen_difficulty_data
+ (
+ ID,
+ CUSTOMER_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ EVENT_ID,
+ EVENT_IMG_URL,
+ EVENT_SOURCE,
+ EVENT_CONTENT,
+ EVENT_COST_TIME,
+ EVENT_RE_ORG,
+ EVENT_CATEGORY_CODE,
+ EVENT_CATEGORY_NAME,
+ EVENT_STATUS_CODE,
+ EVENT_STATUS_DESC,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
+ #{item.eventId},
+ #{item.eventImgUrl},
+ #{item.eventSource},
+ #{item.eventContent},
+ #{item.eventCostTime},
+ #{item.eventReOrg},
+ #{item.eventCategoryCode},
+ #{item.eventCategoryName},
+ #{item.eventStatusCode},
+ #{item.eventStatusDesc},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
-
\ No newline at end of file
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
index a9c0339fa9..c861d869ed 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
@@ -3,6 +3,67 @@
+
+ delete from screen_event_data
+ where CUSTOMER_ID = #{customerId} AND EVENT_ID = #{eventId} AND ORG_ID = #{orgId}
+
+
+ insert into screen_event_data
+ (
+ ID,
+ CUSTOMER_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ EVENT_ID,
+ EVENT_TITLE,
+ EVENT_CREATE_TIME,
+ LINK_MOBILE,
+ EVENT_CONTENT,
+ EVENT_IMG_URL,
+ EVENT_LEVEL,
+ EVENT_ADDRESS,
+ LONGITUDE,
+ LATITUDE,
+ LAST_PROCESS_DEPT,
+ LAST_PROCESS_DATE,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
+ #{item.eventId},
+ #{item.eventTitle},
+ #{item.eventCreateTime},
+ #{item.linkMobile},
+ #{item.eventContent},
+ #{item.eventImgUrl},
+ #{item.eventLevel},
+ #{item.eventAddress},
+ #{item.longitude},
+ #{item.latitude},
+ #{item.lastProcessDept},
+ #{item.lastProcessDate},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
-
\ No newline at end of file
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
index 473e3165fa..eaef413fd8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
@@ -3,5 +3,9 @@
+
+ delete from screen_event_img_data
+ where DEL_FLAG = '0' AND EVENT_ID = #{eventId}
+
-
\ No newline at end of file
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
index 99af58be38..48d98970ce 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
@@ -3,6 +3,63 @@
+
+ delete from screen_govern_rank_data
+ where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
+ AND ORG_ID IN
+
+ #{item}
+
+
+
+ insert into screen_govern_rank_data
+ (
+ ID,
+ CUSTOMER_ID,
+ YEAR_ID,
+ MONTH_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
-
\ No newline at end of file
+ RESPONSE_RATIO,
+ RESOLVED_RATIO,
+ GOVERN_RATIO,
+ SATISFACTION_RATIO,
+
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.yearId},
+ #{item.monthId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
+
+ #{item.responseRatio},
+ #{item.resolvedRatio},
+ #{item.governRatio},
+ #{item.satisfactionRatio},
+
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
+
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
index 35275e613d..045bf7926e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
@@ -3,6 +3,60 @@
+
+ delete from screen_index_data
+ where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
+ AND ORG_ID IN
+
+ #{item}
+
+
+
+ insert into screen_index_data
+ (
+ ID,
+ CUSTOMER_ID,
+ YEAR_ID,
+ MONTH_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ INDEX_TOTAL,
+ PARTY_DEV_ABLITY,
+ SERVICE_ABLITY,
+ GOVERN_ABLITY,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.yearId},
+ #{item.monthId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
-
\ No newline at end of file
+ #{item.indexTotal},
+ #{item.partyDevAblity},
+ #{item.serviceAblity},
+ #{item.governAblity},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
+
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
index 60c597c6ac..be2ff1fb67 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
@@ -3,6 +3,65 @@
+
+ delete from screen_org_rank_data
+ where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
+ AND ORG_ID IN
+
+ #{item}
+
+
+
+ insert into screen_org_rank_data
+ (
+ ID,
+ CUSTOMER_ID,
+ YEAR_ID,
+ MONTH_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ PARTY_TOTAL,
+ GROUP_TOTAL,
+ TOPIC_TOTAL,
+ ISSUE_TOTAL,
+ PROJECT_TOTAL,
+ CLOSE_PROJECT_RATIO,
+ SATISFACTION_RATIO,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.yearId},
+ #{item.monthId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
+ #{item.partyTotal},
+ #{item.groupTotal},
+ #{item.topicTotal},
+ #{item.issueTotal},
+ #{item.projectTotal},
+ #{item.closeProjectRatio},
+ #{item.satisfactionRatio},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
-
\ No newline at end of file
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
index 891493b386..c7cf37d027 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
@@ -3,6 +3,60 @@
+
+ delete from screen_party_branch_data
+ where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
+ AND ORG_ID IN
+
+ #{item}
+
+
-
-
\ No newline at end of file
+
+ insert into screen_party_branch_data
+ (
+ ID,
+ CUSTOMER_ID,
+ YEAR_ID,
+ MONTH_ID,
+ `TYPE`,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ ISSUE_CATEGORY_ID,
+ ISSUE_CATEGORY_NAME,
+ ORGANIZE_COUNT,
+ JOIN_USER_COUNT,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.yearId},
+ #{item.monthId},
+ #{item.type},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
+ #{item.issueCategoryId},
+ #{item.issueCategoryName},
+ #{item.organizeCount},
+ #{item.joinUserCount},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
index 48164dfcf2..b5f7770bfd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
@@ -3,5 +3,51 @@
+
+ delete from screen_party_link_masses_data
+ where CUSTOMER_ID = #{customerId}
+ AND ORG_ID IN
+
+ #{item}
+
+
-
\ No newline at end of file
+
+ insert into screen_party_link_masses_data
+ (
+ ID,
+ CUSTOMER_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ CREATE_GROUP_TOTAL,
+ GROUP_USER_TOTAL,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
+ #{item.createGroupTotal},
+ #{item.groupUserTotal},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
+
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 89abfabab4..74e3377d18 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -3,6 +3,59 @@
+
+ delete from screen_party_user_rank_data
+ where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
+ AND ORG_ID IN
+
+ #{item}
+
+
+
+ insert into screen_party_user_rank_data
+ (
+ ID,
+ CUSTOMER_ID,
+ YEAR_ID,
+ MONTH_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ USER_TYPE,
+ USER_ID,
+ USER_NAME,
+ POINT_TOTAL,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.yearId},
+ #{item.monthId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
+ #{item.userType},
+ #{item.userId},
+ #{item.userName},
+ #{item.pointTotal},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
-
\ No newline at end of file
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
index 0fe5e969e3..c31c51fe78 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
@@ -3,6 +3,57 @@
+
+ delete from screen_pioneer_data
+ where CUSTOMER_ID = #{customerId}
+ AND ORG_ID IN
+
+ #{item}
+
+
+
+ insert into screen_pioneer_data
+ (
+ ID,
+ CUSTOMER_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ USER_TOTAL,
+ ISSUE_TOTAL,
+ TOPIC_TOTAL,
+ SHIFT_PROJECT_TOTAL,
+ RESOLVED_PROJECT_TOTAL,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
+ #{item.userTotal},
+ #{item.issueTotal},
+ #{item.topicTotal},
+ #{item.shiftProjectTotal},
+ #{item.resolvedProjectTotal},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
-
\ No newline at end of file
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
index 68b3c4133f..3e5acce57a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
@@ -3,6 +3,59 @@
+
+ delete from screen_user_join
+ where CUSTOMER_ID = #{customerId}
+ AND ORG_ID IN
+
+ #{item}
+
+
+
+ insert into screen_user_join
+ (
+ ID,
+ CUSTOMER_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ JOIN_TOTAL,
+ JOIN_TOTAL_UP_RATE,
+ AVG_ISSUE,
+ AVG_ISSUE_UP_RATE,
+ AVG_JOIN,
+ AGVG_JOIN_UP_RATE,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
+ #{item.joinTotal},
+ #{item.joinTotalUpRate},
+ #{item.avgIssue},
+ #{item.avgIssueUpRate},
+ #{item.avgJoin},
+ #{item.avgJoinUpRate},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
-
\ No newline at end of file
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
index 0bf7ed23aa..51257d5837 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
@@ -3,6 +3,59 @@
+
+ delete from screen_user_total_data
+ where CUSTOMER_ID = #{customerId}
+ AND ORG_ID IN
+
+ #{item}
+
+
+
+ insert into screen_user_total_data
+ (
+ ID,
+ CUSTOMER_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ USER_TOTAL,
+ PARTY_TOTAL,
+ GROUP_TOTAL,
+ TOPIC_TOTAL,
+ ISSUE_TOTAL,
+ PROJECT_TOTAL,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
+ #{item.userTotal},
+ #{item.partyTotal},
+ #{item.groupTotal},
+ #{item.topicTotal},
+ #{item.issueTotal},
+ #{item.projectTotal},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
-
\ No newline at end of file
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
index 416026256a..dc2c2585a6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
@@ -3,6 +3,55 @@
+
+ delete from screen_voluntary_activity_data
+ where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
+ AND ORG_ID IN
+
+ #{item}
+
+
+
+ insert into screen_voluntary_activity_data
+ (
+ ID,
+ CUSTOMER_ID,
+ YEAR_ID,
+ MONTH_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ ACTIVETY_COUNT,
+ JOIN_USER_COUNT,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.yearId},
+ #{item.monthId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
+ #{item.activetyCount},
+ #{item.joinUserCount},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
-
\ No newline at end of file
+
From c900ba7912c2cec626cdaf0e47634c5ec4df281c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 19 Aug 2020 11:21:22 +0800
Subject: [PATCH 014/127] =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E3=80=81?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=86=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../screen/dto/result/BranchResultDTO.java | 17 +++----
.../ParymemberDistributionResultDTO.java | 12 ++---
.../dto/result/ParymemberResultDTO.java | 18 +++++--
.../screen/dto/result/UserResultDTO.java | 12 +++++
.../controller/screen/AgencyController.java | 7 ++-
.../screen/DistributionController.java | 6 ++-
.../dao/screen/ScreenCustomerAgencyDao.java | 20 ++++++--
.../dao/screen/ScreenCustomerGridDao.java | 27 ++++++++++
.../service/screen/AgencyService.java | 3 +-
.../service/screen/DistributionService.java | 4 +-
.../screen/impl/AgencyServiceImpl.java | 9 ++--
.../screen/impl/DistributionServiceImpl.java | 51 ++++++++++++++++---
.../mapper/screen/ScreenCustomerAgencyDao.xml | 36 +++++++++++++
.../mapper/screen/ScreenCustomerGridDao.xml | 49 ++++++++++++++++++
14 files changed, 232 insertions(+), 39 deletions(-)
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
index a41d5111b0..0a836a6bfd 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
@@ -14,22 +14,17 @@ public class BranchResultDTO implements Serializable {
private static final long serialVersionUID = -8001714892170166320L;
/**
- * 名称：根据当前所在组织，查询出的子级名称
+ * 网格ID
*/
- private String name;
+ private String gridId;
/**
- * 可能是agencyId，也可以是gridId， 也可以是deptId
+ * 网格名称
*/
- private String id;
+ private String gridName;
/**
- * 组织：agency 网格：grid 部门：dept
+ * 党支部(网格)位置
*/
- private String type;
-
- /**
- * 中心点位
- */
- private String centerMark;
+ private String partyMark;
}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java
index e663986791..397b53287b 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java
@@ -16,31 +16,31 @@ public class ParymemberDistributionResultDTO implements Serializable {
/**
* 可能是gridId,可能是agencyId
*/
- private String subId;
+ private String subId = "";
/**
* 中心点位
*/
- private String centerMark;
+ private String centerMark = "";
/**
* 党员总人数
*/
- private Integer totalNum;
+ private Integer totalNum = 0;
/**
* 坐标区域
*/
- private String areaMarks;
+ private String areaMarks = "";
/**
* 可以是网格的名称，可以是组织的名称
*/
- private String subName;
+ private String subName= "";
/**
* 组织：agency, 网格 ： grid；
*/
- private String type;
+ private String type = "";
}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java
index 432d81f2ed..b655f5fad5 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java
@@ -1,5 +1,6 @@
package com.epmet.screen.dto.result;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@@ -17,17 +18,28 @@ public class ParymemberResultDTO implements Serializable {
/**
* 当前所选组织
*/
- private String agencyId;
+ private String agencyId = "";
/**
* 当前所选组织名称
*/
- private String name;
+ private String name = "";
/**
* 当前所选组织的坐标区域
*/
- private String areaMarks;
+ private String areaMarks = "";
+
+ /**
+ * 机关级别
+ * 社区级：community，
+ * 乡（镇、街道）级:street,
+ * 区县级: district,
+ * 市级: city
+ * 省级:province
+ */
+ @JsonIgnore
+ private String level;
/**
* 子级用户分布
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java
index ea13de5f0c..102faca70d 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java
@@ -1,5 +1,6 @@
package com.epmet.screen.dto.result;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@@ -29,6 +30,17 @@ public class UserResultDTO implements Serializable {
*/
private String areaMarks;
+ /**
+ * 机关级别
+ * 社区级：community，
+ * 乡（镇、街道）级:street,
+ * 区县级: district,
+ * 市级: city
+ * 省级:province
+ */
+ @JsonIgnore
+ private String level;
+
/**
* 子级用户分布
*/
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
index c37a2ad225..d4bbc8f160 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
@@ -1,5 +1,7 @@
package com.epmet.datareport.controller.screen;
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
@@ -35,9 +37,10 @@ public class AgencyController {
* @author zxc
* @date 2020/8/18 2:04 下午
*/
+ @ExternalAppRequestAuth
@PostMapping("tree")
- public Result tree(){
- return new Result().ok(agencyService.tree());
+ public Result tree(ExternalAppRequestParam externalAppRequestParam){
+ return new Result().ok(agencyService.tree(externalAppRequestParam));
}
/**
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
index c9b946f620..a85fe05054 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
@@ -15,6 +15,8 @@ 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;
+
/**
* 中央区相关各指标查询
*
@@ -35,9 +37,9 @@ public class DistributionController {
* @date 2020/8/18 10:59 上午
*/
@PostMapping("branch")
- public Result branch(@RequestBody BranchFormDTO formDTO){
+ public Result> branch(@RequestBody BranchFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, BranchFormDTO.Branch.class);
- return new Result().ok(distributionService.branch(formDTO));
+ return new Result>().ok(distributionService.branch(formDTO));
}
/**
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java
index dc08b40c34..c97ac8b8e0 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java
@@ -17,9 +17,7 @@
package com.epmet.datareport.dao.screen;
-import com.epmet.screen.dto.result.AgencyDistributionResultDTO;
-import com.epmet.screen.dto.result.CompartmentResultDTO;
-import com.epmet.screen.dto.result.TreeResultDTO;
+import com.epmet.screen.dto.result.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -66,4 +64,20 @@ public interface ScreenCustomerAgencyDao {
*/
List selectSubDistribution(@Param("agencyId")String agencyId);
+ /**
+ * @Description 查询子级用户分布【机关级别】
+ * @param parentId
+ * @author zxc
+ * @date 2020/8/19 9:33 上午
+ */
+ List selectUserDistributionAgency(@Param("parentId")String parentId);
+
+ /**
+ * @Description 查询子级党员分布【机关级别】
+ * @param parentId
+ * @author zxc
+ * @date 2020/8/19 10:30 上午
+ */
+ List selectParymemberDistribution(@Param("parentId")String parentId);
+
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java
index 5f33641d71..9dff41e9ff 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java
@@ -18,6 +18,9 @@
package com.epmet.datareport.dao.screen;
import com.epmet.screen.dto.result.AgencyDistributionResultDTO;
+import com.epmet.screen.dto.result.BranchResultDTO;
+import com.epmet.screen.dto.result.ParymemberDistributionResultDTO;
+import com.epmet.screen.dto.result.UserDistributionResultDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -39,5 +42,29 @@ public interface ScreenCustomerGridDao {
* @date 2020/8/18 5:12 下午
*/
List selectSubDistribution(@Param("agencyId")String agencyId);
+
+ /**
+ * @Description 查询党支部信息
+ * @param agencyId
+ * @author zxc
+ * @date 2020/8/19 9:13 上午
+ */
+ List selectBranch(@Param("agencyId")String agencyId);
+
+ /**
+ * @Description 查询子级用户分布【网格级别】
+ * @param parentId
+ * @author zxc
+ * @date 2020/8/19 9:33 上午
+ */
+ List selectUserDistribution(@Param("parentId")String parentId);
+
+ /**
+ * @Description 查询子级党员分布【网格级别】
+ * @param parentId
+ * @author zxc
+ * @date 2020/8/19 10:30 上午
+ */
+ List selectParymemberDistribution(@Param("parentId")String parentId);
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java
index 5b7a48177a..d3eee4f133 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java
@@ -1,5 +1,6 @@
package com.epmet.datareport.service.screen;
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.screen.dto.form.CompartmentFormDTO;
import com.epmet.screen.dto.result.CompartmentResultDTO;
@@ -21,7 +22,7 @@ public interface AgencyService {
* @author zxc
* @date 2020/8/18 2:04 下午
*/
- TreeResultDTO tree();
+ TreeResultDTO tree(ExternalAppRequestParam externalAppRequestParam);
/**
* @Description 2、组织区域查询
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
index c98ad3b6c0..02471cdf22 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
@@ -7,6 +7,8 @@ import com.epmet.screen.dto.result.BranchResultDTO;
import com.epmet.screen.dto.result.ParymemberResultDTO;
import com.epmet.screen.dto.result.UserResultDTO;
+import java.util.List;
+
/**
* 中央区相关各指标查询
*
@@ -21,7 +23,7 @@ public interface DistributionService {
* @author zxc
* @date 2020/8/18 10:59 上午
*/
- BranchResultDTO branch(BranchFormDTO formDTO);
+ List branch(BranchFormDTO formDTO);
/**
* @Description 2、用户分布
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
index 65682d4441..3512ed5324 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
@@ -1,5 +1,6 @@
package com.epmet.datareport.service.screen.impl;
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
import com.epmet.datareport.dao.screen.ScreenCustomerGridDao;
@@ -35,10 +36,9 @@ public class AgencyServiceImpl implements AgencyService {
* @date 2020/8/18 2:04 下午
*/
@Override
- public TreeResultDTO tree() {
+ public TreeResultDTO tree(ExternalAppRequestParam externalAppRequestParam) {
// 1. 查询客户根组织ID
- // TODO 改成正式注解获取customerId
- String customerId = "zxc";
+ String customerId = externalAppRequestParam.getCustomerId();
TreeResultDTO rootAgency = screenCustomerAgencyDao.selectRootAgencyId(customerId);
if (null == rootAgency){
return new TreeResultDTO();
@@ -74,6 +74,9 @@ public class AgencyServiceImpl implements AgencyService {
@Override
public CompartmentResultDTO compartment(CompartmentFormDTO compartmentFormDTO) {
CompartmentResultDTO agencyAreaInfo = screenCustomerAgencyDao.getAgencyAreaInfo(compartmentFormDTO.getAgencyId());
+ if (null == agencyAreaInfo){
+ return agencyAreaInfo;
+ }
if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){
// 当level为"community"时，查询screen_customer_grid表
List agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId());
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
index c83c82aff7..1c6356d550 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
@@ -1,14 +1,19 @@
package com.epmet.datareport.service.screen.impl;
+import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
+import com.epmet.datareport.dao.screen.ScreenCustomerGridDao;
import com.epmet.screen.dto.form.BranchFormDTO;
import com.epmet.screen.dto.form.ParymemberFormDTO;
import com.epmet.screen.dto.form.UserFormDTO;
-import com.epmet.screen.dto.result.BranchResultDTO;
-import com.epmet.screen.dto.result.ParymemberResultDTO;
-import com.epmet.screen.dto.result.UserResultDTO;
+import com.epmet.screen.dto.result.*;
+import com.epmet.screen.constant.*;
import com.epmet.datareport.service.screen.DistributionService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* 中央区相关各指标查询
*
@@ -18,6 +23,11 @@ import org.springframework.stereotype.Service;
@Service
public class DistributionServiceImpl implements DistributionService {
+ @Autowired
+ private ScreenCustomerGridDao screenCustomerGridDao;
+ @Autowired
+ private ScreenCustomerAgencyDao screenCustomerAgencyDao;
+
/**
* @Description 1、党支部
* @param formDTO
@@ -25,8 +35,9 @@ public class DistributionServiceImpl implements DistributionService {
* @date 2020/8/18 10:59 上午
*/
@Override
- public BranchResultDTO branch(BranchFormDTO formDTO) {
- return null;
+ public List branch(BranchFormDTO formDTO) {
+ List branchResultDTOS = screenCustomerGridDao.selectBranch(formDTO.getAgencyId());
+ return branchResultDTOS;
}
/**
@@ -37,7 +48,20 @@ public class DistributionServiceImpl implements DistributionService {
*/
@Override
public UserResultDTO user(UserFormDTO userFormDTO) {
- return null;
+ UserResultDTO userResult = new UserResultDTO();
+ CompartmentResultDTO agencyAreaInfo = screenCustomerAgencyDao.getAgencyAreaInfo(userFormDTO.getAgencyId());
+ if (null == agencyAreaInfo){
+ return userResult;
+ }
+ BeanUtils.copyProperties(agencyAreaInfo,userResult);
+ if (userResult.getLevel().equals(ScreenConstant.COMMUNITY)){
+ List userDistributionResultDTOS = screenCustomerGridDao.selectUserDistribution(userFormDTO.getAgencyId());
+ userResult.setUserDistribution(userDistributionResultDTOS);
+ }else {
+ List userDistributionResultDTOS = screenCustomerAgencyDao.selectUserDistributionAgency(userFormDTO.getAgencyId());
+ userResult.setUserDistribution(userDistributionResultDTOS);
+ }
+ return userResult;
}
/**
@@ -48,6 +72,19 @@ public class DistributionServiceImpl implements DistributionService {
*/
@Override
public ParymemberResultDTO parymember(ParymemberFormDTO parymemberFormDTO) {
- return null;
+ ParymemberResultDTO parymemberResult = new ParymemberResultDTO();
+ CompartmentResultDTO agencyAreaInfo = screenCustomerAgencyDao.getAgencyAreaInfo(parymemberFormDTO.getAgencyId());
+ if (null == agencyAreaInfo){
+ return parymemberResult;
+ }
+ BeanUtils.copyProperties(agencyAreaInfo,parymemberResult);
+ if (parymemberResult.getLevel().equals(ScreenConstant.COMMUNITY)){
+ List parymemberDistributionResultDTOS = screenCustomerGridDao.selectParymemberDistribution(parymemberFormDTO.getAgencyId());
+ parymemberResult.setUserDistribution(parymemberDistributionResultDTOS);
+ }else {
+ List parymemberDistributionResultDTOS = screenCustomerAgencyDao.selectParymemberDistribution(parymemberFormDTO.getAgencyId());
+ parymemberResult.setUserDistribution(parymemberDistributionResultDTOS);
+ }
+ return parymemberResult;
}
}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index b92fc4e8c6..cfdb8da6de 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -61,4 +61,40 @@
AND pid = #{agencyId}
+
+
+ SELECT
+ sutd.org_id AS subId,
+ sca.center_mark AS centerMark,
+ sutd.user_total AS totalNum,
+ sca.area_marks AS areaMarks,
+ sca.agency_name AS subName,
+ sutd.org_type AS type
+ FROM
+ screen_user_total_data sutd
+ LEFT JOIN screen_customer_agency sca ON sca.agency_id = sutd.org_id
+ WHERE
+ sutd.del_flag = '0'
+ AND sca.del_flag = 0
+ AND sutd.parent_id = #{parentId}
+
+
+
+
+ SELECT
+ sutd.org_id AS subId,
+ sca.center_mark AS centerMark,
+ sutd.party_total AS totalNum,
+ sca.area_marks AS areaMarks,
+ sca.agency_name AS subName,
+ sutd.org_type AS type
+ FROM
+ screen_user_total_data sutd
+ LEFT JOIN screen_customer_agency sca ON sca.agency_id = sutd.org_id
+ WHERE
+ sutd.del_flag = '0'
+ AND sca.del_flag = 0
+ AND sutd.parent_id = #{parentId}
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
index df1a2fbe44..988e0b17cd 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@@ -17,4 +17,53 @@
del_flag = 0
AND parent_agency_id = #{agencyId}
+
+
+
+ SELECT
+ grid_id AS gridId,
+ grid_name AS gridName,
+ party_mark AS partyMark
+ FROM
+ screen_customer_grid
+ WHERE
+ del_flag = 0
+ AND parent_agency_id = #{agencyId}
+
+
+
+
+ SELECT
+ sutd.org_id AS subId,
+ scg.center_mark AS centerMark,
+ sutd.user_total AS totalNum,
+ scg.area_marks AS areaMarks,
+ scg.grid_name AS subName,
+ sutd.org_type AS type
+ FROM
+ screen_user_total_data sutd
+ LEFT JOIN screen_customer_grid scg ON scg.grid_id = sutd.org_id
+ WHERE
+ sutd.del_flag = '0'
+ AND scg.del_flag = 0
+ AND sutd.parent_id = #{parentId}
+
+
+
+
+ SELECT
+ sutd.org_id AS subId,
+ scg.center_mark AS centerMark,
+ sutd.party_total AS totalNum,
+ scg.area_marks AS areaMarks,
+ scg.grid_name AS subName,
+ sutd.org_type AS type
+ FROM
+ screen_user_total_data sutd
+ LEFT JOIN screen_customer_grid scg ON scg.grid_id = sutd.org_id
+ WHERE
+ sutd.del_flag = '0'
+ AND scg.del_flag = 0
+ AND sutd.parent_id = #{parentId}
+
\ No newline at end of file
From 38fdaefefbfb7fdfc0609db817978082d92f50b9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Aug 2020 11:39:38 +0800
Subject: [PATCH 015/127] =?UTF-8?q?=E4=BF=AE=E6=94=B9screen=5Fparty=5Fbran?=
=?UTF-8?q?ch=5Fdata=E8=A1=A8=EF=BC=8C=E6=96=B0=E5=A2=9EaverageJoinUserCou?=
=?UTF-8?q?nt=EF=BC=8C=E4=BF=AE=E6=94=B9meetCategoryId=EF=BC=88issueCatego?=
=?UTF-8?q?ryId=EF=BC=89,meetCategoryName(issueCategoryName)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../screen/ScreenPartyBranchDataEntity.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
index 95420d51a7..cdd5c6ef0e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
@@ -26,7 +26,7 @@ import lombok.EqualsAndHashCode;
import java.util.Date;
/**
- * 基层党建-建设情况数据（支部，联建）
+ * 基层党建-建设情况数据（支部，联建,志愿服务）
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-18
@@ -79,14 +79,14 @@ public class ScreenPartyBranchDataEntity extends BaseEpmetEntity {
private String orgName;
/**
- * 议题分类Id
+ * 会议分类Id
*/
- private String issueCategoryId;
+ private String meetCategoryId;
/**
- * 议题分类名称
+ * 会议分类名称
*/
- private String issueCategoryName;
+ private String meetCategoryName;
/**
* 组织次数
@@ -98,4 +98,9 @@ public class ScreenPartyBranchDataEntity extends BaseEpmetEntity {
*/
private Integer joinUserCount;
+ /**
+ * 平均参加人数
+ */
+ private Integer averageJoinUserCount;
+
}
From a1178dfd517474bf241bdd300f60a93cdd75ec73 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Aug 2020 12:40:34 +0800
Subject: [PATCH 016/127] =?UTF-8?q?=E4=BF=AE=E6=94=B9screen=5Fuser=5Fjoin?=
=?UTF-8?q?=E8=A1=A8=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ScreenVoluntaryActivityDataDao.java | 31 --------------
.../screen/ScreenVoluntaryActivityDataDao.xml | 8 ----
.../screen/ScreenPartyBranchDataEntity.java | 2 +-
.../entity/screen/ScreenUserJoinEntity.java | 40 +++++++++----------
4 files changed, 19 insertions(+), 62 deletions(-)
delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenVoluntaryActivityDataDao.java
delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenVoluntaryActivityDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenVoluntaryActivityDataDao.java
deleted file mode 100644
index b4433d9b1d..0000000000
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenVoluntaryActivityDataDao.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see
-
-
-
-
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
index cdd5c6ef0e..8717291a31 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
@@ -54,7 +54,7 @@ public class ScreenPartyBranchDataEntity extends BaseEpmetEntity {
private String monthId;
/**
- * 数据类别 party:支部建设;union:联合建设
+ * 数据类别 party:支部建设;union:联合建设党员志愿服务：voluntaryservice
*/
private String type;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java
index 4da0ff5d4b..d7ff0d4860 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java
@@ -44,6 +44,16 @@ public class ScreenUserJoinEntity extends BaseEpmetEntity {
*/
private String customerId;
+ /**
+ * 年Id
+ */
+ private String yearId;
+
+ /**
+ * 月份Id
+ */
+ private String monthId;
+
/**
* 组织类别 agency：组织；部门：department；网格：grid
*/
@@ -65,33 +75,19 @@ public class ScreenUserJoinEntity extends BaseEpmetEntity {
private String orgName;
/**
- * 总的参与次数
- */
- private Integer joinTotal;
-
- /**
- * 总的参与次数较上月增长率
- */
- private BigDecimal joinTotalUpRate;
-
- /**
- * 人均议题
+ * 组织次数
*/
- private Integer avgIssue;
+ private Integer organizeTotal;
- /**
- * 人均议题较上月增长率
- */
- private BigDecimal avgIssueUpRate;
+ /**
+ * 参与次数
+ */
+ private Integer joinTotal;
/**
- * 平均参与度
+ * 平均参与人数
*/
- private Integer avgJoin;
+ private Integer avgJoinUser;
- /**
- * 平均参与度较上月增长率
- */
- private BigDecimal agvgJoinUpRate;
}
From 29f6b0e24e516a4dcb4ad35491aa3eaeb0f409dc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Aug 2020 13:29:20 +0800
Subject: [PATCH 017/127] =?UTF-8?q?=E4=BF=AE=E6=94=B9partyuserrankdata?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dto/screencoll/form/PartyUserRankDataFormDTO.java | 5 -----
.../data-statistical/data-statistical-server/pom.xml | 6 ++++++
.../java/com/epmet/controller/ScreenCollController.java | 8 ++++++--
.../com/epmet/dao/screen/ScreenPartyUserRankDataDao.java | 2 +-
.../java/com/epmet/service/screen/ScreenCollService.java | 2 +-
.../epmet/service/screen/impl/ScreenCollServiceImpl.java | 7 +++----
.../mapper/screen/ScreenPartyUserRankDataDao.xml | 4 ++--
7 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
index 6267736f51..b4e3884dae 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
@@ -14,11 +14,6 @@ public class PartyUserRankDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 年Id ：yyyy
*/
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index 0dfdd97d91..cf116c4fb7 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -68,6 +68,12 @@
2.0.0
compile
+
+ com.epmet
+ epmet-commons-extapp-auth
+ 2.0.0
+ compile
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
index 0052006dff..248bf39931 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
@@ -1,5 +1,7 @@
package com.epmet.controller;
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.screencoll.form.*;
import com.epmet.service.screen.ScreenCollService;
@@ -32,9 +34,11 @@ public class ScreenCollController {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("partyuserrankdata")
- public Result partyUserRankData(@RequestBody List formDTO) {
- return screenCollService.insertPartyUserRankData(formDTO);
+ public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam,@RequestBody List formDTO) {
+ screenCollService.insertPartyUserRankData(formDTO,externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
index c0ab9db8c1..de25a82b88 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
@@ -58,5 +58,5 @@ public interface ScreenPartyUserRankDataDao extends BaseDao list);
+ void batchInsertPartyUserRankData(@Param("list") List list,@Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
index 1c6c212588..dfd49c1e5c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
@@ -17,7 +17,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertPartyUserRankData(List formDTO);
+ void insertPartyUserRankData(List formDTO,String customerId);
/**
* 8、党建引领-党员联系群众数据
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
index 922de2f876..00dbd2a516 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
@@ -75,20 +75,19 @@ public class ScreenCollServiceImpl implements ScreenCollService {
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertPartyUserRankData(List formDTO) {
+ public void insertPartyUserRankData(List formDTO,String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
- screenPartyUserRankDataDao.deletePartyUserRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ screenPartyUserRankDataDao.deletePartyUserRankData(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
- screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO);
+ screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO,customerId);
}
- return new Result();
}
@Override
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 74e3377d18..1de992bd4d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_party_user_rank_data
(
ID,
@@ -37,7 +37,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},
From 79bf69cfb859485b3b9454656c42e071d5c8c86d Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 19 Aug 2020 13:37:44 +0800
Subject: [PATCH 018/127] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=BC=95=E9=A2=86-?=
=?UTF-8?q?=E5=BF=97=E6=84=BF=E6=B4=BB=E5=8A=A8=E6=9C=8D=E5=8A=A1=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=20=E6=8E=A5=E5=8F=A3=E5=88=A0=E9=99=A4=EF=BC=88?=
=?UTF-8?q?=E8=A1=A8=E5=BA=9F=E5=BC=83=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../form/VoluntaryActivityDataFormDTO.java | 61 -------------
.../controller/ScreenCollController.java | 13 ---
.../ScreenVoluntaryActivityDataDao.java | 62 -------------
.../ScreenVoluntaryActivityDataEntity.java | 86 -------------------
.../service/screen/ScreenCollService.java | 12 ---
.../screen/impl/ScreenCollServiceImpl.java | 20 -----
.../screen/ScreenVoluntaryActivityDataDao.xml | 57 ------------
7 files changed, 311 deletions(-)
delete mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java
delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenVoluntaryActivityDataEntity.java
delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java
deleted file mode 100644
index 6746a60303..0000000000
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.epmet.dto.screencoll.form;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 13、党建引领-志愿活动服务数据 入参
- * @Auther: zhangyong
- * @Date: 2020-08-18 09:59
- */
-@Data
-public class VoluntaryActivityDataFormDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 客户id
- */
- private String customerId;
-
- /**
- * yyyy
- */
- private String yearId;
-
- /**
- * yyyyMM
- */
- private String monthId;
-
- /**
- * 组织类别 agency：组织；部门：department；网格：grid
- */
- private String orgType;
-
- /**
- * 组织Id 可以为网格，机关id
- */
- private String orgId;
-
- /**
- * 上级组织Id
- */
- private String parentId;
-
- /**
- * 组织名称
- */
- private String orgName;
-
- /**
- * 组织活动次数
- */
- private Integer activetyCount;
-
- /**
- * 活动参与人数
- */
- private Integer joinUserCount;
-}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
index 248bf39931..78230dd581 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
@@ -186,19 +186,6 @@ public class ScreenCollController {
return screenCollService.insertCustomerAgency(formDTO);
}
- /**
- * 13、党建引领-志愿活动服务数据
- *
- * @param formDTO
- * @return com.epmet.commons.tools.utils.Result
- * @Author zhangyong
- * @Date 10:52 2020-08-18
- **/
- @PostMapping("voluntaryactivitydata")
- public Result voluntaryActivityData(@RequestBody List formDTO) {
- return screenCollService.insertVoluntaryActivityData(formDTO);
- }
-
/**
* 12、中央区各类总数
*
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
deleted file mode 100644
index 13357e03c2..0000000000
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see {
-
- /**
- * 13、党建引领-志愿活动服务数据
- * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
- *
- * @param customerId
- * @param yearId
- * @param monthId
- * @param orgIds 组织Id集合
- * @Author zhangyong
- * @Date 10:52 2020-08-18
- **/
- void deleteVoluntaryActivityData(@Param("customerId") String customerId,
- @Param("yearId") String yearId,
- @Param("monthId") String monthId,
- @Param("orgIds") String[] orgIds);
-
- /**
- * 13、党建引领-志愿活动服务数据
- * 2) 在批量新增
- *
- * @param list
- * @Author zhangyong
- * @Date 10:52 2020-08-18
- **/
- void batchInsertVoluntaryActivityData(@Param("list") List list);
-}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenVoluntaryActivityDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenVoluntaryActivityDataEntity.java
deleted file mode 100644
index cd11e5b43a..0000000000
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenVoluntaryActivityDataEntity.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see formDTO);
- /**
- * 13、党建引领-志愿活动服务数据
- * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
- * 2) 在新增
- *
- * @param formDTO
- * @return com.epmet.commons.tools.utils.Result
- * @Author zhangyong
- * @Date 10:52 2020-08-18
- **/
- Result insertVoluntaryActivityData(List formDTO);
-
/**
* 12、中央区各类总数
* 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
index 00dbd2a516..339fa96305 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
@@ -65,8 +65,6 @@ public class ScreenCollServiceImpl implements ScreenCollService {
@Autowired
private ScreenCustomerAgencyDao screenCustomerAgencyDao;
@Autowired
- private ScreenVoluntaryActivityDataDao screenVoluntaryActivityDataDao;
- @Autowired
private ScreenUserTotalDataDao screenUserTotalDataDao;
@Autowired
private ScreenUserJoinDao screenUserJoinDao;
@@ -277,24 +275,6 @@ public class ScreenCollServiceImpl implements ScreenCollService {
return new Result();
}
- @Override
- @Transactional(rollbackFor = Exception.class)
- public Result insertVoluntaryActivityData(List formDTO) {
- if (null != formDTO && formDTO.size() > NumConstant.ZERO){
- String[] orgIds = new String[formDTO.size()];
- for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
- orgIds[i] = formDTO.get(i).getOrgId();
- }
- screenVoluntaryActivityDataDao.deleteVoluntaryActivityData(formDTO.get(NumConstant.ZERO).getCustomerId(),
- formDTO.get(NumConstant.ZERO).getYearId(),
- formDTO.get(NumConstant.ZERO).getMonthId(),
- orgIds);
-
- screenVoluntaryActivityDataDao.batchInsertVoluntaryActivityData(formDTO);
- }
- return new Result();
- }
-
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertUserTotalData(List formDTO) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
deleted file mode 100644
index dc2c2585a6..0000000000
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
- delete from screen_voluntary_activity_data
- where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
- AND ORG_ID IN
-
- #{item}
-
-
-
-
- insert into screen_voluntary_activity_data
- (
- ID,
- CUSTOMER_ID,
- YEAR_ID,
- MONTH_ID,
- ORG_TYPE,
- ORG_ID,
- PARENT_ID,
- ORG_NAME,
- ACTIVETY_COUNT,
- JOIN_USER_COUNT,
- DEL_FLAG,
- REVISION,
- CREATED_BY,
- CREATED_TIME,
- UPDATED_BY,
- UPDATED_TIME
- ) values
-
- (
- (SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
- #{item.yearId},
- #{item.monthId},
- #{item.orgType},
- #{item.orgId},
- #{item.parentId},
- #{item.orgName},
- #{item.activetyCount},
- #{item.joinUserCount},
- 0,
- 0,
- 'APP_USER',
- now(),
- 'APP_USER',
- now()
- )
-
-
-
-
From 8f8df6abb84e2b82667da37c7c9a8b9bc56282ae Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Aug 2020 13:38:55 +0800
Subject: [PATCH 019/127] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/epmet/entity/screen/ScreenEventDataEntity.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
index 15f6503950..2dd7603939 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
@@ -95,7 +95,7 @@ public class ScreenEventDataEntity extends BaseEpmetEntity {
private String eventImgUrl;
/**
- * 事件待处理级别 red:红；yellow：黄
+ * 事件待处理级别 red:红；yellow：黄；绿色：green
*/
private String eventLevel;
From 3b6b6ccdc038c2b4b8ae8c7964d09d291fa53662 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Aug 2020 13:51:20 +0800
Subject: [PATCH 020/127] =?UTF-8?q?=E4=BF=AE=E6=94=B9screen=5Fevent=5Fdata?=
=?UTF-8?q?=E8=A1=A8=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epmet/entity/screen/ScreenDifficultyDataEntity.java | 2 +-
.../com/epmet/entity/screen/ScreenEventDataEntity.java | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
index fa3b352711..76af0410c0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
@@ -104,7 +104,7 @@ public class ScreenDifficultyDataEntity extends BaseEpmetEntity {
private String eventCategoryName;
/**
- * 事件状态编码
+ * 事件状态key
*/
private String eventStatusCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
index 2dd7603939..9e605802f3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
@@ -124,4 +124,13 @@ public class ScreenEventDataEntity extends BaseEpmetEntity {
*/
private Date lastProcessDate;
+ /**
+ * 事件状态key
+ */
+ private String eventStatusCode;
+
+ /**
+ * 事件状态描述
+ */
+ private String eventStatusDesc;
}
From d8dbc5201692b9bdc107682ca05afdd0e371cc3d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 19 Aug 2020 14:36:52 +0800
Subject: [PATCH 021/127] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E3=80=81=E5=85=9A?=
=?UTF-8?q?=E5=91=98=E5=88=86=E5=B8=83=E3=80=81top=E5=8C=BA=E6=A6=82?=
=?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epmet/screen/dto/form/ProjectFormDTO.java | 24 ++++++++++
.../screen/dto/form/TopProfileFormDTO.java | 24 ++++++++++
.../screen/dto/result/BranchResultDTO.java | 6 +--
.../screen/dto/result/ProjectResultDTO.java | 45 +++++++++++++++++++
.../dto/result/TopProfileResultDTO.java | 45 +++++++++++++++++++
.../controller/screen/AgencyController.java | 1 +
.../screen/DistributionController.java | 38 +++++++++++++---
.../dao/screen/ScreenEventDataDao.java | 14 +++++-
.../dao/screen/ScreenUserTotalDataDao.java | 9 ++++
.../service/screen/DistributionService.java | 24 +++++++---
.../screen/impl/DistributionServiceImpl.java | 42 +++++++++++++++--
.../mapper/screen/ScreenEventDataDao.xml | 17 ++++++-
.../mapper/screen/ScreenUserTotalDataDao.xml | 17 +++++++
13 files changed, 285 insertions(+), 21 deletions(-)
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java
new file mode 100644
index 0000000000..445cefc453
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 1:25 下午
+ */
+@Data
+public class ProjectFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 7114390205886348751L;
+
+ public interface Project{}
+
+ /**
+ * 机关ID
+ */
+ @NotBlank(message = "机关ID不能为空",groups = {Project.class})
+ private String agencyId;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java
new file mode 100644
index 0000000000..6b0d00dae1
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 1:43 下午
+ */
+@Data
+public class TopProfileFormDTO implements Serializable {
+
+ private static final long serialVersionUID = -287352242311433250L;
+
+ public interface TopProfile{}
+
+ /**
+ * 机关ID
+ */
+ @NotBlank(message = "机关ID不能为空",groups = {TopProfile.class})
+ private String agencyId;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
index 0a836a6bfd..f4a611cc10 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
@@ -16,15 +16,15 @@ public class BranchResultDTO implements Serializable {
/**
* 网格ID
*/
- private String gridId;
+ private String gridId = "";
/**
* 网格名称
*/
- private String gridName;
+ private String gridName = "";
/**
* 党支部(网格)位置
*/
- private String partyMark;
+ private String partyMark = "";
}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java
new file mode 100644
index 0000000000..7a0a016b25
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java
@@ -0,0 +1,45 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 1:27 下午
+ */
+@Data
+public class ProjectResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 7130615407473171093L;
+
+ /**
+ * 项目标题
+ */
+ private String projectTitle = "";
+
+ /**
+ * red, green,yellow
+ */
+ private String color = "";
+
+ /**
+ * 项目id
+ */
+ private String projectId = "";
+
+ /**
+ * 网格名称
+ */
+ private String orgName = "";
+
+ /**
+ * 经度
+ */
+ private Double longitude = 0.0;
+
+ /**
+ * 纬度
+ */
+ private Double latitude = 0.0;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java
new file mode 100644
index 0000000000..607891f5bf
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java
@@ -0,0 +1,45 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 1:46 下午
+ */
+@Data
+public class TopProfileResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -5081563117620857359L;
+
+ /**
+ * 用户总数
+ */
+ private Integer userNum = 0;
+
+ /**
+ * 党员总数
+ */
+ private Integer partyMemberNum = 0;
+
+ /**
+ * 党群总数
+ */
+ private Integer groupNum = 0;
+
+ /**
+ * 话题总数
+ */
+ private Integer topicNum = 0;
+
+ /**
+ * 议题总数
+ */
+ private Integer issueNum = 0;
+
+ /**
+ * 项目总数
+ */
+ private Integer projectNum = 0;
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
index d4bbc8f160..d671c4cd05 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
@@ -49,6 +49,7 @@ public class AgencyController {
* @author zxc
* @date 2020/8/18 2:33 下午
*/
+ @ExternalAppRequestAuth
@PostMapping("compartment")
public Result compartment(@RequestBody CompartmentFormDTO compartmentFormDTO){
ValidatorUtils.validateEntity(compartmentFormDTO, CompartmentFormDTO.Compartment.class);
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
index a85fe05054..648d1e088b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
@@ -1,13 +1,10 @@
package com.epmet.datareport.controller.screen;
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.screen.dto.form.BranchFormDTO;
-import com.epmet.screen.dto.form.ParymemberFormDTO;
-import com.epmet.screen.dto.form.UserFormDTO;
-import com.epmet.screen.dto.result.BranchResultDTO;
-import com.epmet.screen.dto.result.ParymemberResultDTO;
-import com.epmet.screen.dto.result.UserResultDTO;
+import com.epmet.screen.dto.form.*;
+import com.epmet.screen.dto.result.*;
import com.epmet.datareport.service.screen.DistributionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -36,6 +33,7 @@ public class DistributionController {
* @author zxc
* @date 2020/8/18 10:59 上午
*/
+ @ExternalAppRequestAuth
@PostMapping("branch")
public Result> branch(@RequestBody BranchFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, BranchFormDTO.Branch.class);
@@ -48,6 +46,7 @@ public class DistributionController {
* @author zxc
* @date 2020/8/18 11:10 上午
*/
+ @ExternalAppRequestAuth
@PostMapping("user")
public Result user(@RequestBody UserFormDTO userFormDTO){
ValidatorUtils.validateEntity(userFormDTO, UserFormDTO.User.class);
@@ -60,10 +59,37 @@ public class DistributionController {
* @author zxc
* @date 2020/8/18 11:20 上午
*/
+ @ExternalAppRequestAuth
@PostMapping("parymember")
public Result parymember(@RequestBody ParymemberFormDTO parymemberFormDTO){
ValidatorUtils.validateEntity(parymemberFormDTO, ParymemberFormDTO.Parymember.class);
return new Result().ok(distributionService.parymember(parymemberFormDTO));
}
+ /**
+ * @Description 4、事件
+ * @param projectFormDTO
+ * @author zxc
+ * @date 2020/8/19 1:29 下午
+ */
+// @ExternalAppRequestAuth
+ @PostMapping("project")
+ public Result> project(@RequestBody ProjectFormDTO projectFormDTO){
+ ValidatorUtils.validateEntity(projectFormDTO, ProjectFormDTO.Project.class);
+ return new Result>().ok(distributionService.project(projectFormDTO));
+ }
+
+ /**
+ * @Description 5、top区概况
+ * @param topProfileFormDTO
+ * @author zxc
+ * @date 2020/8/19 1:52 下午
+ */
+// @ExternalAppRequestAuth
+ @PostMapping("topprofile")
+ public Result topProfile(@RequestBody TopProfileFormDTO topProfileFormDTO){
+ ValidatorUtils.validateEntity(topProfileFormDTO, TopProfileFormDTO.TopProfile.class);
+ return new Result().ok(distributionService.topProfile(topProfileFormDTO));
+ }
+
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java
index 7ef0c0287b..362ada2193 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java
@@ -17,7 +17,11 @@
package com.epmet.datareport.dao.screen;
+import com.epmet.screen.dto.result.ProjectResultDTO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 中央区-事件数据
@@ -27,5 +31,13 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenEventDataDao{
-
+
+ /**
+ * @Description 查询事件
+ * @param parentId
+ * @author zxc
+ * @date 2020/8/19 2:09 下午
+ */
+ List selectEvent(@Param("parentId")String parentId);
+
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java
index 70477e48c6..46576c5517 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java
@@ -18,6 +18,7 @@
package com.epmet.datareport.dao.screen;
import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
+import com.epmet.screen.dto.result.TopProfileResultDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -39,4 +40,12 @@ public interface ScreenUserTotalDataDao {
**/
PartymemberPercentResultDTO selectAgencyPartymemberPercent(@Param("agencyId")String agencyId);
+ /**
+ * @Description 查询top区概况
+ * @param agencyId
+ * @author zxc
+ * @date 2020/8/19 2:13 下午
+ */
+ TopProfileResultDTO selectTopProfile(@Param("agencyId")String agencyId);
+
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
index 02471cdf22..62a0d0d7bf 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
@@ -1,11 +1,7 @@
package com.epmet.datareport.service.screen;
-import com.epmet.screen.dto.form.BranchFormDTO;
-import com.epmet.screen.dto.form.ParymemberFormDTO;
-import com.epmet.screen.dto.form.UserFormDTO;
-import com.epmet.screen.dto.result.BranchResultDTO;
-import com.epmet.screen.dto.result.ParymemberResultDTO;
-import com.epmet.screen.dto.result.UserResultDTO;
+import com.epmet.screen.dto.form.*;
+import com.epmet.screen.dto.result.*;
import java.util.List;
@@ -41,4 +37,20 @@ public interface DistributionService {
*/
ParymemberResultDTO parymember(ParymemberFormDTO parymemberFormDTO);
+ /**
+ * @Description 4、事件
+ * @param projectFormDTO
+ * @author zxc
+ * @date 2020/8/19 1:29 下午
+ */
+ List project(ProjectFormDTO projectFormDTO);
+
+ /**
+ * @Description 5、top区概况
+ * @param topProfileFormDTO
+ * @author zxc
+ * @date 2020/8/19 1:52 下午
+ */
+ TopProfileResultDTO topProfile(TopProfileFormDTO topProfileFormDTO);
+
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
index 1c6356d550..a1d9025ead 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
@@ -1,10 +1,11 @@
package com.epmet.datareport.service.screen.impl;
+import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
import com.epmet.datareport.dao.screen.ScreenCustomerGridDao;
-import com.epmet.screen.dto.form.BranchFormDTO;
-import com.epmet.screen.dto.form.ParymemberFormDTO;
-import com.epmet.screen.dto.form.UserFormDTO;
+import com.epmet.datareport.dao.screen.ScreenEventDataDao;
+import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao;
+import com.epmet.screen.dto.form.*;
import com.epmet.screen.dto.result.*;
import com.epmet.screen.constant.*;
import com.epmet.datareport.service.screen.DistributionService;
@@ -12,6 +13,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -27,6 +29,10 @@ public class DistributionServiceImpl implements DistributionService {
private ScreenCustomerGridDao screenCustomerGridDao;
@Autowired
private ScreenCustomerAgencyDao screenCustomerAgencyDao;
+ @Autowired
+ private ScreenEventDataDao screenEventDataDao;
+ @Autowired
+ private ScreenUserTotalDataDao screenUserTotalDataDao;
/**
* @Description 1、党支部
@@ -87,4 +93,34 @@ public class DistributionServiceImpl implements DistributionService {
}
return parymemberResult;
}
+
+ /**
+ * @Description 4、事件
+ * @param projectFormDTO
+ * @author zxc
+ * @date 2020/8/19 1:29 下午
+ */
+ @Override
+ public List project(ProjectFormDTO projectFormDTO) {
+ List projectResultDTOS = screenEventDataDao.selectEvent(projectFormDTO.getAgencyId());
+ if (projectResultDTOS.size() == NumConstant.ZERO){
+ return new ArrayList<>();
+ }
+ return projectResultDTOS;
+ }
+
+ /**
+ * @Description 5、top区概况
+ * @param topProfileFormDTO
+ * @author zxc
+ * @date 2020/8/19 1:52 下午
+ */
+ @Override
+ public TopProfileResultDTO topProfile(TopProfileFormDTO topProfileFormDTO) {
+ TopProfileResultDTO topProfileResultDTO = screenUserTotalDataDao.selectTopProfile(topProfileFormDTO.getAgencyId());
+ if (null == topProfileResultDTO){
+ return new TopProfileResultDTO();
+ }
+ return topProfileResultDTO;
+ }
}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
index 813b3f74a3..6cfafcf70a 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
@@ -3,6 +3,19 @@
-
-
+
+
+ SELECT
+ event_title AS projectTitle,
+ event_level AS color,
+ event_id AS projectId,
+ org_name AS orgName,
+ longitude AS longitude,
+ latitude AS latitude
+ FROM
+ screen_event_data
+ WHERE
+ del_flag = '0'
+ AND parent_id = #{parentId}
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
index 72c533126d..673ffee04a 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
@@ -16,4 +16,21 @@
AND ORG_ID = #{agencyId}
+
+
+ SELECT
+ user_total AS userNum,
+ party_total AS partyMemberNum,
+ group_total AS groupNum,
+ topic_total AS topicNum,
+ issue_total AS issueNum,
+ project_total AS projectNum
+ FROM
+ screen_user_total_data
+ WHERE
+ del_flag = '0'
+ AND org_type = 'agency'
+ AND org_id = #{agencyId}
+
+
\ No newline at end of file
From 322e86635ccbabdaf4bfa7df618d307725ee251c Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 19 Aug 2020 15:14:33 +0800
Subject: [PATCH 022/127] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E9=87=87=E9=9B=86=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4=EF=BC=8C?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dto/screencoll/form/EventDataFormDTO.java | 10 +++++++
.../form/PartyBranchDataFormDTO.java | 17 +++++++-----
.../dto/screencoll/form/UserJoinFormDTO.java | 26 +++++++------------
.../controller/ScreenCollController.java | 10 ++++---
.../dao/screen/ScreenPartyBranchDataDao.java | 4 +--
.../epmet/dao/screen/ScreenUserJoinDao.java | 8 ++++--
.../service/screen/ScreenCollService.java | 4 +--
.../screen/impl/ScreenCollServiceImpl.java | 2 ++
.../mapper/screen/ScreenEventDataDao.xml | 8 ++++--
.../screen/ScreenPartyBranchDataDao.xml | 10 ++++---
.../mapper/screen/ScreenUserJoinDao.xml | 20 +++++++-------
11 files changed, 70 insertions(+), 49 deletions(-)
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
index 1f56464806..81800701c8 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
@@ -106,4 +106,14 @@ public class EventDataFormDTO implements Serializable {
* 图片列表
*/
private List imgDataList;
+
+ /**
+ * 事件状态描述
+ */
+ private String eventStatusDesc;
+
+ /**
+ * 事件状态key
+ */
+ private String eventStatusCode;
}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java
index 956a1db6aa..f05bd7bc80 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java
@@ -5,7 +5,7 @@ import lombok.Data;
import java.io.Serializable;
/**
- * 7、基层党建-建设情况数据（支部、联建） 入参
+ * 7、基层党建-建设情况数据（支部、联建、志愿） 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@@ -30,7 +30,7 @@ public class PartyBranchDataFormDTO implements Serializable {
private String monthId;
/**
- * 数据类别 party:支部建设;union:联合建设
+ * 数据类别 party:支部建设;union:联合建设党员志愿服务：voluntaryservice
*/
private String type;
@@ -55,14 +55,14 @@ public class PartyBranchDataFormDTO implements Serializable {
private String orgName;
/**
- * 议题分类名称
+ * 会议分类名称
*/
- private String issueCategoryName;
+ private String meetCategoryName;
/**
- * 议题分类id
+ * 会议分类id
*/
- private String issueCategoryId;
+ private String meetCategoryId;
/**
* 组织次数
@@ -73,4 +73,9 @@ public class PartyBranchDataFormDTO implements Serializable {
* 参加人数
*/
private Integer joinUserCount;
+
+ /**
+ * 平均参加人数
+ */
+ private Integer averageJoinUserCount;
}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java
index 65b563795d..d474115972 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
-import java.math.BigDecimal;
/**
* 11、基层治理-公众参与 入参
@@ -41,32 +40,27 @@ public class UserJoinFormDTO implements Serializable {
private String orgName;
/**
- * 总的参与次数
+ * 组织次数
*/
- private Integer joinTotal;
+ private Integer organizeTotal;
/**
- * 总的参与次数较上月增长率
+ * 参与次数
*/
- private BigDecimal joinTotalUpRate;
-
- /**
- * 人均议题
- */
- private Integer avgIssue;
+ private Integer joinTotal;
/**
- * 人均议题较上月增长率
+ * 平均参与人数
*/
- private BigDecimal avgIssueUpRate;
+ private Integer avgJoinUser;
/**
- * 平均参与度
+ * 年Id ：yyyy
*/
- private Integer avgJoin;
+ private String yearId;
/**
- * 平均参与度较上月增长率
+ * 月份Id ：yyyyMM
*/
- private BigDecimal avgJoinUpRate;
+ private String monthId;
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
index 78230dd581..bb0e64b694 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
@@ -1,5 +1,7 @@
package com.epmet.controller;
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.utils.Result;
@@ -36,7 +38,7 @@ public class ScreenCollController {
**/
@ExternalAppRequestAuth
@PostMapping("partyuserrankdata")
- public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam,@RequestBody List formDTO) {
+ public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
screenCollService.insertPartyUserRankData(formDTO,externalAppRequestParam.getCustomerId());
return new Result();
}
@@ -55,15 +57,15 @@ public class ScreenCollController {
}
/**
- * 7、基层党建-建设情况数据（支部、联建）
+ * 7、基层党建-建设情况数据（支部、联建、志愿）
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- @PostMapping("partybranchdata")
- public Result partyBranchData(@RequestBody List formDTO) {
+ @PostMapping("meetdata")
+ public Result meetData(@RequestBody List formDTO) {
return screenCollService.insertPartyBranchData(formDTO);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
index 9dc6a142c1..00b9f0df8d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
@@ -34,7 +34,7 @@ import java.util.List;
@Mapper
public interface ScreenPartyBranchDataDao extends BaseDao {
/**
- * 7、基层党建-建设情况数据（支部、联建）
+ * 7、基层党建-建设情况数据（支部、联建、志愿）
* 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
*
* @param customerId
@@ -50,7 +50,7 @@ public interface ScreenPartyBranchDataDao extends BaseDao {
/**
* 11、基层治理-公众参与
- * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
*
* @param customerId
+ * @param yearId
+ * @param monthId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteUserJoin(@Param("customerId") String customerId,
- @Param("orgIds") String[] orgIds);
+ @Param("yearId") String yearId,
+ @Param("monthId") String monthId,
+ @Param("orgIds") String[] orgIds);
/**
* 11、基层治理-公众参与
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
index 7fbddb072f..dcb9268db3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
@@ -32,7 +32,7 @@ public interface ScreenCollService {
Result insertPartyLinkMassesData(List formDTO);
/**
- * 7、基层党建-建设情况数据（支部、联建）
+ * 7、基层党建-建设情况数据（支部、联建、志愿）
* 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
* 2) 在新增
*
@@ -165,7 +165,7 @@ public interface ScreenCollService {
/**
* 11、基层治理-公众参与
- * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
* 2) 在新增
*
* @param formDTO
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
index 339fa96305..14787a6762 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
@@ -300,6 +300,8 @@ public class ScreenCollServiceImpl implements ScreenCollService {
orgIds[i] = formDTO.get(i).getOrgId();
}
screenUserJoinDao.deleteUserJoin(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ formDTO.get(NumConstant.ZERO).getYearId(),
+ formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenUserJoinDao.batchInsertUserJoin(formDTO);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
index c861d869ed..a6cdd87a2e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
@@ -34,7 +34,9 @@
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
- UPDATED_TIME
+ UPDATED_TIME,
+ EVENT_STATUS_CODE,
+ EVENT_STATUS_DESC
) values
(
@@ -61,7 +63,9 @@
'APP_USER',
now(),
'APP_USER',
- now()
+ now(),
+ #{item.eventStatusCode},
+ #{item.eventStatusDesc}
)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
index c7cf37d027..05c5d92066 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
@@ -24,10 +24,11 @@
ORG_ID,
PARENT_ID,
ORG_NAME,
- ISSUE_CATEGORY_ID,
- ISSUE_CATEGORY_NAME,
+ MEET_CATEGORY_ID,
+ MEET_CATEGORY_NAME,
ORGANIZE_COUNT,
JOIN_USER_COUNT,
+ AVERAGE_JOIN_USER_COUNT,
DEL_FLAG,
REVISION,
CREATED_BY,
@@ -46,10 +47,11 @@
#{item.orgId},
#{item.parentId},
#{item.orgName},
- #{item.issueCategoryId},
- #{item.issueCategoryName},
+ #{item.meetCategoryId},
+ #{item.meetCategoryName},
#{item.organizeCount},
#{item.joinUserCount},
+ #{item.averageJoinUserCount},
0,
0,
'APP_USER',
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
index 3e5acce57a..b09c3e6690 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
@@ -5,7 +5,7 @@
delete from screen_user_join
- where CUSTOMER_ID = #{customerId}
+ where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
AND ORG_ID IN
#{item}
@@ -17,16 +17,15 @@
(
ID,
CUSTOMER_ID,
+ YEAR_ID,
+ MONTH_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
+ ORGANIZE_TOTAL,
JOIN_TOTAL,
- JOIN_TOTAL_UP_RATE,
- AVG_ISSUE,
- AVG_ISSUE_UP_RATE,
- AVG_JOIN,
- AGVG_JOIN_UP_RATE,
+ AVG_JOIN_USER,
DEL_FLAG,
REVISION,
CREATED_BY,
@@ -38,16 +37,15 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
+ #{item.yearId},
+ #{item.monthId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
+ #{item.organizeTotal},
#{item.joinTotal},
- #{item.joinTotalUpRate},
- #{item.avgIssue},
- #{item.avgIssueUpRate},
- #{item.avgJoin},
- #{item.avgJoinUpRate},
+ #{item.avgJoinUser},
0,
0,
'APP_USER',
From cd1748049e9fb465494bd98f34e0544f24d3f782 Mon Sep 17 00:00:00 2001
From: wangchao
Date: Wed, 19 Aug 2020 15:17:14 +0800
Subject: [PATCH 023/127] =?UTF-8?q?=E8=8E=B7=E5=8F=96X=E8=BD=B4,=E5=85=AC?=
=?UTF-8?q?=E5=85=B1=E6=96=B9=E6=B3=95=20=20=20getX()=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../commons/tools/constant/NumConstant.java | 2 +
.../dto/form/BranchBuildRankFormDTO.java | 33 +++
.../dto/form/BranchBuildTrendFormDTO.java | 39 ++++
.../dto/result/BranchBuildRankResultDTO.java | 18 ++
.../dto/result/BranchBuildTrendResultDTO.java | 31 +++
.../dto/result/BranchIssueDataResultDTO.java | 22 ++
.../BranchTrendSeriesDataResultDTO.java | 27 +++
.../PartymemberAgeDistributionResultDTO.java | 36 +++
.../PartymemberAgePercentResultDTO.java | 37 +++
.../screen/GrassrootsPartyDevController.java | 26 +++
.../dao/screen/ScreenCpcBaseDataDao.java | 15 +-
.../dao/screen/ScreenPartyBranchDataDao.java | 25 +-
.../screen/GrassrootsPartyDevService.java | 22 ++
.../impl/GrassrootsPartyDevServiceImpl.java | 215 +++++++++++++++++-
.../mapper/screen/ScreenCpcBaseDataDao.xml | 15 +-
.../screen/ScreenPartyBranchDataDao.xml | 33 +++
16 files changed, 592 insertions(+), 4 deletions(-)
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildRankFormDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildTrendFormDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildTrendResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchIssueDataResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchTrendSeriesDataResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgePercentResultDTO.java
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
index 92af86d3a9..0c7b46ef93 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
@@ -35,6 +35,8 @@ public interface NumConstant {
int ONE_HUNDRED = 100;
int ONE_THOUSAND = 1000;
int MAX = 99999999;
+ int EIGHTY_EIGHT = 88;
+
long ZERO_L = 0L;
long ONE_L = 1L;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildRankFormDTO.java
new file mode 100644
index 0000000000..169a24b29a
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildRankFormDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.screen.dto.form;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 4、支部建设情况|联建共建情况-排行 入参dto
+ * @NEI https://nei.netease.com/interface/detail/?pid=57068&id=321982
+ * @ClassName BranchBuildRankFormDTO
+ * @Auth wangc
+ * @Date 2020-08-19 15:06
+ */
+@Data
+public class BranchBuildRankFormDTO implements Serializable {
+ private static final long serialVersionUID = -6580433475773171870L;
+
+ /**
+ * 机关Id
+ * */
+ private String agencyId;
+
+ /**
+ * 支部建设情况：zbjs; 联建共建情况：ljgj;支部建设情况：zbjs; 联建共建情况：ljgj；联建党员志愿服务情况:ljdyzy
+ * */
+ private String category;
+
+ /**
+ * 默认显示前4，显示全部传入0
+ * */
+ private Integer topNum = NumConstant.FOUR;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildTrendFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildTrendFormDTO.java
new file mode 100644
index 0000000000..1d68458b20
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildTrendFormDTO.java
@@ -0,0 +1,39 @@
+package com.epmet.screen.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 3、支部建设情况|联建共建情况-折线图 入参DTO
+ * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321981
+ * @ClassName BranchBuildTrendFormDTO
+ * @Auth wangc
+ * @Date 2020-08-19 10:01
+ */
+@Data
+public class BranchBuildTrendFormDTO implements Serializable {
+ private static final long serialVersionUID = 2998463730542699247L;
+
+ public interface branchBuildTrendGroup extends CustomerClientShowGroup{}
+
+ /**
+ * 机关Id
+ * */
+ @NotBlank(message = "agencyId不可为空" , groups = branchBuildTrendGroup.class)
+ private String agencyId;
+
+ /**
+ * 组织次数：organize； 参加人数：joinuser; 平均参加人数：averagejoinuser
+ * */
+ @NotBlank(message = "基层党建折线图类型不可为空" , groups = branchBuildTrendGroup.class)
+ private String type;
+
+ /**
+ * 支部建设情况：zbjs; 联建共建情况：ljgj
+ * */
+ @NotBlank(message = "基层党建情况不可为空" , groups = branchBuildTrendGroup.class)
+ private String category;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java
new file mode 100644
index 0000000000..9b1584e276
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 4、支部建设情况|联建共建情况-排行 返参dto
+ * @NEI https://nei.netease.com/interface/detail/?pid=57068&id=321982
+ * @Auth wangc
+ * @Date 2020-08-19 15:09
+ */
+@Data
+public class BranchBuildRankResultDTO implements Serializable {
+ private static final long serialVersionUID = 6213072175254509349L;
+
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildTrendResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildTrendResultDTO.java
new file mode 100644
index 0000000000..58a277322f
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildTrendResultDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 3、支部建设情况|联建共建情况-折线图 返参DTO
+ * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321981
+ * @ClassName BranchBuildTrendResultDTO
+ * @Auth wangc
+ * @Date 2020-08-19 10:06
+ */
+@Data
+public class BranchBuildTrendResultDTO implements Serializable {
+ private static final long serialVersionUID = 2453727230656371207L;
+
+ /**
+ * 分类数组 ["三会党课","主体党日","三述专题","志愿服务","党内关怀"]
+ * */
+ private List legend;
+
+ /**
+ * 横坐标，近12个月的结合 ["8月","9月"]
+ * */
+ private List xAxis;
+
+ private List seriesData;
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchIssueDataResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchIssueDataResultDTO.java
new file mode 100644
index 0000000000..65a6888047
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchIssueDataResultDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName BranchIssueDataResultDTO
+ * @Auth wangc
+ * @Date 2020-08-19 10:50
+ */
+@Data
+public class BranchIssueDataResultDTO implements Serializable {
+ private static final long serialVersionUID = 2417543749267496482L;
+
+ private String issue;
+
+ private String monthId;
+
+ private Integer data;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchTrendSeriesDataResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchTrendSeriesDataResultDTO.java
new file mode 100644
index 0000000000..7d5f415547
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchTrendSeriesDataResultDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 3、支部建设情况|联建共建情况-折线图 返参中的系列数组
+ * @ClassName BranchTrendSeriesDataResultDTO
+ * @Auth wangc
+ * @Date 2020-08-19 10:22
+ */
+@Data
+public class BranchTrendSeriesDataResultDTO implements Serializable {
+ private static final long serialVersionUID = -2288264050517402039L;
+
+ /**
+ * 和legend集合值一致
+ * */
+ private String name;
+
+ /**
+ * 对应每个月的数值
+ * */
+ private List data;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java
new file mode 100644
index 0000000000..b9a22cb55b
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName PartymemberAgeDistributionResultDTO
+ * @Auth wangc
+ * @Date 2020-08-18 17:04
+ */
+@Data
+public class PartymemberAgeDistributionResultDTO implements Serializable {
+ private static final long serialVersionUID = -3477512511475784330L;
+
+ /**
+ * 30岁以下 的党员占 注册党员总数的百分比 （返回数字，小数点后保留两位）
+ * */
+ private String under30Ratio;
+
+ /**
+ * 31-50岁 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位）
+ * */
+ private String between31And50Ratio;
+
+ /**
+ * 51-60岁 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位）
+ * */
+ private String between51And60Ratio;
+
+ /**
+ * 61岁以上 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位）
+ * */
+ private String above61;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgePercentResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgePercentResultDTO.java
new file mode 100644
index 0000000000..c5eec4d539
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgePercentResultDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description
+ * @ClassName PartymemberAgePercentResultDTO
+ * @Auth wangc
+ * @Date 2020-08-19 09:13
+ */
+@Data
+public class PartymemberAgePercentResultDTO implements Serializable {
+ private static final long serialVersionUID = 2228109850328978771L;
+
+ /**
+ * 30岁以下 的党员占 注册党员总数的百分比 （返回数字，小数点后保留两位）
+ * */
+ private BigDecimal under30Ratio;
+
+ /**
+ * 31-50岁 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位）
+ * */
+ private BigDecimal between31And50Ratio;
+
+ /**
+ * 51-60岁 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位）
+ * */
+ private BigDecimal between51And60Ratio;
+
+ /**
+ * 61岁以上 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位）
+ * */
+ private BigDecimal above61;
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java
index 9747aa3ff9..d5934455bb 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java
@@ -1,5 +1,13 @@
package com.epmet.datareport.controller.screen;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao;
+import com.epmet.datareport.service.screen.GrassrootsPartyDevService;
+import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -12,4 +20,22 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/screen/grassrootspartydev")
public class GrassrootsPartyDevController {
+
+ @Autowired
+ private GrassrootsPartyDevService grassrootsPartyDevService;
+
+ /**
+ * @Description 党员基本情况-饼状图概况
+ * @NEI https://nei.netease.com/interface/detail/?pid=57068&id=321324
+ * @param param
+ * @return
+ * @author wangc
+ * @date 2020.08.18 16:59
+ **/
+ @PostMapping("basicinfo")
+ Result partymemberBaseInfo(ParymemberFormDTO param){
+ ValidatorUtils.validateEntity(param, ParymemberFormDTO.Parymember.class);
+ return new Result().ok(grassrootsPartyDevService.partymemberBaseInfo(param));
+ }
+
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java
index 76edf9c12b..26f91ed0be 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java
@@ -17,7 +17,10 @@
package com.epmet.datareport.dao.screen;
+import com.epmet.screen.dto.result.PartymemberAgePercentResultDTO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
/**
* 基层党建-党员基本情况
@@ -27,5 +30,15 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenCpcBaseDataDao{
-
+
+ /**
+ * @Description 查询党员年龄分布情况
+ * @param agencyId
+ * @return
+ * @author wangc
+ * @date 2020.08.18 17:47
+ **/
+ PartymemberAgePercentResultDTO selectPartymemberAgeDistribution(@Param("agencyId") String agencyId);
+
+
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java
index 83b3fb5c15..bd51bb6869 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java
@@ -17,7 +17,11 @@
package com.epmet.datareport.dao.screen;
+import com.epmet.screen.dto.result.BranchIssueDataResultDTO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 基层党建-建设情况数据（支部，联建）
@@ -27,5 +31,24 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenPartyBranchDataDao {
-
+
+ /**
+ * @Description 根据agencyTd、type(数据类别 party:支部建设;union:联合建设)查出共有多少议题主题
+ * @param agencyId
+ * @param type
+ * @return List
+ * @author wangc
+ * @date 2020.08.19 10:44
+ **/
+ List selectIssueGroup(@Param("agencyId") String agencyId , @Param("type") String type);
+
+ /**
+ * @Description 根据议题名称查找近12个月的数据
+ * @param agencyId ..
+ * @return List
+ * @author wangc
+ * @date 2020.08.19 10:59
+ **/
+ List selectBranchDataByTypeAndTimeZone(@Param("agencyId") String agencyId , @Param("type") String type, @Param("category") String category, @Param("bottomMonthId") String bottomMonthId);
+
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java
index 4f25eb5f0d..8caa92ac10 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java
@@ -1,6 +1,9 @@
package com.epmet.datareport.service.screen;
+import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.result.BranchBuildTrendResultDTO;
+import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO;
import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
/**
@@ -20,5 +23,24 @@ public interface GrassrootsPartyDevService {
* @date 2020.08.18 14:58
**/
PartymemberPercentResultDTO partymemberBaseInfo(ParymemberFormDTO param);
+
+ /**
+ * @Description 2、党员基本情况-年龄分布
+ * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321980
+ * @param param
+ * @return
+ * @author wangc
+ * @date 2020.08.18 17:54
+ **/
+ PartymemberAgeDistributionResultDTO partymemberAgeDistribution(ParymemberFormDTO param);
+ /**
+ * @Description 3、支部建设情况|联建共建情况-折线图
+ * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321981
+ * @param param
+ * @return BranchBuildTrendResultDTO
+ * @author wangc
+ * @date 2020.08.19 11:02
+ **/
+ BranchBuildTrendResultDTO branchBuildTrend(BranchBuildTrendFormDTO param);
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
index 94cf163888..d0458bfca5 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
@@ -1,14 +1,26 @@
package com.epmet.datareport.service.screen.impl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.datareport.dao.screen.ScreenCpcBaseDataDao;
+import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao;
import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao;
+import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
import com.epmet.screen.dto.form.ParymemberFormDTO;
-import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
+import com.epmet.screen.dto.result.*;
import com.epmet.datareport.service.screen.GrassrootsPartyDevService;
+import com.google.common.collect.Maps;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
/**
* 基层党建相关各指标查询
*
@@ -22,6 +34,11 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
@Autowired
private ScreenUserTotalDataDao screenUserTotalDataDao;
+ @Autowired
+ private ScreenCpcBaseDataDao screenCpcBaseDataDao;
+ @Autowired
+ private ScreenPartyBranchDataDao screenPartyBranchDataDao;
+ private List issueGroup;
/**
* @Description 1、党员基本情况-饼状图概况
@@ -35,7 +52,203 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
public PartymemberPercentResultDTO partymemberBaseInfo(ParymemberFormDTO param) {
PartymemberPercentResultDTO result = screenUserTotalDataDao.selectAgencyPartymemberPercent(param.getAgencyId());
+ if(null == result){
+ logger.warn("com.epmet.datareport.service.screen.impl.GrassrootsPartyDevServiceImpl.partymemberBaseInfo:未查询出指定agencyId下的党员基础信息数据，agencyId :: {}",param.getAgencyId());
+ result.setPercentInPlatForm(convertPercentStr(BigDecimal.ZERO));
+ return result;
+ }
+ //partymember / platform
+ if(null == result.getPlatFormTotal() || NumConstant.ZERO == result.getPlatFormTotal()){
+ result.setPercentInPlatForm(convertPercentStr(BigDecimal.ZERO));
+ }else{
+ result.setPercentInPlatForm(convertPercentStr(new BigDecimal(result.getPartyMemberTotal()/result.getPlatFormTotal())));
+ }
+ return result;
+ }
+
+ /**
+ * @Description 2、党员基本情况-年龄分布
+ * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321980
+ * @param param
+ * @return
+ * @author wangc
+ * @date 2020.08.18 17:54
+ **/
+ @Override
+ public PartymemberAgeDistributionResultDTO partymemberAgeDistribution(ParymemberFormDTO param) {
+ PartymemberAgePercentResultDTO percent = screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId());
+ PartymemberAgeDistributionResultDTO result = new PartymemberAgeDistributionResultDTO();
+
+ if(null == percent.getUnder30Ratio()) percent.setUnder30Ratio(new BigDecimal(NumConstant.ZERO));
+ result.setUnder30Ratio(convertPercentStr(percent.getUnder30Ratio()));
+
+ if(null == percent.getBetween31And50Ratio()) percent.setBetween31And50Ratio(new BigDecimal(NumConstant.ZERO));
+ result.setBetween31And50Ratio(convertPercentStr(percent.getBetween31And50Ratio()));
+
+ if(null == percent.getBetween51And60Ratio()) percent.setBetween51And60Ratio(new BigDecimal(NumConstant.ZERO));
+ result.setBetween51And60Ratio(convertPercentStr(percent.getBetween51And60Ratio()));
+
+ if(null == percent.getAbove61()) percent.setAbove61(new BigDecimal(NumConstant.ZERO));
+ result.setAbove61(convertPercentStr(percent.getAbove61()));
+
+ return result;
+ }
+
+ /**
+ * @Description 3、支部建设情况|联建共建情况-折线图
+ * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321981
+ * @param param
+ * @return BranchBuildTrendResultDTO
+ * @author wangc
+ * @date 2020.08.19 11:02
+ **/
+ @Override
+ public BranchBuildTrendResultDTO branchBuildTrend(BranchBuildTrendFormDTO param) {
+ if(StringUtils.equals("ljgj",param.getCategory())){
+ //联建共建情况
+ param.setCategory("union");
+ }else if(StringUtils.equals("ljdyzy",param.getCategory())){
+ //联建党员志愿服务情况
+ param.setCategory("voluntaryservice");
+ }else{
+ //默认支部建设
+ param.setCategory("party");
+ }
+ BranchBuildTrendResultDTO result = new BranchBuildTrendResultDTO();
+ //生成近十二个月的横坐标数组
+ Map monthMap = getX();
+ result.setXAxis(monthMap.values().stream().collect(Collectors.toList()));
+
+ List dataArray = new LinkedList<>();
+ List yearlyDataList =
+ screenPartyBranchDataDao.selectBranchDataByTypeAndTimeZone(param.getAgencyId(),param.getType(),param.getCategory(),monthMap.keySet().iterator().next());
+
+
+ if(null != yearlyDataList && !yearlyDataList.isEmpty()){
+
+ Map> dataMapByIssue =
+ yearlyDataList.stream().collect(Collectors.groupingBy(BranchIssueDataResultDTO::getIssue));
+
+
+ result.setLegend(new LinkedList<>(dataMapByIssue.keySet()));
+
+ dataMapByIssue.forEach((issue,val) ->{
+ List issueYearlyDataList = val;
+ List numArray = new LinkedList<>();
+ BranchTrendSeriesDataResultDTO data = new BranchTrendSeriesDataResultDTO();
+ data.setName(issue);
+ if(null != issueYearlyDataList && issueYearlyDataList.isEmpty()){
+ monthMap.keySet().forEach( monthId ->{
+ Optional optional
+ = issueYearlyDataList.stream().filter(yearly -> StringUtils.equals(monthId,yearly.getMonthId())).findAny();
+ if(optional.isPresent()){
+ numArray.add(optional.get().getData());
+ }else{
+ numArray.add(NumConstant.ZERO);
+ }
+ });
+ }else{
+ for(int i = NumConstant.ZERO ; i < NumConstant.TWELVE ; i++){
+ numArray.add(NumConstant.ZERO);
+ }
+ }
+ dataArray.add(data);
+ });
+ }
+
+ result.setSeriesData(dataArray);
+ result.setLegend(null == result.getLegend() ? new ArrayList<>() : result.getLegend());
return null;
}
+
+
+ private String convertPercentStr(BigDecimal percent){
+ if(null == percent || BigDecimal.ZERO == percent) return "0.00%";
+ String percentStr = percent.setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
+ return percentStr.concat("%");
+ }
+
+ /**
+ * @Description 返回当前月以及前十一个月，升序
+ * @param
+ * @return Map key:202001 value:1月
+ * @author wangc
+ * @date 2020.08.19 12:46
+ **/
+ private Map getX(){
+ SimpleDateFormat format = new SimpleDateFormat("YYYYmm");
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date()); // 设置为当前时间
+ calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月
+ String currentMonth = format.format(calendar.getTime());
+ Integer monthCounter = Integer.parseInt(currentMonth);
+ Map monthMap = new HashMap<>();
+ int i = NumConstant.ONE;
+ while(i <= NumConstant.TWELVE){
+
+ if(monthCounter.toString().endsWith("00")){
+ monthCounter -= NumConstant.EIGHTY_EIGHT;
+ }
+
+ String abscissa = monthCounter.toString().substring(monthCounter.toString().length() - NumConstant.TWO);
+ if(abscissa.startsWith("0")) {
+ abscissa = abscissa.replace("0","").concat("月");
+ }else{
+ abscissa = abscissa.concat("月");
+ }
+ monthMap.put(monthCounter.toString(),abscissa);
+ monthCounter-- ;
+ i++;
+ }
+
+ Map result = Maps.newLinkedHashMap();
+ monthMap.entrySet().stream().sorted(Map.Entry.comparingByKey())
+ .forEachOrdered((e -> result.put(e.getKey(),e.getValue())));
+
+ return result;
+ }
+
+
+ public static void main(String[] args) {
+ SimpleDateFormat format = new SimpleDateFormat("yyyyMM");
+ String currentMonth = format.format(new Date());
+ Integer monthCounter = Integer.parseInt(currentMonth);
+ Map monthMap = new HashMap<>();
+ int i = NumConstant.ONE;
+ while(i <= NumConstant.TWELVE){
+
+ if(monthCounter.toString().endsWith("00")){
+ monthCounter -= NumConstant.EIGHTY_EIGHT;
+ }
+
+ String abscissa = monthCounter.toString().substring(monthCounter.toString().length() - NumConstant.TWO);
+ if(abscissa.startsWith("0")) {
+ abscissa = abscissa.replace("0","").concat("月");
+ }else{
+ abscissa = abscissa.concat("月");
+ }
+ monthMap.put(monthCounter.toString(),abscissa);
+ monthCounter-- ;
+ i++;
+ }
+
+
+ Map result = Maps.newLinkedHashMap();
+ monthMap.entrySet().stream().sorted(Map.Entry.comparingByKey())
+ .forEachOrdered((e -> result.put(e.getKey(),e.getValue())));
+ result.forEach((k,v) -> {
+ System.out.print(k);
+ System.out.print(" -> ");
+ System.out.print(v);
+ System.out.println();
+ });
+
+ List xLine = result.values().stream().collect(Collectors.toList());
+ xLine.forEach(x -> {
+ System.out.println(x);
+ });
+
+ result.keySet().forEach(key -> System.out.println(key));
+ }
}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
index 356c3bae7e..24b84fb507 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
@@ -3,6 +3,19 @@
-
+
+
+ SELECT
+ SUM( AGE_LEVEL_1 ) + SUM( AGE_LEVEL_2 ) AS under30Ratio,
+ SUM( AGE_LEVEL_3 ) + SUM( AGE_LEVEL_4 ) AS between31And50Ratio,
+ SUM( AGE_LEVEL_5 ) AS between51And60Ratio,
+ SUM( AGE_LEVEL_6 ) AS above61
+ FROM
+ screen_cpc_base_data
+ WHERE
+ DEL_FLAG = '0'
+ AND ORG_TYPE = 'agency'
+ AND ORG_ID = #{agencyId}
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
index bab712283c..c095f123a6 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
@@ -3,6 +3,39 @@
+
+
+ SELECT DISTINCT
+ ISSUE_CATEGORY_NAME
+ FROM
+ screen_party_branch_data
+ WHERE
+ DEL_FLAG = '0'
+ AND ORG_TYPE = 'agency'
+ AND ORG_ID = #{agencyId}
+ AND TYPE = #{type}
+
+
+
+ SELECT
+ MONTH_ID,
+ ISSUE_CATEGORY_NAME AS issue,
+ CASE #{type} WHEN 'organize' THEN ORGANIZE_COUNT
+ WHEN 'joinuser' THEN JOIN_USER_COUNT
+ WHEN 'averagejoinuser' THEN AVERAGE_JOIN_USER_COUNT
+ END AS data
+ FROM
+ screen_party_branch_data
+ WHERE
+ DEL_FLAG = '0'
+ AND ORG_TYPE = 'agency'
+ AND ORG_ID = #{agencyId}
+ AND TYPE = #{category}
+ AND MONTH_ID = ]]> #{bottomMonthId}
+ ORDER BY
+ MONTH_ID DESC ,
+ ISSUE_CATEGORY_NAME
+
\ No newline at end of file
From c39a2be59353641401bb04dbcaaa954efa57e06b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Aug 2020 15:22:25 +0800
Subject: [PATCH 024/127] =?UTF-8?q?screen=5Findex=5Fdata=E5=8F=98=E6=9B=B4?=
=?UTF-8?q?=E4=B8=BAscreen=5Findex=5Fdata=5Fmonthly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...reenIndexDataDao.java => ScreenIndexDataMonthlyDao.java} | 2 +-
...ScreenIndexDataDao.xml => ScreenIndexDataMonthlyDao.xml} | 2 +-
...reenIndexDataDao.java => ScreenIndexDataMonthlyDao.java} | 4 ++--
...dexDataEntity.java => ScreenIndexDataMonthlyEntity.java} | 4 ++--
...ScreenIndexDataDao.xml => ScreenIndexDataMonthlyDao.xml} | 6 +++---
5 files changed, 9 insertions(+), 9 deletions(-)
rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/{ScreenIndexDataDao.java => ScreenIndexDataMonthlyDao.java} (95%)
rename epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/{ScreenIndexDataDao.xml => ScreenIndexDataMonthlyDao.xml} (89%)
rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/{ScreenIndexDataDao.java => ScreenIndexDataMonthlyDao.java} (92%)
rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/{ScreenIndexDataEntity.java => ScreenIndexDataMonthlyEntity.java} (94%)
rename epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/{ScreenIndexDataDao.xml => ScreenIndexDataMonthlyDao.xml} (90%)
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java
index 1f038fd5b3..e43635d0aa 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java
@@ -26,6 +26,6 @@ import org.apache.ibatis.annotations.Mapper;
* @since v1.0.0 2020-08-18
*/
@Mapper
-public interface ScreenIndexDataDao{
+public interface ScreenIndexDataMonthlyDao{
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
similarity index 89%
rename from epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
rename to epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index f5e693fd42..ae29ff18bf 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java
similarity index 92%
rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java
rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java
index 53a413b048..c949f23a9a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java
@@ -19,7 +19,7 @@ package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.IndexDataFormDTO;
-import com.epmet.entity.screen.ScreenIndexDataEntity;
+import com.epmet.entity.screen.ScreenIndexDataMonthlyEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -32,7 +32,7 @@ import java.util.List;
* @since v1.0.0 2020-08-18
*/
@Mapper
-public interface ScreenIndexDataDao extends BaseDao {
+public interface ScreenIndexDataMonthlyDao extends BaseDao {
/**
*1、指数相关
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataMonthlyEntity.java
similarity index 94%
rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataEntity.java
rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataMonthlyEntity.java
index ed9ac7fb97..f0f3ef1fed 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataMonthlyEntity.java
@@ -34,8 +34,8 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper=false)
-@TableName("screen_index_data")
-public class ScreenIndexDataEntity extends BaseEpmetEntity {
+@TableName("screen_index_data_monthly")
+public class ScreenIndexDataMonthlyEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
similarity index 90%
rename from epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 045bf7926e..9cf0ef9a41 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -1,10 +1,10 @@
-
+
- delete from screen_index_data
+ delete from screen_index_data_monthly
where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
AND ORG_ID IN
@@ -13,7 +13,7 @@
- insert into screen_index_data
+ insert into screen_index_data_monthly
(
ID,
CUSTOMER_ID,
From fa8cb17bcc9658e795f34da60d525e2565cd0f1c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Aug 2020 15:30:08 +0800
Subject: [PATCH 025/127] =?UTF-8?q?=E6=96=B0=E5=A2=9Escreen=5Findex=5Fdata?=
=?UTF-8?q?=5Fyearly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dao/screen/ScreenIndexDataYearlyDao.java | 31 +++++++
.../screen/ScreenIndexDataYearlyDao.xml | 8 ++
.../dao/screen/ScreenIndexDataYearlyDao.java | 33 +++++++
.../screen/ScreenIndexDataYearlyEntity.java | 92 +++++++++++++++++++
.../screen/ScreenIndexDataYearlyDao.xml | 8 ++
5 files changed, 172 insertions(+)
create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataYearlyDao.java
create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataYearlyEntity.java
create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataYearlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataYearlyDao.java
new file mode 100644
index 0000000000..3739cb2246
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataYearlyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java
new file mode 100644
index 0000000000..76da4e689c
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataYearlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataYearlyEntity.java
new file mode 100644
index 0000000000..8f8063c0db
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataYearlyEntity.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+
+
+
+
\ No newline at end of file
From 2f256043ad244a289a3c0f1b5c3af844249564ee Mon Sep 17 00:00:00 2001
From: wangchao
Date: Wed, 19 Aug 2020 15:59:03 +0800
Subject: [PATCH 026/127] =?UTF-8?q?4=E3=80=81=E6=94=AF=E9=83=A8=E5=BB=BA?=
=?UTF-8?q?=E8=AE=BE=E6=83=85=E5=86=B5|=E8=81=94=E5=BB=BA=E5=85=B1?=
=?UTF-8?q?=E5=BB=BA=E6=83=85=E5=86=B5-=E6=8E=92=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dto/result/BranchBuildRankResultDTO.java | 14 ++++++++
.../PartymemberAgeDistributionResultDTO.java | 24 +++++++++-----
.../dao/screen/ScreenCpcBaseDataDao.java | 4 +--
.../screen/GrassrootsPartyDevService.java | 12 +++++++
.../impl/GrassrootsPartyDevServiceImpl.java | 32 +++++++++----------
.../mapper/screen/ScreenCpcBaseDataDao.xml | 11 ++++---
.../screen/ScreenPartyBranchDataDao.xml | 26 +++++++++++++++
7 files changed, 92 insertions(+), 31 deletions(-)
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java
index 9b1584e276..f7593319e1 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java
@@ -3,6 +3,7 @@ package com.epmet.screen.dto.result;
import lombok.Data;
import java.io.Serializable;
+import java.util.List;
/**
* @Description 4、支部建设情况|联建共建情况-排行 返参dto
@@ -14,5 +15,18 @@ import java.io.Serializable;
public class BranchBuildRankResultDTO implements Serializable {
private static final long serialVersionUID = 6213072175254509349L;
+ /**
+ * 组织次数
+ * */
+ private List organizeData;
+ /**
+ * 组织名称数组
+ * */
+ private List xAxis;
+
+ /**
+ * 参与人数
+ * */
+ private List joinData;
}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java
index b9a22cb55b..6ae70d9a67 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java
@@ -1,5 +1,6 @@
package com.epmet.screen.dto.result;
+import com.epmet.commons.tools.constant.NumConstant;
import lombok.Data;
import java.io.Serializable;
@@ -15,22 +16,29 @@ public class PartymemberAgeDistributionResultDTO implements Serializable {
private static final long serialVersionUID = -3477512511475784330L;
/**
- * 30岁以下 的党员占 注册党员总数的百分比 （返回数字，小数点后保留两位）
+ * 30岁以下 的党员
* */
- private String under30Ratio;
+ private Integer under30Count = NumConstant.ZERO;
/**
- * 31-50岁 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位）
+ * 31-50岁 的党员
* */
- private String between31And50Ratio;
+ private Integer between31And50Count = NumConstant.ZERO;
/**
- * 51-60岁 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位）
+ * 51-60岁 的党员
* */
- private String between51And60Ratio;
+ private Integer between51And60Count = NumConstant.ZERO;
/**
- * 61岁以上 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位）
+ * 61岁以上 的党员
* */
- private String above61;
+ private Integer above61Count = NumConstant.ZERO;
+
+ /**
+ * 党员总数
+ * */
+ private Integer partyTotal = NumConstant.ZERO;
+
+
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java
index 26f91ed0be..87f26f3b01 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java
@@ -17,7 +17,7 @@
package com.epmet.datareport.dao.screen;
-import com.epmet.screen.dto.result.PartymemberAgePercentResultDTO;
+import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -38,7 +38,7 @@ public interface ScreenCpcBaseDataDao{
* @author wangc
* @date 2020.08.18 17:47
**/
- PartymemberAgePercentResultDTO selectPartymemberAgeDistribution(@Param("agencyId") String agencyId);
+ PartymemberAgeDistributionResultDTO selectPartymemberAgeDistribution(@Param("agencyId") String agencyId);
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java
index 8caa92ac10..a870d21585 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java
@@ -1,7 +1,9 @@
package com.epmet.datareport.service.screen;
+import com.epmet.screen.dto.form.BranchBuildRankFormDTO;
import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.result.BranchBuildRankResultDTO;
import com.epmet.screen.dto.result.BranchBuildTrendResultDTO;
import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO;
import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
@@ -43,4 +45,14 @@ public interface GrassrootsPartyDevService {
* @date 2020.08.19 11:02
**/
BranchBuildTrendResultDTO branchBuildTrend(BranchBuildTrendFormDTO param);
+
+ /**
+ * @Description 4、支部建设情况|联建共建情况-排行
+ * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321982
+ * @param param
+ * @return
+ * @author wangc
+ * @date 2020.08.19 15:25
+ **/
+ BranchBuildRankResultDTO branchBuildRank(BranchBuildRankFormDTO param);
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
index d0458bfca5..893f5115ce 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.datareport.dao.screen.ScreenCpcBaseDataDao;
import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao;
import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao;
+import com.epmet.screen.dto.form.BranchBuildRankFormDTO;
import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
import com.epmet.screen.dto.form.ParymemberFormDTO;
import com.epmet.screen.dto.result.*;
@@ -76,22 +77,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
**/
@Override
public PartymemberAgeDistributionResultDTO partymemberAgeDistribution(ParymemberFormDTO param) {
- PartymemberAgePercentResultDTO percent = screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId());
- PartymemberAgeDistributionResultDTO result = new PartymemberAgeDistributionResultDTO();
-
- if(null == percent.getUnder30Ratio()) percent.setUnder30Ratio(new BigDecimal(NumConstant.ZERO));
- result.setUnder30Ratio(convertPercentStr(percent.getUnder30Ratio()));
-
- if(null == percent.getBetween31And50Ratio()) percent.setBetween31And50Ratio(new BigDecimal(NumConstant.ZERO));
- result.setBetween31And50Ratio(convertPercentStr(percent.getBetween31And50Ratio()));
-
- if(null == percent.getBetween51And60Ratio()) percent.setBetween51And60Ratio(new BigDecimal(NumConstant.ZERO));
- result.setBetween51And60Ratio(convertPercentStr(percent.getBetween51And60Ratio()));
-
- if(null == percent.getAbove61()) percent.setAbove61(new BigDecimal(NumConstant.ZERO));
- result.setAbove61(convertPercentStr(percent.getAbove61()));
-
- return result;
+ return screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId());
}
/**
@@ -159,6 +145,20 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
result.setSeriesData(dataArray);
result.setLegend(null == result.getLegend() ? new ArrayList<>() : result.getLegend());
+ return result;
+ }
+
+ /**
+ * @Description 4、支部建设情况|联建共建情况-排行
+ * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321982
+ * @param param
+ * @return BranchBuildRankResultDTO
+ * @author wangc
+ * @date 2020.08.19 15:25
+ **/
+ @Override
+ public BranchBuildRankResultDTO branchBuildRank(BranchBuildRankFormDTO param) {
+
return null;
}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
index 24b84fb507..3fc9c990b3 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
@@ -4,12 +4,13 @@
-
+
SELECT
- SUM( AGE_LEVEL_1 ) + SUM( AGE_LEVEL_2 ) AS under30Ratio,
- SUM( AGE_LEVEL_3 ) + SUM( AGE_LEVEL_4 ) AS between31And50Ratio,
- SUM( AGE_LEVEL_5 ) AS between51And60Ratio,
- SUM( AGE_LEVEL_6 ) AS above61
+ SUM( AGE_LEVEL_1 ) + SUM( AGE_LEVEL_2 ) AS under30Count,
+ SUM( AGE_LEVEL_3 ) + SUM( AGE_LEVEL_4 ) AS between31And50Count,
+ SUM( AGE_LEVEL_5 ) AS between51And60Count,
+ SUM( AGE_LEVEL_6 ) AS above61Count,
+ SUM( PARTY_MEMBER_COUNT) AS partyTotal
FROM
screen_cpc_base_data
WHERE
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
index c095f123a6..67b6006b05 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
@@ -38,4 +38,30 @@
ISSUE_CATEGORY_NAME
+
+ SELECT
+ ORG_NAME,
+ COUNT( ORGANIZE_COUNT ) AS organizeData,
+ COUNT( JOIN_USER_COUNT ) AS joinData
+ FROM
+ screen_party_branch_data
+
+ DEL_FLAG = '0'
+ AND ORG_TYPE = 'agency'
+ AND ORG_ID = #{agencyId}
+ AND TYPE = #{category}
+
+
+ AND MONTH_ID = #{monthId}
+
+
+ AND MONTH_ID = ]]> #{bottomMonthId}
+
+
+
+ ORDER BY
+ organizeData DESC,
+ joinData DESC
+
+
\ No newline at end of file
From 125445b0c3db72f019b2edf1e1f750be428bf592 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 19 Aug 2020 15:59:34 +0800
Subject: [PATCH 027/127] =?UTF-8?q?1=E3=80=81=E5=B9=B4=E5=BA=A6=E5=B9=B3?=
=?UTF-8?q?=E5=9D=87=E6=8C=87=E6=95=B0=20=202=E3=80=81=E6=9C=88=E5=BA=A6?=
=?UTF-8?q?=E6=8C=87=E6=95=B0=E5=88=86=E6=9E=90-=E9=A5=BC=E7=8A=B6?=
=?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../screen/dto/form/MonthPieChartFormDTO.java | 24 +++++++++++
.../dto/form/YearAverageIndexFormDTO.java | 24 +++++++++++
.../dto/result/MonthPieChartResultDTO.java | 30 +++++++++++++
.../dto/result/YearAverageIndexResultDTO.java | 35 ++++++++++++++++
.../screen/DistributionController.java | 4 +-
.../controller/screen/IndexController.java | 42 +++++++++++++++++++
.../dao/screen/ScreenIndexDataMonthlyDao.java | 10 +++++
.../dao/screen/ScreenIndexDataYearlyDao.java | 10 +++++
.../service/screen/IndexService.java | 22 ++++++++++
.../service/screen/impl/IndexServiceImpl.java | 42 +++++++++++++++++++
.../screen/ScreenIndexDataMonthlyDao.xml | 16 ++++++-
.../screen/ScreenIndexDataYearlyDao.xml | 17 +++++++-
12 files changed, 270 insertions(+), 6 deletions(-)
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/MonthPieChartFormDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/YearAverageIndexFormDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthPieChartResultDTO.java
create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/YearAverageIndexResultDTO.java
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/MonthPieChartFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/MonthPieChartFormDTO.java
new file mode 100644
index 0000000000..0c188f427e
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/MonthPieChartFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 3:10 下午
+ */
+@Data
+public class MonthPieChartFormDTO implements Serializable {
+
+ private static final long serialVersionUID = -3163410637094615814L;
+
+ public interface MonthPieChart{}
+
+ /**
+ * 机关ID
+ */
+ @NotBlank(message = "机关ID不能为空",groups = {MonthPieChart.class})
+ private String agencyId;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/YearAverageIndexFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/YearAverageIndexFormDTO.java
new file mode 100644
index 0000000000..80d526bd48
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/YearAverageIndexFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 2:40 下午
+ */
+@Data
+public class YearAverageIndexFormDTO implements Serializable {
+
+ private static final long serialVersionUID = -2389432085360116229L;
+
+ public interface YearAverageIndex{}
+
+ /**
+ * 机关Id
+ */
+ @NotBlank(message = "机关ID不能为空",groups = {YearAverageIndex.class})
+ private String agencyId;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthPieChartResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthPieChartResultDTO.java
new file mode 100644
index 0000000000..248f69d5ce
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthPieChartResultDTO.java
@@ -0,0 +1,30 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 3:12 下午
+ */
+@Data
+public class MonthPieChartResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 8399158251970739021L;
+
+ /**
+ * 服务能力
+ */
+ private Double serviceAbility = 0.0;
+
+ /**
+ * 党建能力
+ */
+ private Double partyDevAbility = 0.0;
+
+ /**
+ * 治理能力
+ */
+ private Double governAbility = 0.0;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/YearAverageIndexResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/YearAverageIndexResultDTO.java
new file mode 100644
index 0000000000..d05479d5d2
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/YearAverageIndexResultDTO.java
@@ -0,0 +1,35 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 2:45 下午
+ */
+@Data
+public class YearAverageIndexResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 6453379153616899440L;
+
+ /**
+ * 年度平均指数
+ */
+ private Double yearAverageIndex = 0.0;
+
+ /**
+ * 服务能力
+ */
+ private Double serviceAbility = 0.0;
+
+ /**
+ * 党建能力
+ */
+ private Double partyDevAbility = 0.0;
+
+ /**
+ * 治理能力
+ */
+ private Double governAbility = 0.0;
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
index 648d1e088b..b0b7c1f7a8 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
@@ -72,7 +72,7 @@ public class DistributionController {
* @author zxc
* @date 2020/8/19 1:29 下午
*/
-// @ExternalAppRequestAuth
+ @ExternalAppRequestAuth
@PostMapping("project")
public Result> project(@RequestBody ProjectFormDTO projectFormDTO){
ValidatorUtils.validateEntity(projectFormDTO, ProjectFormDTO.Project.class);
@@ -85,7 +85,7 @@ public class DistributionController {
* @author zxc
* @date 2020/8/19 1:52 下午
*/
-// @ExternalAppRequestAuth
+ @ExternalAppRequestAuth
@PostMapping("topprofile")
public Result topProfile(@RequestBody TopProfileFormDTO topProfileFormDTO){
ValidatorUtils.validateEntity(topProfileFormDTO, TopProfileFormDTO.TopProfile.class);
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
index d8417ddcdb..ce74b4b766 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
@@ -1,5 +1,16 @@
package com.epmet.datareport.controller.screen;
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.datareport.service.screen.IndexService;
+import com.epmet.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -12,4 +23,35 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/screen/index")
public class IndexController {
+
+ @Autowired
+ private IndexService indexService;
+
+ /**
+ * @Description 1、年度平均指数
+ * @param yearAverageIndexFormDTO
+ * @author zxc
+ * @date 2020/8/19 2:53 下午
+ */
+ @ExternalAppRequestAuth
+ @PostMapping("yearaverageindex")
+ public Result yearAverageIndex(@RequestBody YearAverageIndexFormDTO yearAverageIndexFormDTO){
+ ValidatorUtils.validateEntity(yearAverageIndexFormDTO, YearAverageIndexFormDTO.YearAverageIndex.class);
+ return new Result().ok(indexService.yearAverageIndex(yearAverageIndexFormDTO));
+ }
+
+ /**
+ * @Description 2、月度指数分析-饼状图
+ * @param monthPieChartFormDTO
+ * @author zxc
+ * @date 2020/8/19 3:17 下午
+ */
+ @ExternalAppRequestAuth
+ @PostMapping("monthindexanalysis/piechart")
+ public Result monthPieChart(@RequestBody MonthPieChartFormDTO monthPieChartFormDTO){
+ ValidatorUtils.validateEntity(monthPieChartFormDTO, MonthPieChartFormDTO.MonthPieChart.class);
+ return new Result().ok(indexService.monthPieChart(monthPieChartFormDTO));
+ }
+
+
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java
index e43635d0aa..f27f9f4fb8 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java
@@ -17,7 +17,9 @@
package com.epmet.datareport.dao.screen;
+import com.epmet.screen.dto.result.MonthPieChartResultDTO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* 指数-指数数据
@@ -27,5 +29,13 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenIndexDataMonthlyDao{
+
+ /**
+ * @Description 2、月度指数分析-饼状图
+ * @param agencyId
+ * @author zxc
+ * @date 2020/8/19 3:43 下午
+ */
+ MonthPieChartResultDTO selectMonthPieChart(@Param("agencyId")String agencyId);
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataYearlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataYearlyDao.java
index 3739cb2246..304351b3b7 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataYearlyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataYearlyDao.java
@@ -17,7 +17,9 @@
package com.epmet.datareport.dao.screen;
+import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* 指数-指数数据(按年统计)
@@ -27,5 +29,13 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenIndexDataYearlyDao{
+
+ /**
+ * @Description 1、年度平均指数
+ * @param agencyId
+ * @author zxc
+ * @date 2020/8/19 3:43 下午
+ */
+ YearAverageIndexResultDTO selectYearAverageIndex(@Param("agencyId")String agencyId);
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java
index 069534f7b8..4eba79bd88 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java
@@ -1,5 +1,10 @@
package com.epmet.datareport.service.screen;
+import com.epmet.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
+
/**
* 指数相关相关各指标查询
*
@@ -7,4 +12,21 @@ package com.epmet.datareport.service.screen;
* @date 2020/8/18 10:21
*/
public interface IndexService {
+
+ /**
+ * @Description 1、年度平均指数
+ * @param yearAverageIndexFormDTO
+ * @author zxc
+ * @date 2020/8/19 2:53 下午
+ */
+ YearAverageIndexResultDTO yearAverageIndex(YearAverageIndexFormDTO yearAverageIndexFormDTO);
+
+ /**
+ * @Description 2、月度指数分析-饼状图
+ * @param monthPieChartFormDTO
+ * @author zxc
+ * @date 2020/8/19 3:17 下午
+ */
+ MonthPieChartResultDTO monthPieChart(MonthPieChartFormDTO monthPieChartFormDTO);
+
}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java
index 042e9b2229..9db0ebca3c 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java
@@ -1,6 +1,13 @@
package com.epmet.datareport.service.screen.impl;
+import com.epmet.datareport.dao.screen.ScreenIndexDataMonthlyDao;
+import com.epmet.datareport.dao.screen.ScreenIndexDataYearlyDao;
import com.epmet.datareport.service.screen.IndexService;
+import com.epmet.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -11,4 +18,39 @@ import org.springframework.stereotype.Service;
*/
@Service
public class IndexServiceImpl implements IndexService {
+
+ @Autowired
+ private ScreenIndexDataYearlyDao screenIndexDataYearlyDao;
+ @Autowired
+ private ScreenIndexDataMonthlyDao screenIndexDataMonthlyDao;
+
+ /**
+ * @Description 1、年度平均指数
+ * @param yearAverageIndexFormDTO
+ * @author zxc
+ * @date 2020/8/19 2:53 下午
+ */
+ @Override
+ public YearAverageIndexResultDTO yearAverageIndex(YearAverageIndexFormDTO yearAverageIndexFormDTO) {
+ YearAverageIndexResultDTO yearAverageIndexResultDTO = screenIndexDataYearlyDao.selectYearAverageIndex(yearAverageIndexFormDTO.getAgencyId());
+ if (null == yearAverageIndexResultDTO){
+ return new YearAverageIndexResultDTO();
+ }
+ return yearAverageIndexResultDTO;
+ }
+
+ /**
+ * @Description 2、月度指数分析-饼状图
+ * @param monthPieChartFormDTO
+ * @author zxc
+ * @date 2020/8/19 3:17 下午
+ */
+ @Override
+ public MonthPieChartResultDTO monthPieChart(MonthPieChartFormDTO monthPieChartFormDTO) {
+ MonthPieChartResultDTO monthPieChartResultDTO = screenIndexDataMonthlyDao.selectMonthPieChart(monthPieChartFormDTO.getAgencyId());
+ if (null == monthPieChartFormDTO){
+ return new MonthPieChartResultDTO();
+ }
+ return monthPieChartResultDTO;
+ }
}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index ae29ff18bf..bee1716ec6 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -3,6 +3,18 @@
-
-
+
+
+ SELECT
+ service_ablity AS serviceAbility,
+ party_dev_ablity AS partyDevAbility,
+ govern_ablity AS governAbility
+ FROM
+ screen_index_data_monthly
+ WHERE
+ del_flag = '0'
+ AND org_type = 'agency'
+ AND org_id = #{agencyId}
+ AND month_id = DATE_FORMAT(NOW(),'%Y%m')
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
index 865dc1e924..3d9329846d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
@@ -3,6 +3,19 @@
-
-
+
+
+ SELECT
+ index_total AS yearAverageIndex,
+ service_ablity AS serviceAbility,
+ party_dev_ablity AS partyDevAbility,
+ govern_ablity AS governAbility
+ FROM
+ screen_index_data_yearly
+ WHERE
+ del_flag = '0'
+ AND org_type = 'agency'
+ AND org_id = #{agencyId}
+ AND year_id = DATE_FORMAT(NOW(),'%Y')
+
\ No newline at end of file
From 08efa913a7501b4061b253a9f7b26d2be90bc009 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 19 Aug 2020 16:25:30 +0800
Subject: [PATCH 028/127] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...mDTO.java => IndexDataMonthlyFormDTO.java} | 4 +-
.../form/IndexDataYearlyFormDTO.java | 66 +++++++++++++++++++
.../controller/ScreenCollController.java | 23 +++++--
.../dao/screen/ScreenIndexDataMonthlyDao.java | 6 +-
.../dao/screen/ScreenIndexDataYearlyDao.java | 31 ++++++++-
.../service/screen/ScreenCollService.java | 16 ++++-
.../screen/impl/ScreenCollServiceImpl.java | 27 ++++++--
.../screen/ScreenIndexDataMonthlyDao.xml | 4 +-
.../screen/ScreenIndexDataYearlyDao.xml | 54 ++++++++++++++-
.../externalapp/ExtAppJwtTokenUtils.java | 2 +-
10 files changed, 209 insertions(+), 24 deletions(-)
rename epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/{IndexDataFormDTO.java => IndexDataMonthlyFormDTO.java} (91%)
create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java
similarity index 91%
rename from epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataFormDTO.java
rename to epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java
index d6d3065992..5b3699f82b 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java
@@ -5,12 +5,12 @@ import lombok.Data;
import java.io.Serializable;
/**
- * 1、指数相关 入参
+ * 1、指数_按月统计 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
-public class IndexDataFormDTO implements Serializable {
+public class IndexDataMonthlyFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java
new file mode 100644
index 0000000000..6c44c9411a
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java
@@ -0,0 +1,66 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 17、指数_按年统计 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class IndexDataYearlyFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * yyyy
+ */
+ private String yearId;
+
+ /**
+ * 组织类别 agency：组织；部门：department；网格：grid
+ */
+ private String orgType;
+
+ /**
+ * 组织Id 可以为网格，机关id
+ */
+ private String orgId;
+
+ /**
+ * 上级组织Id
+ */
+ private String parentId;
+
+ /**
+ * 组织名称
+ */
+ private String orgName;
+
+ /**
+ * 总指数
+ */
+ private Integer indexTotal;
+
+ /**
+ * 党建能力指数
+ */
+ private Integer partyDevAblity;
+
+ /**
+ * 服务能力指数
+ */
+ private Integer serviceAblity;
+
+ /**
+ * 治理能力指数
+ */
+ private Integer governAblity;
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
index bb0e64b694..981c056313 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
@@ -1,7 +1,5 @@
package com.epmet.controller;
-import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
-import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.utils.Result;
@@ -135,20 +133,33 @@ public class ScreenCollController {
}
/**
- * 1、指数相关
+ * 1、指数_按月统计
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- @PostMapping("indexdata")
- public Result indexData(@RequestBody List formDTO) {
- return screenCollService.insertIndexData(formDTO);
+ @PostMapping("indexdatamonthly")
+ public Result indexDataMonthly(@RequestBody List formDTO) {
+ return screenCollService.insertIndexDataMonthly(formDTO);
}
// --
+ /**
+ * 17、指数_按年统计
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ @PostMapping("indexdatayearly")
+ public Result indexDataYearly(@RequestBody List formDTO) {
+ return screenCollService.insertIndexDataYearly(formDTO);
+ }
+
/**
* 16、部门信息上传
*
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java
index c949f23a9a..ec102d2499 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java
@@ -18,7 +18,7 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.screencoll.form.IndexDataFormDTO;
+import com.epmet.dto.screencoll.form.IndexDataMonthlyFormDTO;
import com.epmet.entity.screen.ScreenIndexDataMonthlyEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -45,7 +45,7 @@ public interface ScreenIndexDataMonthlyDao extends BaseDao list);
+ void batchInsertIndexDataMonthly(@Param("list") List list);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java
index 76da4e689c..6c27ae9e70 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.IndexDataYearlyFormDTO;
import com.epmet.entity.screen.ScreenIndexDataYearlyEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 指数-指数数据(按年统计)
@@ -29,5 +33,28 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenIndexDataYearlyDao extends BaseDao {
-
-}
\ No newline at end of file
+
+ /**
+ * 17、指数_按年统计
+ * 1) 根据CUSTOMER_ID、YEAR_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ *
+ * @param customerId
+ * @param yearId
+ * @param orgIds 组织Id集合
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void deleteIndexDataYearly(@Param("customerId") String customerId,
+ @Param("yearId") String yearId,
+ @Param("orgIds") String[] orgIds);
+
+ /**
+ * 17、指数_按年统计
+ * 2) 在批量新增
+ *
+ * @param list
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ void batchInsertIndexDataYearly(@Param("list") List list);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
index dcb9268db3..d2bc9d0bdb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
@@ -104,7 +104,7 @@ public interface ScreenCollService {
Result insertCpcbaseData(List formDTO);
/**
- * 1、指数相关
+ * 1、指数_按月统计
* 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
* 2) 在新增
*
@@ -113,7 +113,19 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertIndexData(List formDTO);
+ Result insertIndexDataMonthly(List formDTO);
+
+ /**
+ * 17、指数_按年统计
+ * 1) 根据CUSTOMER_ID、YEAR_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+ * 2) 在新增
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author zhangyong
+ * @Date 10:52 2020-08-18
+ **/
+ Result insertIndexDataYearly(List formDTO);
/**
* 16、部门信息上传
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
index 14787a6762..3f2a95ae03 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
@@ -57,7 +57,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
@Autowired
private ScreenCpcBaseDataDao screenCpcBaseDataDao;
@Autowired
- private ScreenIndexDataDao screenIndexDataDao;
+ private ScreenIndexDataMonthlyDao screenIndexDataMonthlyDao;
@Autowired
private ScreenCustomerDeptDao screenCustomerDeptDao;
@Autowired
@@ -70,7 +70,8 @@ public class ScreenCollServiceImpl implements ScreenCollService {
private ScreenUserJoinDao screenUserJoinDao;
@Autowired
private ScreenPioneerDataDao screenPioneerDataDao;
-
+ @Autowired
+ private ScreenIndexDataYearlyDao screenIndexDataYearlyDao;
@Override
@Transactional(rollbackFor = Exception.class)
public void insertPartyUserRankData(List formDTO,String customerId) {
@@ -214,18 +215,34 @@ public class ScreenCollServiceImpl implements ScreenCollService {
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertIndexData(List formDTO) {
+ public Result insertIndexDataMonthly(List formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
- screenIndexDataDao.deleteIndexData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ screenIndexDataMonthlyDao.deleteIndexDataMonthly(formDTO.get(NumConstant.ZERO).getCustomerId(),
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
- screenIndexDataDao.batchInsertIndexData(formDTO);
+ screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(formDTO);
+ }
+ return new Result();
+ }
+
+ @Override
+ public Result insertIndexDataYearly(List formDTO) {
+ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
+ String[] orgIds = new String[formDTO.size()];
+ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
+ orgIds[i] = formDTO.get(i).getOrgId();
+ }
+ screenIndexDataYearlyDao.deleteIndexDataYearly(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ formDTO.get(NumConstant.ZERO).getYearId(),
+ orgIds);
+
+ screenIndexDataYearlyDao.batchInsertIndexDataYearly(formDTO);
}
return new Result();
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 9cf0ef9a41..182ea29161 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -3,7 +3,7 @@
-
+
delete from screen_index_data_monthly
where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
AND ORG_ID IN
@@ -12,7 +12,7 @@
-
+
insert into screen_index_data_monthly
(
ID,
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
index 3896921c0e..2fb2faae43 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
@@ -3,6 +3,58 @@
+
+ delete from screen_index_data_yearly
+ where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId}
+ AND ORG_ID IN
+
+ #{item}
+
+
+
+ insert into screen_index_data_yearly
+ (
+ ID,
+ CUSTOMER_ID,
+ YEAR_ID,
+ ORG_TYPE,
+ ORG_ID,
+ PARENT_ID,
+ ORG_NAME,
+ INDEX_TOTAL,
+ PARTY_DEV_ABLITY,
+ SERVICE_ABLITY,
+ GOVERN_ABLITY,
+ DEL_FLAG,
+ REVISION,
+ CREATED_BY,
+ CREATED_TIME,
+ UPDATED_BY,
+ UPDATED_TIME
+ ) values
+
+ (
+ (SELECT REPLACE(UUID(), '-', '') AS id),
+ #{item.customerId},
+ #{item.yearId},
+ #{item.orgType},
+ #{item.orgId},
+ #{item.parentId},
+ #{item.orgName},
-
\ No newline at end of file
+ #{item.indexTotal},
+ #{item.partyDevAblity},
+ #{item.serviceAblity},
+ #{item.governAblity},
+ 0,
+ 0,
+ 'APP_USER',
+ now(),
+ 'APP_USER',
+ now()
+ )
+
+
+
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java
index 1c3a326c75..a1639646a2 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java
@@ -75,7 +75,7 @@ public class ExtAppJwtTokenUtils {
public static void genToken() {
HashMap claim = new HashMap<>();
- claim.put("appId", "227fb75ae4baa820755aaf43bf7f0a69");
+ claim.put("appId", "dbfad3110c124c89948d16e8b06a8888");
claim.put("customerId", "c1");
claim.put("ts", System.currentTimeMillis() - 1000 * 60 * 4);
From db9273780a3f0a1268933eb0141567d4e91a31b9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Aug 2020 16:59:11 +0800
Subject: [PATCH 029/127] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20latestOperateDesc;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/epmet/entity/screen/ScreenDifficultyDataEntity.java | 4 ++++
.../java/com/epmet/entity/screen/ScreenEventDataEntity.java | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
index 76af0410c0..3a49498dca 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
@@ -113,4 +113,8 @@ public class ScreenDifficultyDataEntity extends BaseEpmetEntity {
*/
private String eventStatusDesc;
+ /**
+ * 最近一次操作说明
+ */
+ private String latestOperateDesc;
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
index 9e605802f3..a007794682 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
@@ -133,4 +133,9 @@ public class ScreenEventDataEntity extends BaseEpmetEntity {
* 事件状态描述
*/
private String eventStatusDesc;
+
+ /**
+ * 最近一次操作说明
+ */
+ private String latestOperateDesc;
}
From 0db0ff81e2926288a542cc300a24a419485a6401 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 19 Aug 2020 17:27:42 +0800
Subject: [PATCH 030/127] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../screencoll/form/CpcBaseDataFormDTO.java | 5 -
.../form/CustomerAgencyFormDTO.java | 5 -
.../screencoll/form/CustomerDeptFormDTO.java | 5 -
.../screencoll/form/CustomerGridFormDTO.java | 5 -
.../form/DifficultyDataFormDTO.java | 10 +-
.../dto/screencoll/form/EventDataFormDTO.java | 10 +-
.../form/GovernRankDataFormDTO.java | 5 -
.../form/IndexDataMonthlyFormDTO.java | 5 -
.../form/IndexDataYearlyFormDTO.java | 5 -
.../screencoll/form/OrgRankDataFormDTO.java | 5 -
.../form/PartyBranchDataFormDTO.java | 5 -
.../form/PartyLinkMassesDataFormDTO.java | 5 -
.../screencoll/form/PioneerDataFormDTO.java | 5 -
.../dto/screencoll/form/UserJoinFormDTO.java | 5 -
.../screencoll/form/UserTotalDataFormDTO.java | 5 -
.../java/com/epmet/DataStatsApplication.java | 4 +
.../controller/ScreenCollController.java | 93 ++++++++++++------
.../dao/screen/ScreenCpcBaseDataDao.java | 3 +-
.../dao/screen/ScreenCustomerAgencyDao.java | 3 +-
.../dao/screen/ScreenCustomerDeptDao.java | 3 +-
.../dao/screen/ScreenCustomerGridDao.java | 3 +-
.../dao/screen/ScreenDifficultyDataDao.java | 16 ++--
.../epmet/dao/screen/ScreenEventDataDao.java | 14 +--
.../dao/screen/ScreenGovernRankDataDao.java | 3 +-
.../dao/screen/ScreenIndexDataMonthlyDao.java | 3 +-
.../dao/screen/ScreenIndexDataYearlyDao.java | 3 +-
.../dao/screen/ScreenOrgRankDataDao.java | 3 +-
.../dao/screen/ScreenPartyBranchDataDao.java | 3 +-
.../screen/ScreenPartyLinkMassesDataDao.java | 3 +-
.../dao/screen/ScreenPioneerDataDao.java | 3 +-
.../epmet/dao/screen/ScreenUserJoinDao.java | 3 +-
.../dao/screen/ScreenUserTotalDataDao.java | 3 +-
.../service/screen/ScreenCollService.java | 48 ++++++----
.../screen/impl/ScreenCollServiceImpl.java | 94 +++++++++----------
.../mapper/screen/ScreenCpcBaseDataDao.xml | 4 +-
.../mapper/screen/ScreenCustomerAgencyDao.xml | 4 +-
.../mapper/screen/ScreenCustomerDeptDao.xml | 4 +-
.../mapper/screen/ScreenCustomerGridDao.xml | 4 +-
.../mapper/screen/ScreenDifficultyDataDao.xml | 10 +-
.../mapper/screen/ScreenEventDataDao.xml | 10 +-
.../mapper/screen/ScreenGovernRankDataDao.xml | 4 +-
.../screen/ScreenIndexDataMonthlyDao.xml | 4 +-
.../screen/ScreenIndexDataYearlyDao.xml | 4 +-
.../mapper/screen/ScreenOrgRankDataDao.xml | 4 +-
.../screen/ScreenPartyBranchDataDao.xml | 4 +-
.../screen/ScreenPartyLinkMassesDataDao.xml | 4 +-
.../mapper/screen/ScreenPioneerDataDao.xml | 4 +-
.../mapper/screen/ScreenUserJoinDao.xml | 4 +-
.../mapper/screen/ScreenUserTotalDataDao.xml | 4 +-
49 files changed, 236 insertions(+), 229 deletions(-)
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java
index 0efee2a896..3ff8c4446a 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java
@@ -14,11 +14,6 @@ public class CpcBaseDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 组织类别 agency：组织；部门：department；网格：grid
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java
index 7baff54308..de5dc8abdd 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java
@@ -14,11 +14,6 @@ public class CustomerAgencyFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 组织id
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java
index 5566ea3ad7..19f5f3fecd 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java
@@ -14,11 +14,6 @@ public class CustomerDeptFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 部门id
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java
index 13345ffaad..8935eaa156 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java
@@ -14,11 +14,6 @@ public class CustomerGridFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 网格id
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java
index 3053fe955a..14ef258fb8 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java
@@ -14,11 +14,6 @@ public class DifficultyDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 组织类别 agency：组织；部门：department；网格：grid
*/
@@ -88,4 +83,9 @@ public class DifficultyDataFormDTO implements Serializable {
* 事件状态描述
*/
private String eventStatusDesc;
+
+ /**
+ * 最近一次操作说明 eg: 转项目，结案，流转
+ */
+ private String latestOperateDesc;
}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
index 81800701c8..5be17787cf 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
@@ -17,11 +17,6 @@ public class EventDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 组织类别 agency：组织；部门：department；网格：grid
*/
@@ -116,4 +111,9 @@ public class EventDataFormDTO implements Serializable {
* 事件状态key
*/
private String eventStatusCode;
+
+ /**
+ * 最近一次操作说明 eg: 转项目，结案，流转
+ */
+ private String latestOperateDesc;
}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java
index 3976647f24..f12e196ab7 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java
@@ -15,11 +15,6 @@ public class GovernRankDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 年Id ：yyyy
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java
index 5b3699f82b..9c9ca798a5 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java
@@ -14,11 +14,6 @@ public class IndexDataMonthlyFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* yyyy
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java
index 6c44c9411a..bd360a63fa 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java
@@ -14,11 +14,6 @@ public class IndexDataYearlyFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* yyyy
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java
index 37386fcc6b..8b0a753839 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java
@@ -15,11 +15,6 @@ public class OrgRankDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 年Id ：yyyy
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java
index f05bd7bc80..21144c89ab 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java
@@ -14,11 +14,6 @@ public class PartyBranchDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 年Id ：yyyy
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java
index bacca22874..8d1ae654a9 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java
@@ -14,11 +14,6 @@ public class PartyLinkMassesDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 组织类别 agency：组织；部门：department；网格：grid
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
index bde79f0baf..cdad61be67 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
@@ -14,11 +14,6 @@ public class PioneerDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 组织类别 agency：组织；部门：department；网格：grid
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java
index d474115972..48802ff6d1 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java
@@ -14,11 +14,6 @@ public class UserJoinFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 组织类别 agency：组织；部门：department；网格：grid
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java
index 3cf171e6f7..42722f7111 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java
@@ -14,11 +14,6 @@ public class UserTotalDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 客户id
- */
- private String customerId;
-
/**
* 组织类别 agency：组织；部门：department；网格：grid
*/
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java
index ad4e2110fa..3b93ce39a3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java
@@ -3,8 +3,12 @@ package com.epmet;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableAsync;
+@EnableDiscoveryClient
+@EnableFeignClients
@SpringBootApplication (exclude = {DataSourceAutoConfiguration.class})
@EnableAsync
public class DataStatsApplication {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
index 981c056313..ae770d75fa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
@@ -29,6 +29,7 @@ public class ScreenCollController {
/**
* 9、党建引领|基层治理-居民（党员）积分排行榜
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
@@ -37,112 +38,128 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("partyuserrankdata")
public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- screenCollService.insertPartyUserRankData(formDTO,externalAppRequestParam.getCustomerId());
+ screenCollService.insertPartyUserRankData(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
* 8、党建引领-党员联系群众数据
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("partylinkmassesdata")
- public Result partyLinkMassesData(@RequestBody List formDTO) {
- return screenCollService.insertPartyLinkMassesData(formDTO);
+ public Result partyLinkMassesData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertPartyLinkMassesData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 7、基层党建-建设情况数据（支部、联建、志愿）
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("meetdata")
- public Result meetData(@RequestBody List formDTO) {
- return screenCollService.insertPartyBranchData(formDTO);
+ public Result meetData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertPartyBranchData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 6、党建引领-组织排行
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("orgrankdata")
- public Result orgRankData(@RequestBody List formDTO) {
- return screenCollService.insertOrgRankData(formDTO);
+ public Result orgRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertOrgRankData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 5、基层治理-治理能力数据
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("governrankdata")
- public Result governRankData(@RequestBody List formDTO) {
- return screenCollService.insertGovernRankData(formDTO);
+ public Result governRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertGovernRankData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 4、事件数据
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("eventdata")
- public Result eventData(@RequestBody List formDTO) {
- return screenCollService.insertEventData(formDTO);
+ public Result eventData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertEventData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 3、难点赌点
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("difficultydata")
- public Result difficultyData(@RequestBody List formDTO) {
- return screenCollService.insertDifficultyData(formDTO);
+ public Result difficultyData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertDifficultyData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 2、党员基本情况
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("cpcbasedata")
- public Result cpcbaseData(@RequestBody List formDTO) {
- return screenCollService.insertCpcbaseData(formDTO);
+ public Result cpcbaseData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertCpcbaseData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 1、指数_按月统计
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("indexdatamonthly")
- public Result indexDataMonthly(@RequestBody List formDTO) {
- return screenCollService.insertIndexDataMonthly(formDTO);
+ public Result indexDataMonthly(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertIndexDataMonthly(formDTO, externalAppRequestParam.getCustomerId());
}
// --
@@ -150,91 +167,105 @@ public class ScreenCollController {
/**
* 17、指数_按年统计
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("indexdatayearly")
- public Result indexDataYearly(@RequestBody List formDTO) {
- return screenCollService.insertIndexDataYearly(formDTO);
+ public Result indexDataYearly(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertIndexDataYearly(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 16、部门信息上传
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("customerdept")
- public Result customerDept(@RequestBody List formDTO) {
- return screenCollService.insertCustomerDept(formDTO);
+ public Result customerDept(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertCustomerDept(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 15、网格信息上传
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("customergrid")
- public Result customerGrid(@RequestBody List formDTO) {
- return screenCollService.insertCustomerGrid(formDTO);
+ public Result customerGrid(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertCustomerGrid(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 14、组织层级
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("customeragency")
- public Result customerAgency(@RequestBody List formDTO) {
- return screenCollService.insertCustomerAgency(formDTO);
+ public Result customerAgency(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertCustomerAgency(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 12、中央区各类总数
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("usertotaldata")
- public Result userTotalData(@RequestBody List formDTO) {
- return screenCollService.insertUserTotalData(formDTO);
+ public Result userTotalData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertUserTotalData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 11、基层治理-公众参与
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("userjoin")
- public Result userJoin(@RequestBody List formDTO) {
- return screenCollService.insertUserJoin(formDTO);
+ public Result userJoin(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertUserJoin(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 10、党建引领-先锋模范数据
*
+ * @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
+ @ExternalAppRequestAuth
@PostMapping("pioneerdata")
- public Result pioneerData(@RequestBody List formDTO) {
- return screenCollService.insertPioneerData(formDTO);
+ public Result pioneerData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
+ return screenCollService.insertPioneerData(formDTO, externalAppRequestParam.getCustomerId());
}
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
index fa30fdef44..12271b8e3c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
@@ -51,8 +51,9 @@ public interface ScreenCpcBaseDataDao extends BaseDao {
* 2) 在批量新增
*
* @param list
+ * @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- void batchInsertCpcBaseData(@Param("list") List list);
+ void batchInsertCpcBaseData(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
index 240c48e041..d7851cd754 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
@@ -51,8 +51,9 @@ public interface ScreenCustomerAgencyDao extends BaseDao list);
+ void batchInsertCustomerAgency(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
index 84e641b47b..53f37049a3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
@@ -51,8 +51,9 @@ public interface ScreenCustomerDeptDao extends BaseDao
* 2) 在批量新增
*
* @param list
+ * @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- void batchInsertCustomerDept(@Param("list") List list);
+ void batchInsertCustomerDept(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
index cfc0c7092c..3925d0ad6e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
@@ -50,8 +50,9 @@ public interface ScreenCustomerGridDao extends BaseDao
* 2) 在批量新增
*
* @param list
+ * @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- void batchInsertCustomerGrid(@Param("list") List list);
+ void batchInsertCustomerGrid(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
index 503f070506..5379eeb893 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
@@ -36,23 +36,25 @@ public interface ScreenDifficultyDataDao extends BaseDao list);
+ void batchInsertDifficultyData(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
index 20250bc7ff..ec80809c55 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
@@ -36,23 +36,25 @@ public interface ScreenEventDataDao extends BaseDao {
/**
* 4、事件数据
* 1) 根据CUSTOMER_ID、EVENT_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
- * CUSTOMER_ID 一
- * EVENT_ID 多
- * ORG_ID 多
*
- * @param list
+ * @param customerId 一
+ * @param eventId 多
+ * @param orgId 多
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- void deleteEventData(EventDataFormDTO list);
+ void deleteEventData(@Param("customerId")String customerId,
+ @Param("eventId")String eventId,
+ @Param("orgId")String orgId);
/**
* 4、事件数据
* 2) 在批量新增
*
* @param list
+ * @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- void batchInsertEventData(@Param("list") List list);
+ void batchInsertEventData(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
index 295538b085..ea3d67aa68 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
@@ -54,8 +54,9 @@ public interface ScreenGovernRankDataDao extends BaseDao list);
+ void batchInsertGovernRankData(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java
index ec102d2499..e97406febf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java
@@ -55,8 +55,9 @@ public interface ScreenIndexDataMonthlyDao extends BaseDao list);
+ void batchInsertIndexDataMonthly(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java
index 6c27ae9e70..4ca64f6944 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java
@@ -53,8 +53,9 @@ public interface ScreenIndexDataYearlyDao extends BaseDao list);
+ void batchInsertIndexDataYearly(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
index 110d37c618..4eabfd508a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
@@ -54,8 +54,9 @@ public interface ScreenOrgRankDataDao extends BaseDao {
* 2) 在批量新增
*
* @param list
+ * @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- void batchInsertOrgRankData(@Param("list") List list);
+ void batchInsertOrgRankData(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
index 00b9f0df8d..3cae4a160d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
@@ -54,8 +54,9 @@ public interface ScreenPartyBranchDataDao extends BaseDao list);
+ void batchInsertPartyBranchData(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
index d100742ec8..276b08e356 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
@@ -51,8 +51,9 @@ public interface ScreenPartyLinkMassesDataDao extends BaseDao list);
+ void batchInsertPartyLinkMassesData(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
index ba6bfa532a..202fc4aa59 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
@@ -51,8 +51,9 @@ public interface ScreenPioneerDataDao extends BaseDao {
* 2) 在批量新增
*
* @param list
+ * @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- void batchInsertPioneerData(@Param("list") List list);
+ void batchInsertPioneerData(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
index 0b6f09f58c..46d19682ea 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
@@ -55,8 +55,9 @@ public interface ScreenUserJoinDao extends BaseDao {
* 2) 在批量新增
*
* @param list
+ * @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- void batchInsertUserJoin(@Param("list") List list);
+ void batchInsertUserJoin(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
index ef7543555a..ec449f1352 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
@@ -51,8 +51,9 @@ public interface ScreenUserTotalDataDao extends BaseDao list);
+ void batchInsertUserTotalData(@Param("list") List list, @Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
index d2bc9d0bdb..4670c31fa1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
@@ -13,11 +13,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- void insertPartyUserRankData(List formDTO,String customerId);
+ void insertPartyUserRankData(List formDTO, String customerId);
/**
* 8、党建引领-党员联系群众数据
@@ -25,11 +26,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertPartyLinkMassesData(List formDTO);
+ Result insertPartyLinkMassesData(List formDTO, String customerId);
/**
* 7、基层党建-建设情况数据（支部、联建、志愿）
@@ -37,11 +39,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertPartyBranchData(List formDTO);
+ Result insertPartyBranchData(List formDTO, String customerId);
/**
* 6、党建引领-组织排行
@@ -49,11 +52,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertOrgRankData(List formDTO);
+ Result insertOrgRankData(List formDTO, String customerId);
/**
* 5、基层治理-治理能力数据
@@ -61,11 +65,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertGovernRankData(List formDTO);
+ Result insertGovernRankData(List formDTO, String customerId);
/**
* 4、事件数据
@@ -73,11 +78,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertEventData(List formDTO);
+ Result insertEventData(List formDTO, String customerId);
/**
* 3、难点赌点
@@ -85,11 +91,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertDifficultyData(List formDTO);
+ Result insertDifficultyData(List formDTO, String customerId);
/**
* 2、党员基本情况
@@ -97,11 +104,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertCpcbaseData(List formDTO);
+ Result insertCpcbaseData(List formDTO, String customerId);
/**
* 1、指数_按月统计
@@ -109,11 +117,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertIndexDataMonthly(List formDTO);
+ Result insertIndexDataMonthly(List formDTO, String customerId);
/**
* 17、指数_按年统计
@@ -121,11 +130,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertIndexDataYearly(List formDTO);
+ Result insertIndexDataYearly(List formDTO, String customerId);
/**
* 16、部门信息上传
@@ -133,11 +143,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertCustomerDept(List formDTO);
+ Result insertCustomerDept(List formDTO, String customerId);
/**
* 15、网格信息上传
@@ -145,11 +156,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertCustomerGrid(List formDTO);
+ Result insertCustomerGrid(List formDTO, String customerId);
/**
* 14、组织层级
@@ -157,11 +169,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertCustomerAgency(List formDTO);
+ Result insertCustomerAgency(List formDTO, String customerId);
/**
* 12、中央区各类总数
@@ -169,11 +182,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertUserTotalData(List formDTO);
+ Result insertUserTotalData(List formDTO, String customerId);
/**
* 11、基层治理-公众参与
@@ -181,11 +195,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertUserJoin(List formDTO);
+ Result insertUserJoin(List formDTO, String customerId);
/**
* 10、党建引领-先锋模范数据
@@ -193,9 +208,10 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
+ * @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertPioneerData(List formDTO);
+ Result insertPioneerData(List formDTO, String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
index 3f2a95ae03..f96ece5527 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
@@ -91,81 +91,82 @@ public class ScreenCollServiceImpl implements ScreenCollService {
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertPartyLinkMassesData(List formDTO) {
+ public Result insertPartyLinkMassesData(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
- screenPartyLinkMassesDataDao.deletePartyLinkMassesData(formDTO.get(NumConstant.ZERO).getCustomerId(), orgIds);
+ screenPartyLinkMassesDataDao.deletePartyLinkMassesData(customerId, orgIds);
- screenPartyLinkMassesDataDao.batchInsertPartyLinkMassesData(formDTO);
+ screenPartyLinkMassesDataDao.batchInsertPartyLinkMassesData(formDTO, customerId);
}
return new Result();
}
@Override
- public Result insertPartyBranchData(List formDTO) {
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertPartyBranchData(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
- screenPartyBranchDataDao.deletePartyBranchData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ screenPartyBranchDataDao.deletePartyBranchData(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
- screenPartyBranchDataDao.batchInsertPartyBranchData(formDTO);
+ screenPartyBranchDataDao.batchInsertPartyBranchData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertOrgRankData(List formDTO) {
+ public Result insertOrgRankData(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
- screenOrgRankDataDao.deleteOrgRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ screenOrgRankDataDao.deleteOrgRankData(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
- screenOrgRankDataDao.batchInsertOrgRankData(formDTO);
+ screenOrgRankDataDao.batchInsertOrgRankData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertGovernRankData(List formDTO) {
+ public Result insertGovernRankData(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
- screenGovernRankDataDao.deleteGovernRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ screenGovernRankDataDao.deleteGovernRankData(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
- screenGovernRankDataDao.batchInsertGovernRankData(formDTO);
+ screenGovernRankDataDao.batchInsertGovernRankData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertEventData(List formDTO) {
+ public Result insertEventData(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
- screenEventDataDao.deleteEventData(formDTO.get(i));
+ screenEventDataDao.deleteEventData(customerId, formDTO.get(i).getEventId(), formDTO.get(i).getOrgId());
}
- screenEventDataDao.batchInsertEventData(formDTO);
+ screenEventDataDao.batchInsertEventData(formDTO, customerId);
for (int i = NumConstant.ZERO; i < formDTO.size(); i++) {
if (null != formDTO.get(i).getImgDataList() && formDTO.get(i).getImgDataList().size() > NumConstant.ZERO) {
@@ -187,157 +188,156 @@ public class ScreenCollServiceImpl implements ScreenCollService {
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertDifficultyData(List formDTO) {
+ public Result insertDifficultyData(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
- screenDifficultyDataDao.deleteDifficultyData(formDTO.get(i));
+ screenDifficultyDataDao.deleteDifficultyData(customerId, formDTO.get(i).getEventId(), formDTO.get(i).getOrgId());
}
- screenDifficultyDataDao.batchInsertDifficultyData(formDTO);
+ screenDifficultyDataDao.batchInsertDifficultyData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertCpcbaseData(List formDTO) {
+ public Result insertCpcbaseData(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
- screenCpcBaseDataDao.deleteCpcBaseData(formDTO.get(NumConstant.ZERO).getCustomerId(), orgIds);
+ screenCpcBaseDataDao.deleteCpcBaseData(customerId, orgIds);
- screenCpcBaseDataDao.batchInsertCpcBaseData(formDTO);
+ screenCpcBaseDataDao.batchInsertCpcBaseData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertIndexDataMonthly(List formDTO) {
+ public Result insertIndexDataMonthly(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
- screenIndexDataMonthlyDao.deleteIndexDataMonthly(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
- screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(formDTO);
+ screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(formDTO, customerId);
}
return new Result();
}
@Override
- public Result insertIndexDataYearly(List formDTO) {
+ @Transactional(rollbackFor = Exception.class)
+ public Result insertIndexDataYearly(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
- screenIndexDataYearlyDao.deleteIndexDataYearly(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ screenIndexDataYearlyDao.deleteIndexDataYearly(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
orgIds);
- screenIndexDataYearlyDao.batchInsertIndexDataYearly(formDTO);
+ screenIndexDataYearlyDao.batchInsertIndexDataYearly(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertCustomerDept(List formDTO) {
+ public Result insertCustomerDept(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] deptIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
deptIds[i] = formDTO.get(i).getDeptId();
}
- screenCustomerDeptDao.deleteCustomerDept(formDTO.get(NumConstant.ZERO).getCustomerId(), deptIds);
+ screenCustomerDeptDao.deleteCustomerDept(customerId, deptIds);
- screenCustomerDeptDao.batchInsertCustomerDept(formDTO);
+ screenCustomerDeptDao.batchInsertCustomerDept(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertCustomerGrid(List formDTO) {
+ public Result insertCustomerGrid(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] gridIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
gridIds[i] = formDTO.get(i).getGridId();
}
- screenCustomerGridDao.deleteCustomerGrid(formDTO.get(NumConstant.ZERO).getCustomerId(), gridIds);
+ screenCustomerGridDao.deleteCustomerGrid(customerId, gridIds);
- screenCustomerGridDao.batchInsertCustomerGrid(formDTO);
+ screenCustomerGridDao.batchInsertCustomerGrid(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertCustomerAgency(List formDTO) {
+ public Result insertCustomerAgency(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] agencyIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
agencyIds[i] = formDTO.get(i).getAgencyId();
}
- screenCustomerAgencyDao.deleteCustomerAgency(formDTO.get(NumConstant.ZERO).getCustomerId(), agencyIds);
+ screenCustomerAgencyDao.deleteCustomerAgency(customerId, agencyIds);
- screenCustomerAgencyDao.batchInsertCustomerAgency(formDTO);
+ screenCustomerAgencyDao.batchInsertCustomerAgency(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertUserTotalData(List formDTO) {
+ public Result insertUserTotalData(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
- screenUserTotalDataDao.deleteUserTotalData(formDTO.get(NumConstant.ZERO).getCustomerId(),
- orgIds);
+ screenUserTotalDataDao.deleteUserTotalData(customerId, orgIds);
- screenUserTotalDataDao.batchInsertUserTotalData(formDTO);
+ screenUserTotalDataDao.batchInsertUserTotalData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertUserJoin(List formDTO) {
+ public Result insertUserJoin(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
- screenUserJoinDao.deleteUserJoin(formDTO.get(NumConstant.ZERO).getCustomerId(),
+ screenUserJoinDao.deleteUserJoin(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
- screenUserJoinDao.batchInsertUserJoin(formDTO);
+ screenUserJoinDao.batchInsertUserJoin(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Result insertPioneerData(List formDTO) {
+ public Result insertPioneerData(List formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
- screenPioneerDataDao.deletePioneerData(formDTO.get(NumConstant.ZERO).getCustomerId(),
- orgIds);
+ screenPioneerDataDao.deletePioneerData(customerId, orgIds);
- screenPioneerDataDao.batchInsertPioneerData(formDTO);
+ screenPioneerDataDao.batchInsertPioneerData(formDTO, customerId);
}
return new Result();
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
index de6f379dc4..a0adcc3b70 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_cpc_base_data
(
ID,
@@ -40,7 +40,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index c01c3dcc95..923a8410f0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_customer_agency
(
ID,
@@ -37,7 +37,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.agencyId},
#{item.agencyName},
#{item.pid},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
index 267a118cd8..627b3b39c1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_customer_dept
(
ID,
@@ -33,7 +33,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.deptId},
#{item.deptName},
#{item.parentAgencyId},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
index 5c96ed4ae8..7a36507ce7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_customer_grid
(
ID,
@@ -33,7 +33,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.gridId},
#{item.gridName},
#{item.parentAgencyId},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index 5ec18b6c7b..517d2efaa0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -8,7 +8,7 @@
where CUSTOMER_ID = #{customerId} AND EVENT_ID = #{eventId} AND ORG_ID = #{orgId}
-
+
insert into screen_difficulty_data
(
ID,
@@ -32,12 +32,13 @@
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
- UPDATED_TIME
+ UPDATED_TIME,
+ LATEST_OPERATE_DESC
) values
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
@@ -57,7 +58,8 @@
'APP_USER',
now(),
'APP_USER',
- now()
+ now(),
+ #{latestOperateDesc}
)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
index a6cdd87a2e..f0c84a1e8a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
@@ -8,7 +8,7 @@
where CUSTOMER_ID = #{customerId} AND EVENT_ID = #{eventId} AND ORG_ID = #{orgId}
-
+
insert into screen_event_data
(
ID,
@@ -36,12 +36,13 @@
UPDATED_BY,
UPDATED_TIME,
EVENT_STATUS_CODE,
- EVENT_STATUS_DESC
+ EVENT_STATUS_DESC,
+ LATEST_OPERATE_DESC
) values
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
@@ -65,7 +66,8 @@
'APP_USER',
now(),
#{item.eventStatusCode},
- #{item.eventStatusDesc}
+ #{item.eventStatusDesc},
+ #{latestOperateDesc}
)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
index 48d98970ce..9a6e6c3c44 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_govern_rank_data
(
ID,
@@ -39,7 +39,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 182ea29161..721c4e0af3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_index_data_monthly
(
ID,
@@ -37,7 +37,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
index 2fb2faae43..8747e1219a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_index_data_yearly
(
ID,
@@ -36,7 +36,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.yearId},
#{item.orgType},
#{item.orgId},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
index be2ff1fb67..4ebe5e2c28 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_org_rank_data
(
ID,
@@ -40,7 +40,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
index 05c5d92066..afeaca9651 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_party_branch_data
(
ID,
@@ -39,7 +39,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.yearId},
#{item.monthId},
#{item.type},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
index b5f7770bfd..01a63f3a53 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_party_link_masses_data
(
ID,
@@ -33,7 +33,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
index c31c51fe78..73e703ae25 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_pioneer_data
(
ID,
@@ -36,7 +36,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
index b09c3e6690..db7b626e27 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_user_join
(
ID,
@@ -36,7 +36,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
index 51257d5837..a582bedbb7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
@@ -12,7 +12,7 @@
-
+
insert into screen_user_total_data
(
ID,
@@ -37,7 +37,7 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
- #{item.customerId},
+ #{customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
From 718d2ccfaee82c3448f0e91795c099837d100b20 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 19 Aug 2020 17:56:11 +0800
Subject: [PATCH 031/127] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9-end?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/mapper/screen/ScreenDifficultyDataDao.xml | 2 +-
.../src/main/resources/mapper/screen/ScreenEventDataDao.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index 517d2efaa0..11451dc3ae 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -59,7 +59,7 @@
now(),
'APP_USER',
now(),
- #{latestOperateDesc}
+ #{item.latestOperateDesc}
)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
index f0c84a1e8a..1df8e0a068 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
@@ -67,7 +67,7 @@
now(),
#{item.eventStatusCode},
#{item.eventStatusDesc},
- #{latestOperateDesc}
+ #{item.latestOperateDesc}
)
From c084ca825e14d14735a763169c335ebf3b076793 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Aug 2020 18:23:55 +0800
Subject: [PATCH 032/127] =?UTF-8?q?=E8=BF=94=E5=8F=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/ScreenCollController.java | 45 ++++++++++++-------
.../service/screen/ScreenCollService.java | 37 ++++++++-------
.../screen/impl/ScreenCollServiceImpl.java | 45 +++++++------------
3 files changed, 66 insertions(+), 61 deletions(-)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
index ae770d75fa..080ba5384b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
@@ -54,7 +54,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("partylinkmassesdata")
public Result partyLinkMassesData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertPartyLinkMassesData(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertPartyLinkMassesData(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -69,7 +70,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("meetdata")
public Result meetData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertPartyBranchData(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertPartyBranchData(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -84,7 +86,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("orgrankdata")
public Result orgRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertOrgRankData(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertOrgRankData(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -99,7 +102,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("governrankdata")
public Result governRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertGovernRankData(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertGovernRankData(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -114,7 +118,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("eventdata")
public Result eventData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertEventData(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertEventData(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -129,7 +134,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("difficultydata")
public Result difficultyData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertDifficultyData(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertDifficultyData(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -144,7 +150,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("cpcbasedata")
public Result cpcbaseData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertCpcbaseData(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertCpcbaseData(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -159,7 +166,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("indexdatamonthly")
public Result indexDataMonthly(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertIndexDataMonthly(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertIndexDataMonthly(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
// --
@@ -176,7 +184,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("indexdatayearly")
public Result indexDataYearly(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertIndexDataYearly(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertIndexDataYearly(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -191,7 +200,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("customerdept")
public Result customerDept(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertCustomerDept(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertCustomerDept(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -206,7 +216,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("customergrid")
public Result customerGrid(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertCustomerGrid(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertCustomerGrid(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -221,7 +232,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("customeragency")
public Result customerAgency(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertCustomerAgency(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertCustomerAgency(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -236,7 +248,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("usertotaldata")
public Result userTotalData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertUserTotalData(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertUserTotalData(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -251,7 +264,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("userjoin")
public Result userJoin(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertUserJoin(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertUserJoin(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
/**
@@ -266,6 +280,7 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("pioneerdata")
public Result pioneerData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) {
- return screenCollService.insertPioneerData(formDTO, externalAppRequestParam.getCustomerId());
+ screenCollService.insertPioneerData(formDTO, externalAppRequestParam.getCustomerId());
+ return new Result();
}
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
index 4670c31fa1..8ee702178d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
@@ -4,7 +4,12 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.screencoll.form.*;
import java.util.List;
-
+/**
+ * 大屏数据采集api
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/18 10:25
+ */
public interface ScreenCollService {
/**
@@ -31,7 +36,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertPartyLinkMassesData(List formDTO, String customerId);
+ void insertPartyLinkMassesData(List formDTO, String customerId);
/**
* 7、基层党建-建设情况数据（支部、联建、志愿）
@@ -44,7 +49,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertPartyBranchData(List formDTO, String customerId);
+ void insertPartyBranchData(List formDTO, String customerId);
/**
* 6、党建引领-组织排行
@@ -57,7 +62,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertOrgRankData(List formDTO, String customerId);
+ void insertOrgRankData(List formDTO, String customerId);
/**
* 5、基层治理-治理能力数据
@@ -70,7 +75,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertGovernRankData(List formDTO, String customerId);
+ void insertGovernRankData(List formDTO, String customerId);
/**
* 4、事件数据
@@ -83,7 +88,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertEventData(List formDTO, String customerId);
+ void insertEventData(List formDTO, String customerId);
/**
* 3、难点赌点
@@ -96,7 +101,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertDifficultyData(List formDTO, String customerId);
+ void insertDifficultyData(List formDTO, String customerId);
/**
* 2、党员基本情况
@@ -109,7 +114,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertCpcbaseData(List formDTO, String customerId);
+ void insertCpcbaseData(List formDTO, String customerId);
/**
* 1、指数_按月统计
@@ -122,7 +127,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- Result insertIndexDataMonthly(List