From 4b96b203579b8775b48df221817f67f12a5a4b39 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 24 Aug 2020 10:25:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=9B=B8=E5=85=B3=E7=9A=84=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/enums/DataSourceEnum.java | 3 + .../resources/db/migration/V0.0.3__extApp.sql | 56 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.3__extApp.sql diff --git a/epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/enums/DataSourceEnum.java b/epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/enums/DataSourceEnum.java index 7a3632db54..bca4441435 100644 --- a/epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/enums/DataSourceEnum.java +++ b/epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/enums/DataSourceEnum.java @@ -11,8 +11,11 @@ public enum DataSourceEnum { DATA_REPORT_FAKE("data-report-server", "fake", "statsDisplay"), ; + // 服务名 private String serviceName; + // 数据源标记 private String flag; + // 数据源，跟yml中的数据源名称保持一致 private String dataSourceName; DataSourceEnum(String serviceName, String flag, String dataSourceName) { diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.3__extApp.sql b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.3__extApp.sql new file mode 100644 index 0000000000..8faeaf51f9 --- /dev/null +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.3__extApp.sql @@ -0,0 +1,56 @@ +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +CREATE TABLE `external_app` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `APP_NAME` varchar(64) NOT NULL COMMENT 'APP名字', + `CUSTOMER_ID` varchar(64) DEFAULT NULL COMMENT '客户ID', + `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', + `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='外部应用列表'; + +CREATE TABLE `external_app_secret` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `APP_ID` varchar(64) NOT NULL COMMENT 'APP ID', + `SECRET` varchar(255) NOT NULL COMMENT '秘钥', + `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', + `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='外部应用秘钥列表'; + +CREATE TABLE `external_customer` ( + `ID` varchar(64) NOT NULL COMMENT '客户ID', + `CUSTOMER_NAME` varchar(255) NOT NULL COMMENT '客户名称', + `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', + `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +BEGIN; +INSERT INTO `external_app` VALUES ('227fb75ae4baa820755aaf43bf7f0a69', '便捷通行', '7e07311f4c4a56c65fa1dd5d16e0b743', 0, 0, 'wxz', '2020-08-18 13:39:32', 'wxz', '2020-08-18 13:39:37'); +INSERT INTO `external_app` VALUES ('acc4ad66c82a7b46e741364b4c62dce2', '市北大屏', 'b09527201c4409e19d1dbc5e3c3429a1', 0, 0, 'wxz', '2020-08-18 13:39:32', 'wxz', '2020-08-18 13:39:37'); +INSERT INTO `external_app` VALUES ('dbfad3110c124c89948d16e8b06a8888', '数据采集', 'b09527201c4409e19d1dbc5e3c3429a1', 0, 0, 'wxz', '2020-08-18 13:39:32', 'wxz', '2020-08-18 13:39:37'); + +INSERT INTO `external_app_secret` VALUES ('44ed58fd256ae51b473b6ff8555c7131', '227fb75ae4baa820755aaf43bf7f0a69', 'a44a4fc41eb513cd93a0f957db3ef764e189e6aebb2369471396a8c3b32f61ed', 0, 0, 'wxz', '2020-08-18 13:40:03', 'xz', '2020-08-18 13:40:07'); +INSERT INTO `external_app_secret` VALUES ('95d16f5fe76d1139023107476871a077', 'dbfad3110c124c89948d16e8b06a8888', '0f7e983b017ac180b0da1877abe11bab22ab6288580e64d39b5e415dbb0fcc8f', 0, 0, 'wxz', '2020-08-18 13:40:03', 'xz', '2020-08-18 13:40:07'); +INSERT INTO `external_app_secret` VALUES ('9ca67b7b02dc2e80e9ba6ba4793aea54', 'acc4ad66c82a7b46e741364b4c62dce2', '612d304095c50369c3ef06e490f05779eeb8f19ff16566c73aeafafc5fa01970', 0, 0, 'wxz', '2020-08-18 13:40:03', 'xz', '2020-08-18 13:40:07'); + +INSERT INTO `external_customer` VALUES ('7e07311f4c4a56c65fa1dd5d16e0b743', '外挂功能', 0, 0, 'wxz', '2020-08-19 14:21:52', 'APP_USER', '2020-08-21 15:23:35'); +INSERT INTO `external_customer` VALUES ('b09527201c4409e19d1dbc5e3c3429a1', '市北党建', 0, 0, 'wxz', '2020-08-19 14:21:52', 'wxz', '2020-08-19 14:21:58'); + +COMMIT; + +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file From d199f6e3f9a3d24f0b463fb12e551f4860003f54 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 24 Aug 2020 13:37:33 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=87=E9=9B=86=E5=92=8C=E6=8C=87=E6=A0=87=E9=87=87=E9=9B=86?= =?UTF-8?q?=20=20=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FactIndexCollectServiceImpl.java | 10 ++++++++++ .../screen/impl/ScreenCollServiceImpl.java | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java index ced6e555e2..cd767ff580 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java @@ -1,6 +1,8 @@ package com.epmet.service.indexcollect.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.constant.DataSourceConstant; import com.epmet.dao.indexcoll.*; import com.epmet.dto.indexcollect.form.*; import com.epmet.service.indexcollect.FactIndexCollectService; @@ -34,6 +36,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService { @Autowired private FactIndexGovrnAblityDeptMonthlyDao factIndexGovrnAblityDeptMonthlyDao; + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertGridPartyMemberData(List formDTO, String customerId) { @@ -47,6 +50,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertGridPartyAbility(List formDTO, String customerId) { @@ -60,6 +64,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertOrgPartyAbility(List formDTO, String customerId) { @@ -77,6 +82,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertGridServiceAbility(List formDTO, String customerId) { @@ -90,6 +96,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertOrgServiceAbility(List formDTO, String customerId) { @@ -107,6 +114,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertGridGovrnAbility(List formDTO, String customerId) { @@ -120,6 +128,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertOrgGovrnAbility(List formDTO, String customerId) { @@ -137,6 +146,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertDeptGovrnAbility(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 e67ebf4b60..b5e65fd193 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 @@ -17,10 +17,12 @@ package com.epmet.service.screen.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CompareConstant; +import com.epmet.constant.DataSourceConstant; import com.epmet.dao.screen.*; import com.epmet.dto.screencoll.form.*; import com.epmet.entity.screen.ScreenEventImgDataEntity; @@ -78,6 +80,8 @@ public class ScreenCollServiceImpl implements ScreenCollService { private ScreenPioneerDataDao screenPioneerDataDao; @Autowired private ScreenIndexDataYearlyDao screenIndexDataYearlyDao; + + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertPartyUserRankData(List formDTO,String customerId) { @@ -92,6 +96,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertPartyLinkMassesData(List formDTO, String customerId) { @@ -106,6 +111,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertPartyBranchData(List formDTO, String customerId) { @@ -123,6 +129,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertOrgRankData(List formDTO, String customerId) { @@ -140,6 +147,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertGovernRankData(List formDTO, String customerId) { @@ -157,6 +165,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertEventData(List formDTO, String customerId) { @@ -184,6 +193,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertDifficultyData(List formDTO, String customerId) { @@ -196,6 +206,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertCpcbaseData(List formDTO, String customerId) { @@ -210,6 +221,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertIndexDataMonthly(List formDTO, String customerId) { @@ -227,6 +239,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertIndexDataYearly(List formDTO, String customerId) { @@ -243,6 +256,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertCustomerDept(List formDTO, String customerId) { @@ -257,6 +271,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertCustomerGrid(List formDTO, String customerId) { @@ -271,6 +286,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertCustomerAgency(List formDTO, String customerId) { @@ -285,6 +301,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertUserTotalData(List formDTO, String customerId) { @@ -299,6 +316,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertUserJoin(List formDTO, String customerId) { @@ -413,6 +431,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { } } + @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true) @Override @Transactional(rollbackFor = Exception.class) public void insertPioneerData(List formDTO, String customerId) { From 892cde7e5432ff2ac638415ac00071b3c91dad5f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 24 Aug 2020 13:40:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3=20@Dat?= =?UTF-8?q?aSource?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datareport/service/screen/impl/AgencyServiceImpl.java | 4 ++++ .../service/screen/impl/DistributionServiceImpl.java | 7 +++++++ .../datareport/service/screen/impl/IndexServiceImpl.java | 7 ++++++- .../service/screen/impl/PartyMemberLeadServiceImpl.java | 5 +++++ 4 files changed, 22 insertions(+), 1 deletion(-) 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 432ae0059a..9ca543828c 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,7 +1,9 @@ package com.epmet.datareport.service.screen.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.extappauth.bean.ExternalAppRequestParam; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.constant.DataSourceConstant; import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao; import com.epmet.datareport.dao.screen.ScreenCustomerGridDao; import com.epmet.screen.dto.form.CompartmentFormDTO; @@ -35,6 +37,7 @@ public class AgencyServiceImpl implements AgencyService { * @author zxc * @date 2020/8/18 2:04 下午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public TreeResultDTO tree(ExternalAppRequestParam externalAppRequestParam) { // 1. 查询客户根组织ID @@ -71,6 +74,7 @@ public class AgencyServiceImpl implements AgencyService { * @author zxc * @date 2020/8/18 2:33 下午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public CompartmentResultDTO compartment(CompartmentFormDTO compartmentFormDTO) { CompartmentResultDTO agencyAreaInfo = screenCustomerAgencyDao.getAgencyAreaInfo(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 a1d9025ead..97a627fb23 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,6 +1,8 @@ package com.epmet.datareport.service.screen.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.constant.DataSourceConstant; import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao; import com.epmet.datareport.dao.screen.ScreenCustomerGridDao; import com.epmet.datareport.dao.screen.ScreenEventDataDao; @@ -40,6 +42,7 @@ public class DistributionServiceImpl implements DistributionService { * @author zxc * @date 2020/8/18 10:59 上午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public List branch(BranchFormDTO formDTO) { List branchResultDTOS = screenCustomerGridDao.selectBranch(formDTO.getAgencyId()); @@ -52,6 +55,7 @@ public class DistributionServiceImpl implements DistributionService { * @author zxc * @date 2020/8/18 11:10 上午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public UserResultDTO user(UserFormDTO userFormDTO) { UserResultDTO userResult = new UserResultDTO(); @@ -76,6 +80,7 @@ public class DistributionServiceImpl implements DistributionService { * @author zxc * @date 2020/8/18 11:20 上午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public ParymemberResultDTO parymember(ParymemberFormDTO parymemberFormDTO) { ParymemberResultDTO parymemberResult = new ParymemberResultDTO(); @@ -100,6 +105,7 @@ public class DistributionServiceImpl implements DistributionService { * @author zxc * @date 2020/8/19 1:29 下午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public List project(ProjectFormDTO projectFormDTO) { List projectResultDTOS = screenEventDataDao.selectEvent(projectFormDTO.getAgencyId()); @@ -115,6 +121,7 @@ public class DistributionServiceImpl implements DistributionService { * @author zxc * @date 2020/8/19 1:52 下午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public TopProfileResultDTO topProfile(TopProfileFormDTO topProfileFormDTO) { TopProfileResultDTO topProfileResultDTO = screenUserTotalDataDao.selectTopProfile(topProfileFormDTO.getAgencyId()); 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 4b3bb3b350..e106a07d45 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,7 +1,9 @@ package com.epmet.datareport.service.screen.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.extappauth.bean.ExternalAppRequestParam; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.constant.DataSourceConstant; import com.epmet.datareport.dao.screen.ScreenIndexDataMonthlyDao; import com.epmet.datareport.dao.screen.ScreenIndexDataYearlyDao; import com.epmet.datareport.service.screen.IndexService; @@ -17,7 +19,6 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** @@ -42,6 +43,7 @@ public class IndexServiceImpl implements IndexService { * @author zxc * @date 2020/8/19 2:53 下午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public YearAverageIndexResultDTO yearAverageIndex(YearAverageIndexFormDTO yearAverageIndexFormDTO) { YearAverageIndexResultDTO yearAverageIndexResultDTO = screenIndexDataYearlyDao.selectYearAverageIndex(yearAverageIndexFormDTO.getAgencyId()); @@ -57,6 +59,7 @@ public class IndexServiceImpl implements IndexService { * @author zxc * @date 2020/8/19 3:17 下午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public MonthPieChartResultDTO monthPieChart(MonthPieChartFormDTO monthPieChartFormDTO) { MonthPieChartResultDTO monthPieChartResultDTO = screenIndexDataMonthlyDao.selectMonthPieChart(monthPieChartFormDTO.getAgencyId()); @@ -72,6 +75,7 @@ public class IndexServiceImpl implements IndexService { * @author zxc * @date 2020/8/19 5:27 下午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO, ExternalAppRequestParam externalAppRequestParam) { String customerId = externalAppRequestParam.getCustomerId(); @@ -117,6 +121,7 @@ public class IndexServiceImpl implements IndexService { * @author zxc * @date 2020/8/20 10:04 上午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public List subAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO) { LocalDate now = LocalDate.now().minusMonths(NumConstant.ONE); 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 7dee242571..b49d6ed1f9 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,7 +1,9 @@ package com.epmet.datareport.service.screen.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.constant.DataSourceConstant; import com.epmet.datareport.dao.screen.ScreenOrgRankDataDao; import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao; import com.epmet.datareport.dao.screen.ScreenPartyLinkMassesDataDao; @@ -58,6 +60,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { * @author zxc * @date 2020/8/20 1:56 下午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public FineExampleResultDTO fineExample(FineExampleFormDTO fineExampleFormDTO) { FineExampleResultDTO fineExampleResultDTO = screenPioneerDataDao.selectFineExample(fineExampleFormDTO.getAgencyId()); @@ -89,6 +92,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { * @author zxc * @date 2020/8/20 2:35 下午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public ContactMassLineChartResultDTO contactMassLineChart(ContactMassLineChartFormDTO contactMassLineChartFormDTO) { ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO(); @@ -119,6 +123,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { * @author zxc * @date 2020/8/20 3:19 下午 */ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public VolunteerServiceResultDTO volunteerService(VolunteerServiceFormDTO volunteerServiceFormDTO) { VolunteerServiceResultDTO result = new VolunteerServiceResultDTO(); From ed45452db5cd9db26df556452e718be1bd247d83 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 24 Aug 2020 13:48:56 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/screen/impl/PartyMemberLeadServiceImpl.java | 5 ----- 1 file changed, 5 deletions(-) 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 b49d6ed1f9..1757ca5062 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 @@ -24,11 +24,6 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; From 6bc0ab51e131f1f09b09c745ffa28c25b8f70f14 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 24 Aug 2020 14:09:39 +0800 Subject: [PATCH 5/6] =?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 --- .../dto/result/GovernCapacityResultDTO.java | 9 ++-- .../screen/GrassrootsPartyDevController.java | 1 - .../impl/GrassRootsGovernServiceImpl.java | 8 +-- .../impl/GrassrootsPartyDevServiceImpl.java | 50 ++----------------- .../src/main/resources/logback-spring.xml | 1 + .../mapper/screen/ScreenDifficultyDataDao.xml | 9 ++-- .../screen/ScreenPartyBranchDataDao.xml | 8 +-- .../screen/ScreenPartyUserRankDataDao.xml | 4 +- .../mapper/screen/ScreenUserJoinDao.xml | 2 +- .../mapper/screen/ScreenUserTotalDataDao.xml | 2 +- 10 files changed, 26 insertions(+), 68 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/GovernCapacityResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/GovernCapacityResultDTO.java index 0c96a83129..dd2c09cd94 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/GovernCapacityResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/GovernCapacityResultDTO.java @@ -3,6 +3,7 @@ package com.epmet.screen.dto.result; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; /** * @Description 治理能力查询结果dto @@ -22,20 +23,20 @@ public class GovernCapacityResultDTO implements Serializable { /** * 响应率 * */ - private Integer responseRatio; + private BigDecimal responseRatio; /** * 解决率 * */ - private Integer resolvedRatio; + private BigDecimal resolvedRatio; /** * 自治率 * */ - private Integer governRatio; + private BigDecimal governRatio; /** * 满意率 * */ - private Integer satisfactionRatio; + private BigDecimal satisfactionRatio; } 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 4aaac7a152..7c536869e9 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 @@ -3,7 +3,6 @@ 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.dao.screen.ScreenUserTotalDataDao; import com.epmet.datareport.service.screen.GrassrootsPartyDevService; import com.epmet.screen.dto.form.BranchBuildRankFormDTO; import com.epmet.screen.dto.form.BranchBuildTrendFormDTO; 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 13366615a6..7a41593d68 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 @@ -144,10 +144,10 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { orderList.forEach(o -> { GovernCapacityRankResultDTO rank = new GovernCapacityRankResultDTO(); rank.setAgencyName(o.getAgencyName()); - rank.setGovernRatio(convertPercentStr(new BigDecimal(o.getGovernRatio()))); - rank.setResolvedRatio(convertPercentStr(new BigDecimal(o.getResolvedRatio()))); - rank.setResponseRatio(convertPercentStr(new BigDecimal(o.getResponseRatio()))); - rank.setSatisfactionRatio(convertPercentStr(new BigDecimal(o.getSatisfactionRatio()))); + rank.setGovernRatio(convertPercentStr(o.getGovernRatio(),NumConstant.ONE)); + rank.setResolvedRatio(convertPercentStr(o.getResolvedRatio(),NumConstant.ONE)); + rank.setResponseRatio(convertPercentStr(o.getResponseRatio(),NumConstant.ONE)); + rank.setSatisfactionRatio(convertPercentStr(o.getSatisfactionRatio(),NumConstant.ONE)); result.add(rank); }); return result; 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 74fae27854..f37a0e7e99 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 @@ -63,7 +63,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService if(null == result.getPlatFormTotal() || NumConstant.ZERO == result.getPlatFormTotal()){ result.setPercentInPlatForm(convertPercentStr(BigDecimal.ZERO)); }else{ - result.setPercentInPlatForm(convertPercentStr(new BigDecimal(result.getPartyMemberTotal()/result.getPlatFormTotal()))); + result.setPercentInPlatForm(convertPercentStr(new BigDecimal((result.getPartyMemberTotal().doubleValue()/result.getPlatFormTotal().doubleValue())))); } return result; } @@ -124,7 +124,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService List numArray = new LinkedList<>(); BranchTrendSeriesDataResultDTO data = new BranchTrendSeriesDataResultDTO(); data.setName(issue); - if(null != issueYearlyDataList && issueYearlyDataList.isEmpty()){ + if(null != issueYearlyDataList && !issueYearlyDataList.isEmpty()){ monthMap.keySet().forEach( monthId ->{ Optional optional = issueYearlyDataList.stream().filter(yearly -> StringUtils.equals(monthId,yearly.getMonthId())).findAny(); @@ -139,6 +139,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService numArray.add(NumConstant.ZERO); } } + data.setData(numArray); dataArray.add(data); }); } @@ -237,51 +238,6 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService } - public static void main(String[] args) { - 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()))); - - 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)); - } - /** * @Description 得到上个月的monthId * @param diff --git a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml index bfbabc6259..08a6a198d1 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml @@ -144,6 +144,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 d772ebb7e2..ab381cebba 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 @@ -22,12 +22,13 @@ AND eve.DEL_FLAG = '0' WHERE diff.DEL_FLAG = '0' - AND diff.ORG_TYPE = 'agencyId' + AND diff.ORG_TYPE = 'agency' AND diff.ORG_ID = #{agencyId} ORDER BY - CASE #{type} WHEN 'timelongest' THEN diff.EVENT_COST_TIME DESC - WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT DESC - ELSE diss.EVENT_RE_ORG DESC END + CASE #{type} WHEN 'timelongest' THEN diff.EVENT_COST_TIME + WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT + ELSE diff.EVENT_RE_ORG END + DESC \ 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 a8af55a171..8fbf102170 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 @@ -6,7 +6,7 @@ SELECT MONTH_ID, - ISSUE_CATEGORY_NAME AS issue, + MEET_CATEGORY_NAME AS issue, CASE #{type} WHEN 'organize' THEN ORGANIZE_COUNT WHEN 'joinuser' THEN JOIN_USER_COUNT WHEN 'averagejoinuser' THEN AVERAGE_JOIN_USER_COUNT @@ -35,7 +35,7 @@ AND MONTH_ID = ]]> #{bottomMonthId} ORDER BY MONTH_ID DESC , - ISSUE_CATEGORY_NAME + MEET_CATEGORY_NAME @@ -50,7 +50,7 @@ DEL_FLAG = '0' AND ORG_TYPE = 'agency' - AND ORG_ID = #{agencyId} + AND PARENT_ID = #{agencyId} AND TYPE = #{category} 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 d798990b6b..66fb4d6a80 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 @@ -6,7 +6,7 @@ SELECT USER_ID, - concat( SURNAME, '*' ) AS NAME, + concat( surname, CASE char_length( NAME ) WHEN 1 THEN '*' WHEN 2 THEN '**' ELSE '***' END ) AS name, POINT_TOTAL AS point FROM screen_party_user_rank_data 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 cb10ed2c0e..8f17dc796a 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 @@ -7,7 +7,7 @@ \ No newline at end of file From a13898fdab45c95e1048cdf59048b12cfac1d848 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 24 Aug 2020 14:11:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BD=BF=E7=94=A8@DataSource?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/screen/impl/GrassRootsGovernServiceImpl.java | 7 +++++++ .../service/screen/impl/GrassrootsPartyDevServiceImpl.java | 6 ++++++ .../service/screen/impl/PartyMemberLeadServiceImpl.java | 2 ++ 3 files changed, 15 insertions(+) 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 7a41593d68..8b0db2c65a 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,7 +1,9 @@ package com.epmet.datareport.service.screen.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.constant.DataSourceConstant; import com.epmet.datareport.dao.screen.*; import com.epmet.datareport.service.screen.GrassRootsGovernService; import com.epmet.datareport.utils.DateUtils; @@ -50,6 +52,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { * @author wangc * @date 2020.08.20 11:16 **/ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public UserPointRankResultDTO userPointRank(AgencyAndNumFormDTO param) { //默认5 @@ -73,6 +76,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { * @author wangc * @date 2020.08.20 13:55 **/ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public List difficultProject(AgencyNumTypeParamFormDTO param) { if(null == param.getTopNum()){ @@ -93,6 +97,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { * @author wangc * @date 2020.08.20 14:37 **/ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public PublicPartiProfileResultDTO publicPartiProfile(AgencyFormDTO param) { @@ -114,6 +119,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { * @author wangc * @date 2020.08.20 15:32 **/ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public List publicPartiRank(AgencyAndNumFormDTO param) { if(null == param.getTopNum()) param.setTopNum(NumConstant.TWO); @@ -132,6 +138,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { * @author wangc * @date 2020.08.20 17:46 **/ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public List governCapacityRank(AgencyAndNumFormDTO param) { if(null == param.getTopNum()) param.setTopNum(NumConstant.FIVE); 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 f37a0e7e99..51a7a49ff6 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,6 +1,8 @@ package com.epmet.datareport.service.screen.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.constant.DataSourceConstant; import com.epmet.datareport.dao.screen.ScreenCpcBaseDataDao; import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao; import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao; @@ -50,6 +52,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService * @author wangc * @date 2020.08.18 14:58 **/ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public PartymemberPercentResultDTO partymemberBaseInfo(ParymemberFormDTO param) { @@ -76,6 +79,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService * @author wangc * @date 2020.08.18 17:54 **/ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public PartymemberAgeDistributionResultDTO partymemberAgeDistribution(ParymemberFormDTO param) { return screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId()); @@ -89,6 +93,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService * @author wangc * @date 2020.08.19 11:02 **/ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public BranchBuildTrendResultDTO branchBuildTrend(BranchBuildTrendFormDTO param) { if(StringUtils.equals(ModuleConstant.PARAM_BRANCH_CATEGORY_UNION,param.getCategory())){ @@ -158,6 +163,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService * @author wangc * @date 2020.08.19 15:25 **/ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public BranchBuildRankResultDTO branchBuildRank(BranchBuildRankFormDTO param) { if(StringUtils.equals(ModuleConstant.PARAM_BRANCH_CATEGORY_UNION,param.getCategory())){ 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 1757ca5062..b1cecb92bb 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 @@ -174,6 +174,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { * @author wangc * @date 2020.08.21 11:05 **/ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public List advancedBranchRank(AgencyAndNumFormDTO param) { if(null == param.getTopNum()){ @@ -204,6 +205,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { * @author wangc * @date 2020.08.21 14:22 **/ + @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override public List advancedPartymemberRank(AgencyAndNumFormDTO param) { if(null == param.getTopNum()) param.setTopNum(NumConstant.TEN);