Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java

@@ -0,0 +1,136 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.extract.form.ExtractFormDTO;
+import com.epmet.service.evaluationindex.extract.*;
+import com.epmet.util.DimIdGenerator;
+import org.apache.commons.lang3.StringUtils;
+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.Date;
+
+
+/**
+ * 原始数据清洗
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/9/15 11:06
+ */
+@RestController
+@RequestMapping("factorigin")
+public class FactOriginExtractController {
+    @Autowired
+    private FactOriginExtractService factOriginExtractService;
+    @Autowired
+    private IssueExtractService issueExtractService;
+    @Autowired
+    private FactOriginTopicMainDailyService factOriginTopicMainDailyService;
+    @Autowired
+    private ProjectExtractService projectExtractService;
+    @Autowired
+    private GroupExtractService groupExtractService;
+
+    /**
+     * desc:抽取业务数据到统计库
+     *
+     * @param extractFormDTO 默认统计前一天
+     * @return
+     */
+    @PostMapping("extractall")
+    public Result extractAll(@RequestBody ExtractFormDTO extractFormDTO) {
+        if (StringUtils.isNotBlank(extractFormDTO.getStartDate()) && StringUtils.isNotBlank(extractFormDTO.getEndDate())) {
+            Date startDate = DateUtils.stringToDate(extractFormDTO.getStartDate(), "yyyyMMdd");
+            Date endDate = DateUtils.stringToDate(extractFormDTO.getEndDate(), "yyyyMMdd");
+            do {
+                String dateDimId = DimIdGenerator.getDateDimId(startDate);
+                extractFormDTO.setDateId(dateDimId);
+                factOriginExtractService.extractAll(extractFormDTO);
+                startDate = DateUtils.addDateDays(DateUtils.stringToDate(extractFormDTO.getStartDate(), "yyyyMMdd"), 1);
+            } while (endDate.compareTo(startDate) >= 0);
+        } else {
+            factOriginExtractService.extractAll(extractFormDTO);
+        }
+        return new Result();
+    }
+
+
+    /**
+     * @param extractFormDTO
+     * @Description 议题抽取(main)
+     * @author zxc
+     * @date 2020/9/15 2:02 下午
+     */
+    @PostMapping("issueextractmain")
+    public Result issueExtractMain(@RequestBody ExtractFormDTO extractFormDTO) {
+        ValidatorUtils.validateEntity(extractFormDTO, ExtractFormDTO.ExtractForm.class);
+        issueExtractService.issueExtractMain(extractFormDTO);
+        return new Result();
+    }
+
+    /**
+     * @param extractFormDTO
+     * @Description 议题抽取(log)
+     * @author zxc
+     * @date 2020/9/16 9:41 上午
+     */
+    @PostMapping("issueextractlog")
+    public Result issueExtractLog(@RequestBody ExtractFormDTO extractFormDTO) {
+        ValidatorUtils.validateEntity(extractFormDTO, ExtractFormDTO.ExtractForm.class);
+        issueExtractService.issueExtractLog(extractFormDTO);
+        return new Result();
+    }
+
+    /**
+     * @param extractFormDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @description 话题 (fact_origin_topic_main_daily	话题主表_日统计  fact_origin_topic_log_daily 话题明细_日统计)
+     * @Date 2020/9/15 13:39
+     **/
+    @PostMapping("topic")
+    public Result topicDataCleaning(@RequestBody ExtractFormDTO extractFormDTO) {
+        if (StringUtils.isNotBlank(extractFormDTO.getCustomerId()) && StringUtils.isNotBlank(extractFormDTO.getDateId())) {
+            factOriginTopicMainDailyService.topicCleaning(extractFormDTO);
+        }
+        return new Result();
+    }
+
+    @PostMapping("project")
+    public Result projectData(@RequestBody ExtractFormDTO extractFormDTO) {
+        projectExtractService.saveOriginProjectDaily(extractFormDTO);
+        return new Result();
+    }
+
+    /**
+     * @param param
+     * @return
+     * @Description 项目节点历时数据清洗
+     * @author wangc
+     * @date 2020.09.20 16:11
+     **/
+    @PostMapping("projectorgperiodcleanning")
+    public Result projectOrgPeriodCleaning(@RequestBody ExtractFormDTO param) {
+        projectExtractService.extractProjectPeriodData(param);
+        return new Result();
+    }
+
+    /**
+     * @param
+     * @return
+     * @Description 小组数据清洗
+     * @author wangc
+     * @date 2020.09.20 16:11
+     **/
+    @PostMapping("groupdatacleaning")
+    public Result groupDataCleaning(@RequestBody ExtractFormDTO param) {
+        groupExtractService.extractGroupData(param);
+        return new Result();
+    }
+}
+

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexOriginExtractController.java

