diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java
index 543b3865b3..b3a184947f 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java
@@ -17,4 +17,8 @@ public interface DataSourceConstant {
String EPMET_HEART="epmetHeart";
String EPMET_POINT = "epmetPoint";
String OPER_CUSTOMIZE="operCustomize";
+ /**
+ * 济南的中间数据库
+ */
+ String JI_NAN = "jinan";
}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml
index 9fb7b95d22..8909b49154 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml
@@ -85,6 +85,12 @@
2.0.0
compile
+
+ com.epmet
+ epmet-commons-dynamic-datasource
+ 2.0.0
+ compile
+
@@ -273,10 +279,18 @@
-
+
- sync_gridinfo_pingyin
- xvfuz2lz
+ epmet_open_data_user
+ EpmEtOpEndAtArw_)$
+
+
+
+
+
+ sync_gridinfo_pingyin
+ xvfuz2lz
+
0
172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
index df1d77eca2..d5a2e15b8a 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
@@ -1,11 +1,13 @@
package com.epmet.opendata.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.utils.StrUtil;
+import com.epmet.constant.DataSourceConstant;
import com.epmet.dto.basereport.form.EventInfoFormDTO;
import com.epmet.dto.basereport.result.EventInfoResultDTO;
import com.epmet.feign.DataStatisticalOpenFeignClient;
@@ -32,6 +34,7 @@ import java.util.stream.Collectors;
*/
@Slf4j
@Service
+@DataSource(DataSourceConstant.JI_NAN)
public class EventreportPingyinServiceImpl extends BaseServiceImpl implements EventreportPingyinService {
@Resource
private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
index 2f54aecee6..80409d4ac5 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
@@ -1,11 +1,13 @@
package com.epmet.opendata.service.impl;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.DataSourceConstant;
import com.epmet.constant.IndexCalConstant;
import com.epmet.dto.org.result.CustomerAgencyDTO;
import com.epmet.dto.org.result.CustomerGridDTO;
@@ -33,6 +35,7 @@ import java.util.List;
* @since v1.0.0 2022-07-22
*/
@Service
+@DataSource(DataSourceConstant.JI_NAN)
public class GridInfoPingyinServiceImpl extends BaseServiceImpl implements GridInfoPingyinService {
@Autowired
private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
index 6c58d2565a..2a4317feac 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
@@ -1,9 +1,11 @@
package com.epmet.opendata.service.impl;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.DataSourceConstant;
import com.epmet.dto.form.CustomerGridStaffListFormDTO;
import com.epmet.dto.form.GridStaffUploadtFormDTO;
import com.epmet.dto.result.CustomerGridStaffListResultDTO;
@@ -36,6 +38,7 @@ import java.util.stream.Collectors;
*/
@Service
@Slf4j
+@DataSource(DataSourceConstant.JI_NAN)
public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl implements GridstaffInfoPingyinService {
@Autowired
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml
index 0238d28963..814e472385 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml
@@ -72,6 +72,13 @@ spring:
baseline-on-migrate: true
baseline-version: 0
+dynamic:
+ datasource:
+ jinan:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: @datasource.druid.org.url@
+ username: @datasource.druid.org.username@
+ password: @datasource.druid.org.password@
management:
endpoints: