Merge remote-tracking branch 'origin/dev_import' into develop

# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.11__del_social_org.sql

@@ -0,0 +1,7 @@
+UPDATE sys_dict_data
+SET DEL_FLAG = '1',
+UPDATED_BY = 'yinzuomei',
+UPDATED_TIME = NOW(),
+remark = '2022.02.21删除社会组织功能，改用联建单位两新组织'
+WHERE
+	dict_value = 'social_org';

epmet-admin/epmet-admin-server/src/main/resources/mapper/SysDictDataDao.xml

@@ -14,8 +14,8 @@
         FROM
             sys_dict_data a
         INNER JOIN sys_dict_type b ON a.dict_type_id = b.id
-        WHERE
-            b.dict_type = #{dictType}
+        WHERE a.del_flag='0'
+            and b.dict_type = #{dictType}
         ORDER BY
             a.sort ASC
     </select>
@@ -27,8 +27,8 @@
         FROM
             sys_dict_data a
         INNER JOIN sys_dict_type b ON a.dict_type_id = b.id
-        WHERE
-            b.dict_type = #{dictType}
+        WHERE a.del_flag='0'
+            and b.dict_type = #{dictType}
         ORDER BY
             a.sort asc
     </select>

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -641,6 +641,39 @@ public class RedisKeys {
 		return rootPrefix.concat("house:").concat(customerId).concat(":").concat(houseId);
 	}
 
+	/**
+	 * 居民导入-缓存目录key
+	 * @param importTag
+	 * @return
+	 */
+	public static String icResiImportBaseKey(String importTag) {
+		return rootPrefix.concat("resi:").concat("import:").concat(importTag);
+	}
+
+	/**
+	 * 居民导入-数据分类的key
+	 * 	add：新增居民
+	 * 	category：类别变更
+	 * 	transfer：调动
+	 * @param importTag
+	 * @param type
+	 * @return
+	 */
+	public static String icResiImportTypeKey(String importTag, String type) {
+		return icResiImportBaseKey(importTag).concat(":").concat(type);
+	}
+
+	/**
+	 * 居民导入-详细信息key
+	 * @param importTag
+	 * @param type
+	 * @param resiId
+	 * @return
+	 */
+	public static String icResiImportResiCategoryKey(String importTag, String type, String resiId) {
+		return icResiImportTypeKey(importTag, type).concat(":").concat(resiId);
+	}
+
 	/**
 	 * @Description  临时房屋缓存key
 	 * @param customerId

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/StatsStaffPatrolRecordDailyDao.java

@@ -43,7 +43,7 @@ public interface StatsStaffPatrolRecordDailyDao extends BaseDao<StatsStaffPatrol
      * @author LiuJanJun
      * @date 2021/7/9 1:57 下午
      */