@@ -1,8 +1,8 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.extract.form.ExtractIndexFormDTO;
+import com.epmet.dto.extract.form.ExtractFormDTO;
-import com.epmet.service.evaluationindex.extract.dataToIndex.IndexOriginExtractService;
+import com.epmet.service.evaluationindex.extract.FactOriginExtractService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2020/9/15 11:06
  */
 @RestController
-@RequestMapping("factorigin")
+@RequestMapping("indexorigin")
 public class IndexOriginExtractController {
     @Autowired
-    private IndexOriginExtractService indexOriginExtractService;
+    private FactOriginExtractService factOriginExtractService;
 
 
     /**
@@ -30,8 +30,8 @@ public class IndexOriginExtractController {
      * @return
      */
     @PostMapping("extractall")
-    public Result extractAll(@RequestBody ExtractIndexFormDTO extractFormDTO) {
+    public Result extractAll(@RequestBody ExtractFormDTO extractFormDTO) {
-        indexOriginExtractService.indexOriginExtractAll(extractFormDTO);
+        factOriginExtractService.extractAll(extractFormDTO);
         return new Result();
     }
 }

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

@@ -7,6 +7,7 @@ import com.epmet.dto.extract.form.ExtractIndexFormDTO;
 import com.epmet.service.evaluationindex.extract.CalCpcIndexService;
 import com.epmet.service.evaluationindex.extract.CalGridIndexService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.IndexOriginExtractService;
+import com.epmet.service.evaluationindex.indexcoll.IndexCollStreetService;
 import com.epmet.service.stats.DimCustomerService;
 import com.epmet.util.DimIdGenerator;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -39,6 +40,8 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
     private CalGridIndexService calGridIndexService;
     @Autowired
     private DimCustomerService dimCustomerService;
+    @Autowired
+    private IndexCollStreetService indexCollStreetService;
 
     /**
      * desc：从统计库对象抽取指标数据
@@ -100,6 +103,11 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             } catch (Exception e) {
                 log.error("抽取【网格服务能力数据】发生异常,参数:" + JSON.toJSONString(param), e);
             }
+            try{
+                indexCollStreetService.saveStreetAbility(customerId, monthId);
+            }catch (Exception e){
+                log.error("抽取【街道治理能力-街道党建能力】发生异常,参数:" + JSON.toJSONString(param), e);
+            }
         });
     }
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/IndexOriginExtractTask.java

@@ -2,8 +2,8 @@ package com.epmet.task;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.extract.form.ExtractFormDTO;
+import com.epmet.dto.extract.form.ExtractIndexFormDTO;
-import com.epmet.service.FactOriginExtractTaskService;
+import com.epmet.service.IndexOriginExtractTaskService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,17 +18,17 @@ public class IndexOriginExtractTask implements ITask {
 	private Logger logger = LoggerFactory.getLogger(getClass());
 
 	@Autowired
-	private FactOriginExtractTaskService factOriginExtractTaskService;
+	private IndexOriginExtractTaskService indexOriginExtractTaskService;
 
 
 	@Override
 	public void run(String params) {
 		logger.info("indexOriginExtractTask定时任务正在执行，参数为：{}", params);
-		ExtractFormDTO formDTO = new ExtractFormDTO();
+		ExtractIndexFormDTO formDTO = new ExtractIndexFormDTO();
 		if (StringUtils.isNotBlank(params)) {
-			formDTO = JSON.parseObject(params, ExtractFormDTO.class);
+			formDTO = JSON.parseObject(params, ExtractIndexFormDTO.class);
 		}
-		Result result = factOriginExtractTaskService.factOriginExtractJob(formDTO);
+		Result result = indexOriginExtractTaskService.indexOriginExtractJob(formDTO);
 		if (result.success()) {
 			logger.info("indexOriginExtractTask定时任务执行成功");
 		} else {