Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_grid_platform

 Conflicts:

	epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java

@@ -139,6 +139,7 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 
     List<com.epmet.dto.ProjectCategoryDTO> getProjectCategoryData(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
+    List<com.epmet.dto.ProjectCategoryDTO> selectProjectCategoryData(@Param("customerId") String customerId, @Param("dateId") String dateId);
     /**
      * 获取项目满意度
      *

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java

@@ -12,6 +12,7 @@ import com.epmet.dto.extract.result.SatisfactionInfoResultDTO;
 import com.epmet.dto.issue.*;
 import com.epmet.entity.issue.IssueEntity;
 import com.epmet.service.Issue.IssueService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -26,6 +27,7 @@ import java.util.Set;
  * @dscription
  * @date 2020/6/17 16:02
  */
+@Slf4j
 @Service
 @DataSource(DataSourceConstant.GOV_ISSUE)
 public class IssueServiceImpl implements IssueService {
@@ -162,8 +164,11 @@ public class IssueServiceImpl implements IssueService {
 			List<IssueProjectCategoryDictDTO> categories = statsIssueDao.selectCategory(customerId, categoryIds);
 			if(!CollectionUtils.isEmpty(categories)){
 				StringBuilder str = new StringBuilder();
-				categories.forEach(category -> {str.append(category.getCategoryName()).append(StrConstant.COMMA);});
+				categories.forEach(category -> {
-				map.put(projectId,str.substring(NumConstant.ZERO,str.length() - NumConstant.TWO));
+					str.append(category.getCategoryName()).append(StrConstant.COMMA);
+					//log.info(str.toString());
+				});
+				map.put(projectId,str.substring(NumConstant.ZERO,str.length() - NumConstant.ONE));
 			}
 		});
 

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

@@ -74,7 +74,9 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
         if (NumConstant.ZERO == count){
             dateString = null;
         }
-        List<ProjectCategoryDTO> projectCategoryData = projectService.getProjectCategoryData(customerId, dateString);
+        // 原来一个项目有多个分类，现在几个分类可能会对上同一个省里的编码，所以去重一下，插入到fact_origin_project_category表
+        // List<ProjectCategoryDTO> projectCategoryData = projectService.getProjectCategoryData(customerId, dateString);
+        List<ProjectCategoryDTO> projectCategoryData = projectService.queryProjectCategoryData(customerId, dateString);
         HashSet<String> projectIdSet=new HashSet<>();
         if (!CollectionUtils.isEmpty(projectCategoryData)){
             projectCategoryData.forEach(data->{

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

@@ -245,8 +245,8 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         //项目分类数据 todo 暂时查询所有
         List<ProjectCategoryDTO> projectCategoryData = projectService.getProjectCategoryData(param.getCustomerId(), null);
         //key projectId:categoryCode Set
-        Map<String, List<String>> projectCategoryMap = projectCategoryData.stream()
+        Map<String, Set<String>> projectCategoryMap = projectCategoryData.stream()
-                .collect(Collectors.groupingBy(ProjectCategoryDTO::getProjectId, Collectors.mapping(ProjectCategoryDTO::getCategoryCode, Collectors.toList())));
+                .collect(Collectors.groupingBy(ProjectCategoryDTO::getProjectId, Collectors.mapping(ProjectCategoryDTO::getCategoryCode, Collectors.toSet())));
 
         //2.获取项目的所有节点耗时数据
         List<FactOriginProjectOrgPeriodDailyEntity> projectPeriodList = factOriginProjectMainDailyService.getProjectPeriod(param);
@@ -366,15 +366,15 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
      * @param categoryList
      * @param projectCategoryMap
      */
-    private void setCategoryInfo(ScreenDifficultyDataEntity diffEntity, String projectId, List<IssueProjectCategoryDictEntity> categoryList, Map<String, List<String>> projectCategoryMap) {
+    private void setCategoryInfo(ScreenDifficultyDataEntity diffEntity, String projectId, List<IssueProjectCategoryDictEntity> categoryList, Map<String, Set<String>> projectCategoryMap) {
-        List<String> categorySet = projectCategoryMap.get(projectId);
+        Set<String> categorySet = projectCategoryMap.get(projectId);
         if (CollectionUtils.isEmpty(categorySet)) {
             return;
         }
-        projectCategoryMap.forEach((k, v) -> {
         StringBuilder code = new StringBuilder();
         StringBuilder name = new StringBuilder();
-            v.forEach(categoryCode -> {
+        //projectCategoryMap.forEach((k, v) -> {
+        categorySet.forEach(categoryCode -> {
                 List<IssueProjectCategoryDictEntity> childCategory = new ArrayList<>();
                 getParentNode(childCategory, categoryList, categoryCode);
                 String categoryCodes = childCategory.stream().map(IssueProjectCategoryDictEntity::getCategoryCode).collect(Collectors.joining(StrConstant.HYPHEN));
@@ -385,12 +385,11 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
             });
             code.deleteCharAt(code.length() - NumConstant.ONE);
             name.deleteCharAt(name.length() - NumConstant.ONE);
-            diffEntity.setEventCategoryCode(code.toString());
-            diffEntity.setEventCategoryName(name.toString());
             log.debug("code:{}",code.toString());
             log.debug("name:{}",name.toString());
-        });
+        //});
-
+        diffEntity.setEventCategoryCode(code.toString());
+        diffEntity.setEventCategoryName(name.toString());
     }
 
     /**

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

@@ -139,7 +139,6 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 				});
 			}
 		}
-
 		//重新计算orientData的级别 有现成的方法 fact_origin_project_org_period_daily
 //		originMainService.computerIfExceed(orientData, exceedLimit,about2ExceedLimit);
 		//todo 与上面重复处理 暂时注释掉

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java

@@ -155,6 +155,7 @@ public interface ProjectService extends BaseService<ProjectEntity> {
      */
     List<ProjectCategoryDTO> getProjectCategoryData(String customerId, String dateId);
 
+    List<ProjectCategoryDTO> queryProjectCategoryData(String customerId, String dateId);
     /**
      * 获取项目满意度
      * @author zhaoqifeng

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@@ -161,6 +161,10 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return baseDao.getProjectCategoryData(customerId,dateId);
 	}
 
+	@Override
+	public List<com.epmet.dto.ProjectCategoryDTO> queryProjectCategoryData(String customerId, String dateId) {
+		return baseDao.selectProjectCategoryData(customerId,dateId);
+	}
 	/**
 	 * 获取项目满意度
 	 *

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -146,6 +146,24 @@
             AND DATE_FORMAT(CREATED_TIME,'%Y%m%d')=#{dateId}
         </if>
     </select>
+
+    <!--  原来一个项目有多个分类，现在几个分类可能会对上同一个省里的编码，所以去重一下，插入到fact_origin_project_category表  -->
+    <select id="selectProjectCategoryData" parameterType="map" resultType="com.epmet.dto.ProjectCategoryDTO">
+        select
+            distinct pc.CATEGORY_ID,
+            pc.CATEGORY_CODE,
+            pc.CATEGORY_PIDS,
+            pc.PROJECT_ID,
+            pc.CREATED_TIME
+        from
+        `project_category` pc
+        where pc.del_flag = '0'
+        and pc.customer_id = #{customerId}
+        <if test="dateId != null">
+            AND DATE_FORMAT(pc.CREATED_TIME,'%Y%m%d')=#{dateId}
+        </if>
+    </select>
+
     <select id="selectProjectSatisfaction" resultType="com.epmet.dto.project.ProjectPointDTO">
         SELECT
             PROJECT_ID,

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml

@@ -5,7 +5,7 @@
 
     <select id="selectProjectCategoryIdList" resultType="java.lang.String">
         SELECT
-            category_id
+            distinct category_id
         FROM
             project_category
         WHERE
@@ -38,8 +38,8 @@
     <!-- 根据项目ID查询项目分类 -->
     <select id="selectCategoryByIds" resultType="com.epmet.dto.result.ProjectCategoryDisPoseResultDTO">
         SELECT
+            distinct CATEGORY_CODE,
             PROJECT_ID,
-            CATEGORY_CODE,
             CUSTOMER_ID
         FROM project_category
         WHERE DEL_FLAG = '0'

epmet-module/open-data-worker/open-data-worker-client/pom.xml

@@ -11,5 +11,11 @@
 
     <artifactId>open-data-worker-client</artifactId>
 
-
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+    </dependencies>
 </project>

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/UpsertPatrolRecordForm.java

@@ -0,0 +1,28 @@
+package com.epmet.opendata.dto.form;
+
+import lombok.Data;
+
+/**
+ * 插入或更新巡查记录主表
+ * @author liujianjun
+ */
+@Data
+public class UpsertPatrolRecordForm {
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+    /**
+     * 巡查记录id
+     */
+    private String patrolId;
+
+    /**
+     * 操作类型
+     * SystemMessageType.USER_PATROL_START
+     * SystemMessageTypSTOP
+     */
+    private String actionType;
+
+}

epmet-module/open-data-worker/open-data-worker-server/pom.xml

@@ -66,6 +66,12 @@
             <artifactId>epmet-message-client</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>open-data-worker-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/StaffPatrolDetailDao.java

@@ -18,7 +18,7 @@
 package com.epmet.opendata.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.opendata.entity.StaffPatrolDetailEntity;
+import com.epmet.opendata.entity.UserPatrolDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since v1.0.0 2021-10-14
  */
 @Mapper
-public interface StaffPatrolDetailDao extends BaseDao<StaffPatrolDetailEntity> {
+public interface StaffPatrolDetailDao extends BaseDao<UserPatrolDetailEntity> {
 
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/StaffPatrolDetailEntity.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/UserPatrolDetailEntity.java

@@ -30,8 +30,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("staff_patrol_detail")
+@TableName("user_patrol_detail")
-public class StaffPatrolDetailEntity extends BaseEpmetEntity {
+public class UserPatrolDetailEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java

@@ -1,12 +1,17 @@
 package com.epmet.opendata.mq.listener;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.constants.MQUserPropertys;
+import com.epmet.commons.rocketmq.messages.StaffPatrolMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
+import com.epmet.opendata.service.UserPatrolRecordService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
@@ -17,12 +22,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
- * @Description 系统对接中间库，巡查信息变更监听器
  * @author wxz
+ * @Description 系统对接中间库，巡查信息变更监听器
  * @date 2021.10.13 15:21:48
-*/
+ */
+@Slf4j
 public class OpenDataPatrolChangeEventListener implements MessageListenerConcurrently {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
@@ -54,13 +61,23 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr
         String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.PENDING_MSG_LABEL);
 
         logger.info("【开放数据事件监听器】-巡查记录信息变更-收到消息内容:{}, 操作:{}", msg, tags);
-
+        StaffPatrolMQMsg msgObj = JSON.parseObject(msg, StaffPatrolMQMsg.class);
+        if (msgObj == null) {
+            log.warn("consumeMessage msg body is blank");
+            return;
+        }
         DistributedLock distributedLock = null;
         RLock lock = null;
         try {
-            //distributedLock = SpringContextUtils.getBean(DistributedLock.class);
+            distributedLock = SpringContextUtils.getBean(DistributedLock.class);
-            //lock = distributedLock.getLock(String.format("lock:open_data_staff:%s", staffId),
+            lock = distributedLock.getLock(String.format("lock:open_data_patrol:%s", msgObj.getPatrolId()),
-            //        30L, 30L, TimeUnit.SECONDS);
+                    30L, 30L, TimeUnit.SECONDS);
+            UpsertPatrolRecordForm patrolRecordForm = new UpsertPatrolRecordForm();
+            patrolRecordForm.setCustomerId(msgObj.getCustomerId());
+            patrolRecordForm.setPatrolId(msgObj.getPatrolId());
+            patrolRecordForm.setActionType(msgObj.getActionType());
+
+            Boolean aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).upsertPatrolRecord(patrolRecordForm);
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
             logger.error("【开放数据事件监听器】-巡查记录信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
@@ -69,7 +86,7 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr
             logger.error("【开放数据事件监听器】-巡查记录信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
             throw e;
         } finally {
-            //distributedLock.unLock(lock);
+            distributedLock.unLock(lock);
         }
 
         if (StringUtils.isNotBlank(pendingMsgLabel)) {

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/StaffPatrolDetailService.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/UserPatrolDetailService.java

@@ -18,7 +18,7 @@
 package com.epmet.opendata.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.opendata.entity.StaffPatrolDetailEntity;
+import com.epmet.opendata.entity.UserPatrolDetailEntity;
 
 /**
  * 工作人员巡查记录明细
@@ -26,7 +26,7 @@ import com.epmet.opendata.entity.StaffPatrolDetailEntity;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-10-14
  */
-public interface StaffPatrolDetailService extends BaseService<StaffPatrolDetailEntity> {
+public interface UserPatrolDetailService extends BaseService<UserPatrolDetailEntity> {
 
 
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/UserPatrolRecordService.java

@@ -18,6 +18,7 @@
 package com.epmet.opendata.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
 import com.epmet.opendata.entity.UserPatrolRecordEntity;
 
 /**
@@ -28,5 +29,10 @@ import com.epmet.opendata.entity.UserPatrolRecordEntity;
  */
 public interface UserPatrolRecordService extends BaseService<UserPatrolRecordEntity> {
 
-
+    /**
+     * desc：根据条件更新或者插入巡查记录
+     * @param patrolRecordForm
+     * @return
+     */
+    Boolean upsertPatrolRecord(UpsertPatrolRecordForm patrolRecordForm);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/StaffPatrolDetailServiceImpl.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/UserPatrolDetailServiceImpl.java

@@ -19,8 +19,8 @@ package com.epmet.opendata.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.opendata.dao.StaffPatrolDetailDao;
-import com.epmet.opendata.entity.StaffPatrolDetailEntity;
+import com.epmet.opendata.entity.UserPatrolDetailEntity;
-import com.epmet.opendata.service.StaffPatrolDetailService;
+import com.epmet.opendata.service.UserPatrolDetailService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
  * @since v1.0.0 2021-10-14
  */
 @Service
-public class StaffPatrolDetailServiceImpl extends BaseServiceImpl<StaffPatrolDetailDao, StaffPatrolDetailEntity> implements StaffPatrolDetailService {
+public class UserPatrolDetailServiceImpl extends BaseServiceImpl<StaffPatrolDetailDao, UserPatrolDetailEntity> implements UserPatrolDetailService {
 
 
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/UserPatrolRecordServiceImpl.java

@@ -19,6 +19,7 @@ package com.epmet.opendata.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.opendata.dao.UserPatrolRecordDao;
+import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
 import com.epmet.opendata.entity.UserPatrolRecordEntity;
 import com.epmet.opendata.service.UserPatrolRecordService;
 import org.springframework.stereotype.Service;
@@ -34,5 +35,8 @@ import org.springframework.stereotype.Service;
 public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecordDao, UserPatrolRecordEntity> implements UserPatrolRecordService {
 
 
-
+    @Override
+    public Boolean upsertPatrolRecord(UpsertPatrolRecordForm patrolRecordForm) {
+        return null;
+    }
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/StaffPatrolDetailDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.opendata.dao.StaffPatrolDetailDao">
 
-    <resultMap type="com.epmet.opendata.entity.StaffPatrolDetailEntity" id="staffPatrolDetailMap">
+    <resultMap type="com.epmet.opendata.entity.UserPatrolDetailEntity" id="staffPatrolDetailMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="staffPatrolRecId" column="STAFF_PATROL_REC_ID"/>