Merge remote-tracking branch 'remotes/origin/dev_shibei_task' into shibei_master

# Conflicts:
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java

.gitignore

@@ -0,0 +1,29 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+.idea/
+*.iml
+target/
+

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java

@@ -123,4 +123,5 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
      * @author sun
      */
     List<ResiEventReportOrgDTO> getEventOrgList(@Param("eventIds") List<String> eventIds);
+    List<ProjectCategoryTotalResultDTO> getCategoryCount(ProjectCategoryTotalFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -386,21 +386,6 @@
         GROUP BY pc.project_id
         ORDER BY p.created_time DESC
     </select>
-    <select id="getCategoryCount" resultType="com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO">
-        SELECT
-            LEFT(c.CATEGORY_CODE,#{categoryOneLength}) CATEGORY_CODE,
-            COUNT(DISTINCT c.PROJECT_ID) total
-        FROM
-            project_category c
-        LEFT JOIN project p ON  p.ID = c.PROJECT_ID
-        WHERE
-            p.ORG_ID_PATH LIKE concat(#{fullOrgIds},'%')
-            AND date_format(p.CREATED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
-            AND p.DEL_FLAG = '0'
-            AND c.DEL_FLAG = '0'
-        GROUP BY LEFT(c.CATEGORY_CODE,#{categoryOneLength})
-        ORDER BY total DESC
-    </select>
 
     <select id="getEventOrgList" resultType="com.epmet.dataaggre.dto.govproject.ResiEventReportOrgDTO">
         SELECT
@@ -416,5 +401,20 @@
             #{eventId}
         </foreach>
     </select>
+    <select id="getCategoryCount" resultType="com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO">
+        SELECT
+            LEFT(c.CATEGORY_CODE,#{categoryOneLength}) CATEGORY_CODE,
+            COUNT(DISTINCT c.PROJECT_ID) total
+        FROM
+            project_category c
+        LEFT JOIN project p ON  p.ID = c.PROJECT_ID
+        WHERE
+            p.ORG_ID_PATH LIKE concat(#{fullOrgIds},'%')
+            AND date_format(p.CREATED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
+            AND p.DEL_FLAG = '0'
+            AND c.DEL_FLAG = '0'
+        GROUP BY LEFT(c.CATEGORY_CODE,#{categoryOneLength})
+        ORDER BY total DESC
+    </select>
 
 </mapper>

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -23,6 +23,7 @@ import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -353,4 +354,15 @@ public interface DataStatisticalOpenFeignClient {
      */
     @PostMapping("/data/stats/demand/volunteer/daily")
     Result statsVolunteerDemandServicesDaily(@RequestParam(value = "customer-id", required = false) String customerId);
+
+    /**
+     * desc: 市北私有化部署需要 支持的任务之一
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LiuJanJun
+     * @date 2022/1/18 4:37 下午
+     */
+    @PostMapping("/data/stats/shibeiICJob/userPointAndProjectStatus/{bizType}")
+    Result userPointAndProjectStatus(@PathVariable("bizType") String biztype,@RequestBody ExtractOriginFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -339,4 +339,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result statsVolunteerDemandServicesDaily(String customerId) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "statsVolunteerDemandServicesDaily", customerId);
     }
+
+    @Override
+    public Result userPointAndProjectStatus(String biztype,ExtractOriginFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "userPointAndProjectStatus", biztype,formDTO);
+    }
 }

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

@@ -0,0 +1,106 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.enums.BizTypeEnum;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
+import com.epmet.service.StatsProjectService;
+import com.epmet.service.evaluationindex.extract.toscreen.ScreenGrassrootsGovernDataAbsorptionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * desc：市北数字社区 单独部署 job入口 【用户积分排名及项目状态数据】
+ */
+@RequestMapping("shibeiICJob")
+@RestController
+@Slf4j
+public class ShiBeiICJobController {
+    @Autowired
+    private ScreenGrassrootsGovernDataAbsorptionService screenGrassrootsGovernDataAbsorptionService;
+    @Autowired
+    private StatsProjectService statsProjectService;
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @PostMapping("userPointAndProjectStatus/{bizType}")
+    public Result<String> userPointAndProjectStatus(@PathVariable("bizType") String bizType, @RequestBody ExtractOriginFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getCustomerId())){
+            return new Result<String>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误cid不能为空");
+        }
+        long start = System.currentTimeMillis();
+        Set<String> result = new LinkedHashSet<>();
+        if (StringUtils.isNotBlank(formDTO.getStartDate()) && StringUtils.isNotBlank(formDTO.getEndDate())) {
+            List<String> daysBetween = DateUtils.getDaysBetween(formDTO.getStartDate(), formDTO.getEndDate());
+            daysBetween.forEach(d -> {
+                executeMethod(bizType, formDTO.getCustomerId(), d);
+                result.add(d);
+                redisUtils.hSet(RedisKeys.getBackDoorbizExcuteResult("userPointAndProjectStatus-"+bizType), formDTO.getCustomerId(), result, 3 * 24 * 60 * 60L);
+            });
+        } else {
+            if (StringUtils.isBlank(formDTO.getDateId())){
+                formDTO.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
+            }
+            executeMethod(bizType, formDTO.getCustomerId(), formDTO.getDateId());
+            result.add(formDTO.getDateId());
+            redisUtils.hSet(RedisKeys.getBackDoorbizExcuteResult("userPointAndProjectStatus-"+bizType), formDTO.getCustomerId(), result, 3 * 24 * 60 * 60L);
+        }
+        long end = System.currentTimeMillis();
+        long l = (end - start) / 1000;
+        return new Result<String>().ok("userPointAndProjectStatus耗时-"+bizType + l + "s");
+    }
+
+    private void executeMethod(String bizType, String customerId, String d) {
+        if (bizType.equals(BizTypeEnum.USER.getType())){
+            this.extractUserPointData(customerId, d);
+        }
+        if (bizType.equals(BizTypeEnum.PROJECT.getType())) {
+            this.agencyProjectStats(customerId, d);
+        }
+    }
+
+    /**
+     * @Author sun
+     * @Description 数据-项目-机关日(月)统计
+     **/
+    private Result agencyProjectStats(String customerId, String dateId) {
+        try {
+            if (StringUtils.isNotBlank(dateId)) {
+                dateId = DateUtils.format(DateUtils.parseDate(dateId, DateUtils.DATE_PATTERN_YYYYMMDD));
+            }
+            StatsFormDTO formDTO = new StatsFormDTO();
+            formDTO.setCustomerId(customerId);
+            formDTO.setDate(dateId);
+
+            statsProjectService.agencyProjectStats(formDTO);
+        } catch (Exception e) {
+            log.error("市北-项目状态数据写入失败，参数为：{}" + customerId + StrConstant.HYPHEN + dateId, e);
+        }
+        return new Result();
+    }
+
+    private void extractUserPointData(String customerId, String dateId) {
+        try {
+            //基层治理 - 热心市民 screen_party_user_rank_data
+            ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
+            param.setCustomerId(customerId);
+            param.setDateId(dateId);
+            screenGrassrootsGovernDataAbsorptionService.userScoreDataHub(param);
+        } catch (Exception e) {
+            log.error("市北-热心市民/党员得分数据写入失败，参数为：{}" + customerId + StrConstant.HYPHEN + dateId, e);
+        }
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.epmet.task.ic;
+
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.enums.BizTypeEnum;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import com.epmet.task.ITask;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * desc：数字社区私有化部署 任务之一还有【autoEvaluateDemandTask，statsDemandTask，dailyStatisticalVoteTask,IcPrivateDeploySupportUserPointTask】
+ */
+@Slf4j
+@Component("icPrivateDeploySupportProjectTask")
+public class IcPrivateDeploySupportProjectTask implements ITask {
+    @Autowired
+    private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+
+    @Override
+    public void run(String params) {
+        ExtractOriginFormDTO formDTO = new ExtractOriginFormDTO();
+        if (StringUtils.isNotBlank(params)) {
+            formDTO = JSON.parseObject(params, ExtractOriginFormDTO.class);
+        }
+        Result result = dataStatisticalOpenFeignClient.userPointAndProjectStatus(BizTypeEnum.PROJECT.getType(), formDTO);
+        log.info("icPrivateDeploySupportProjectTask excute end，param:{},result:{}",params,result);
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.epmet.task.ic;
+
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.enums.BizTypeEnum;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import com.epmet.task.ITask;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * desc：数字社区私有化部署 任务之一还有【autoEvaluateDemandTask，statsDemandTask，dailyStatisticalVoteTask,icPrivateDeploySupportProjectTask】
+ */
+@Slf4j
+@Component("icPrivateDeploySupportUserPointTask")
+public class IcPrivateDeploySupportUserPointTask implements ITask {
+    @Autowired
+    private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+
+    @Override
+    public void run(String params) {
+        ExtractOriginFormDTO formDTO = new ExtractOriginFormDTO();
+        if (StringUtils.isNotBlank(params)) {
+            formDTO = JSON.parseObject(params, ExtractOriginFormDTO.class);
+        }
+        Result result = dataStatisticalOpenFeignClient.userPointAndProjectStatus(BizTypeEnum.USER.getType(), formDTO);
+        log.info("icPrivateDeploySupportUserPointTask excute end，param:{},result:{}",params,result);
+    }
+}