-    Integer insertBatch(@Param("list") List<StatsStaffPatrolRecordDailyDTO> insertList);
+    Integer insertBatchOrUpdate(@Param("list") List<StatsStaffPatrolRecordDailyDTO> insertList);
 
     /**
      * desc: 删除内部数据

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

@@ -130,6 +130,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
         List<StatsStaffPatrolRecordDailyDTO> insertList = buildInitPatrolStatsData(formDTO, allGridMembers);
 
         Map<String, StatsStaffPatrolRecordDailyDTO> yesterdayStatsMap = insertList.stream().collect(Collectors.toMap(o -> o.getGridId() + o.getStaffId(), o -> o, (o1, o2) -> o1));
+        log.debug("reloadStaffPatrolStatsData 所有网格员数据{}",JSON.toJSONString(yesterdayStatsMap));
         //获取昨日的巡查记录
         List<StaffPatrolRecordResult> yesterdayPatrolList = userService.selectStaffPatrolListByDateId(formDTO.getCustomerId(), formDTO.getDateId());
 
@@ -138,7 +139,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
 
         //获取昨日的例行工作数据
         List<PatrolRoutineWorkResult> yesterdayWorkList = userService.selectRoutineWorkListByDateId(formDTO.getCustomerId(), formDTO.getDateId());
-
+        log.debug("reloadStaffPatrolStatsData 例行工作数据数据{}",JSON.toJSONString(yesterdayWorkList));
         //遍历网格员 设置其 巡查次数 巡查时常 上报项目数
         yesterdayPatrolList.forEach(patrolRecord -> {
             String key = patrolRecord.getGrid().concat(patrolRecord.getStaffId());
@@ -172,7 +173,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
                     String unqPatrolKey = getUnqPatrolKey(patrol.getGrid(), patrol.getStaffId());
                     StatsStaffPatrolRecordDailyDTO recordDailyDTO = yesterdayStatsMap.get(unqPatrolKey);
                     if (recordDailyDTO == null) {
-                        log.error("have project data but have any patrolRecordDaily,gridId:{},staffId:{}", patrol.getGrid(), patrol.getStaffId());
+                        log.error("reloadStaffPatrolStatsData have project data but have any patrolRecordDaily,gridId:{},staffId:{}", patrol.getGrid(), patrol.getStaffId());
                         return;
                     }
 
@@ -181,17 +182,17 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
             });
         });
         yesterdayWorkList.forEach(work->{
-            String key = work.getGridId().concat(work.getUserId());
+            String key = getUnqPatrolKey(work.getGridId(),work.getUserId());
             StatsStaffPatrolRecordDailyDTO patrolRecordDailyDTO = yesterdayStatsMap.get(key);
             if (patrolRecordDailyDTO == null){
+                log.warn("reloadStaffPatrolStatsData getRoutineWorkCount key{} not exist in gridMembers",key);
                 return;
             }
             patrolRecordDailyDTO.setRoutineWorkCount(patrolRecordDailyDTO.getRoutineWorkCount() + NumConstant.ONE);
-
         });
 
-        Integer effectRow = statsStaffPatrolService.delAndInsertBatch(formDTO, insertList);
-        log.debug("initStaffPatrolStats insert rows:{}", effectRow);
+        Integer effectRow = statsStaffPatrolService.insertBatchOrUpdate(formDTO, insertList);
+        log.info("initStaffPatrolStats insert rows:{}", effectRow);
     }
 
     /**
@@ -218,7 +219,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
     private void initStaffPatrolTodayData(StaffPatrolStatsFormDTO formDTO, List<CustomerGridStaffDTO> allGridMembers) {
         log.info("initStaffPatrolTodayData param:{}", JSON.toJSONString(formDTO));
         List<StatsStaffPatrolRecordDailyDTO> insertList = buildInitPatrolStatsData(formDTO, allGridMembers);
-        Integer effectRow = statsStaffPatrolService.delAndInsertBatch(formDTO, insertList);
+        Integer effectRow = statsStaffPatrolService.insertBatchOrUpdate(formDTO, insertList);
         log.debug("initStaffPatrolStats insert rows:{}", effectRow);
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/StatsStaffPatrolService.java

@@ -10,7 +10,7 @@ import java.util.List;
  */
 public interface StatsStaffPatrolService {
 
-    Integer delAndInsertBatch(StaffPatrolStatsFormDTO formDTO, List<StatsStaffPatrolRecordDailyDTO> insertList);
+    Integer insertBatchOrUpdate(StaffPatrolStatsFormDTO formDTO, List<StatsStaffPatrolRecordDailyDTO> insertList);
 
     List<StatsStaffPatrolRecordDailyDTO> selectData(String customerId, String yesterdayStr);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/StatsStaffPatrolServiceImpl.java

@@ -1,6 +1,5 @@
 package com.epmet.service.user.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -33,10 +32,8 @@ public class StatsStaffPatrolServiceImpl implements StatsStaffPatrolService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Integer delAndInsertBatch(StaffPatrolStatsFormDTO formDTO, List<StatsStaffPatrolRecordDailyDTO> insertList) {
-        int delete = statsStaffPatrolRecordDailyDao.deleteInternal(formDTO);
-        log.debug("delAndInsertBatch delete:{},param:{}", delete, JSON.toJSONString(formDTO));
-        return statsStaffPatrolRecordDailyDao.insertBatch(insertList);
+    public Integer insertBatchOrUpdate(StaffPatrolStatsFormDTO formDTO, List<StatsStaffPatrolRecordDailyDTO> insertList) {
+        return statsStaffPatrolRecordDailyDao.insertBatchOrUpdate(insertList);
     }
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/StatsStaffPatrolRecordDailyDao.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.user.StatsStaffPatrolRecordDailyDao">
-    <insert id="insertBatch">
+    <insert id="insertBatchOrUpdate">
          insert into stats_staff_patrol_record_daily
         (
             ID,
@@ -63,6 +63,11 @@
         ON DUPLICATE KEY UPDATE
             PATROL_TOTAL = values(PATROL_TOTAL),
             TOTAL_TIME = values(TOTAL_TIME),
+            LATEST_PATROL_STATUS = values(LATEST_PATROL_STATUS),
+            LATEST_PATROL_TIME = values(LATEST_PATROL_TIME),
+            REPORT_PROJECT_COUNT = values(REPORT_PROJECT_COUNT),
+            ROUTINE_WORK_COUNT = values(ROUTINE_WORK_COUNT),
+            UPDATED_TIME = now(),
             UPDATED_BY = VALUES(UPDATED_BY)
     </insert>
     <delete id="deleteInternal">