错误修改

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -17,6 +17,7 @@ import java.util.List;
  * @Date: 2020-08-20 10:05
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class FactIndexCollectServiceImpl implements FactIndexCollectService {
 
     @Autowired

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/IndexDictServiceImpl.java

@@ -17,7 +17,9 @@
 
 package com.epmet.service.evaluationindex.screen.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.IndexDictDao;
 import com.epmet.entity.evaluationindex.screen.IndexDictEntity;
 import com.epmet.service.evaluationindex.screen.IndexDictService;
@@ -32,6 +34,7 @@ import java.util.Collection;
  * @since v1.0.0 2020-08-19
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class IndexDictServiceImpl extends BaseServiceImpl<IndexDictDao, IndexDictEntity> implements IndexDictService {
 
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/IndexGroupDetailServiceImpl.java

@@ -17,9 +17,11 @@
 
 package com.epmet.service.evaluationindex.screen.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.IndexGroupDetailDao;
 import com.epmet.entity.evaluationindex.screen.IndexGroupDetailEntity;
 import com.epmet.service.evaluationindex.screen.IndexGroupDetailService;
@@ -34,6 +36,7 @@ import java.util.List;
  * @since v1.0.0 2020-08-19
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class IndexGroupDetailServiceImpl extends BaseServiceImpl<IndexGroupDetailDao, IndexGroupDetailEntity> implements IndexGroupDetailService {
 
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/IndexGroupDetailTemplateServiceImpl.java

@@ -17,7 +17,9 @@
 
 package com.epmet.service.evaluationindex.screen.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.IndexGroupDetailTemplateDao;
 import com.epmet.entity.evaluationindex.screen.IndexGroupDetailTemplateEntity;
 import com.epmet.service.evaluationindex.screen.IndexGroupDetailTemplateService;
@@ -32,6 +34,7 @@ import java.util.Collection;
  * @since v1.0.0 2020-08-19
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class IndexGroupDetailTemplateServiceImpl extends BaseServiceImpl<IndexGroupDetailTemplateDao, IndexGroupDetailTemplateEntity> implements IndexGroupDetailTemplateService {
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/IndexGroupServiceImpl.java

@@ -17,10 +17,12 @@
 
 package com.epmet.service.evaluationindex.screen.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.UniqueIdGenerator;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.IndexGroupDao;
 import com.epmet.dao.evaluationindex.screen.IndexGroupDetailDao;
 import com.epmet.dao.evaluationindex.screen.IndexGroupDetailTemplateDao;
@@ -51,6 +53,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class IndexGroupServiceImpl extends BaseServiceImpl<IndexGroupDao, IndexGroupEntity> implements IndexGroupService {
 @Autowired
 private IndexGroupTemplateDao indexGroupTemplateDao;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/IndexGroupTemplateServiceImpl.java

@@ -17,7 +17,9 @@
 
 package com.epmet.service.evaluationindex.screen.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.IndexGroupTemplateDao;
 import com.epmet.entity.evaluationindex.screen.IndexGroupTemplateEntity;
 import com.epmet.service.evaluationindex.screen.IndexGroupTemplateService;
@@ -32,6 +34,7 @@ import java.util.Collection;
  * @since v1.0.0 2020-08-19
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class IndexGroupTemplateServiceImpl extends BaseServiceImpl<IndexGroupTemplateDao, IndexGroupTemplateEntity> implements IndexGroupTemplateService {
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCollServiceImpl.java

@@ -43,6 +43,7 @@ import java.util.List;
  * @since v1.0.0 2020-05-11
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class ScreenCollServiceImpl implements ScreenCollService {
 
 	@Autowired

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml

@@ -26,7 +26,7 @@
             and INDEX_CODE = #{indexCode,jdbcType=VARCHAR}
     </delete>
 
-    <select id="getPartScore" resultType="com.epmet.entity.indexscore.CpcScoreEntity">
+    <select id="getPartScore" resultType="com.epmet.entity.evaluationindex.indexcal.CpcScoreEntity">
         select
             CUSTOMER_ID,AGENCY_ID,GRID_ID,YEAR_ID,MONTH_ID,USER_ID,SCORE,INDEX_CODE FROM fact_index_cpc_score
         WHERE