新增fact_origin_project_category_daily

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactOrginProjectCategoryDao.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.stats;
+package com.epmet.dao.evaluationindex.extract;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.stats.FactOrginProjectCategoryEntity;
+import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since v1.0.0 2021-03-19
  */
 @Mapper
-public interface FactOrginProjectCategoryDao extends BaseDao<FactOrginProjectCategoryEntity> {
+public interface FactOriginProjectCategoryDailyDao extends BaseDao<FactOriginProjectCategoryDailyEntity> {
 	
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactOrginProjectCategoryEntity.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectCategoryDailyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity.stats;
+package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -30,8 +30,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("fact_orgin_project_category")
-public class FactOrginProjectCategoryEntity extends BaseEpmetEntity {
+@TableName("fact_origin_project_category_daily")
+public class FactOriginProjectCategoryDailyEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactOrginProjectCategoryService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.stats;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.entity.stats.FactOrginProjectCategoryEntity;
+import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity;
 
 /**
  * 项目所属分类表
@@ -26,6 +26,6 @@ import com.epmet.entity.stats.FactOrginProjectCategoryEntity;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-03-19
  */
-public interface FactOrginProjectCategoryService extends BaseService<FactOrginProjectCategoryEntity> {
-
+public interface FactOriginProjectCategoryDailyService extends BaseService<FactOriginProjectCategoryDailyEntity> {
+    //todo 将epmet_gov_project库中的项目分类信息（project_category）同步到统计库epmet_data_statistical
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java

@@ -46,7 +46,8 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
     private GroupExtractService groupExtractService;
     @Autowired
     private DimCustomerPartymemberService dimCustomerPartymemberService;
-
+    @Autowired
+    private FactOriginProjectCategoryDailyService originProjectCategoryDailyService;
 
     @Override
     public void extractAll(ExtractOriginFormDTO extractOriginFormDTO) {
@@ -200,6 +201,8 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
                 } catch (Exception e) {
                     log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
                 }
+                //todo 新增项目分类抽取 shaowen
+                // originProjectCategoryDailyService.xxxx();
             } else {
                 try {
                     for (int i = 0; i < finalDaysBetween.size(); i++) {
@@ -219,6 +222,8 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
                 } catch (Exception e) {
                     log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
                 }
+                //todo 新增项目分类抽取 shaowen
+                // originProjectCategoryDailyService.xxxx();
             }
         });
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactOrginProjectCategoryServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java

@@ -15,12 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.stats.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.dao.stats.FactOrginProjectCategoryDao;
-import com.epmet.entity.stats.FactOrginProjectCategoryEntity;
-import com.epmet.service.stats.FactOrginProjectCategoryService;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.evaluationindex.extract.FactOriginProjectCategoryDailyDao;
+import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectCategoryDailyService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -30,6 +32,7 @@ import org.springframework.stereotype.Service;
  * @since v1.0.0 2021-03-19
  */
 @Service
-public class FactOrginProjectCategoryServiceImpl extends BaseServiceImpl<FactOrginProjectCategoryDao, FactOrginProjectCategoryEntity> implements FactOrginProjectCategoryService {
+@DataSource(DataSourceConstant.STATS)
+public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<FactOriginProjectCategoryDailyDao, FactOriginProjectCategoryDailyEntity> implements FactOriginProjectCategoryDailyService {
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactOrginProjectCategoryDao.xml → epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.stats.FactOrginProjectCategoryDao">
+<mapper namespace="com.epmet.dao.evaluationindex.extract.FactOriginProjectCategoryDailyDao">