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

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java

@@ -48,7 +48,7 @@ public class CustomerDataManageExcel {
     private String patrolDuration;
 
     @Excel(name = "例行工作次数")
-    private String patrolRoutineWorkTimes;
+    private Integer patrolRoutineWorkTimes;
 
     /**
      * 未转换前的巡查时长

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -2005,10 +2005,6 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
 
         //获取例行工作次数
         List<CustomerDataManageResultDTO.CustomerDataManage>  workCountList = statsStaffPatrolRecordDailyService.getPatrolRecordCount(patrolForm);
-        Map<String, List<CustomerDataManageResultDTO.CustomerDataManage>> workCountMap = null;
-        if(workCountList != null && workCountList.size() > NumConstant.ZERO && workCountList.get(NumConstant.ZERO) != null){
-            workCountMap = workCountList.stream().collect(Collectors.groupingBy(CustomerDataManageResultDTO.CustomerDataManage::getOrgId));
-        }
         //NumConstant.FOUR.判断是否需要查询起始日期用户、群组、话题、议题、项目、巡查数据
         HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> uStartMap = new HashMap<>();
         HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> gStartMap = new HashMap<>();
@@ -2083,7 +2079,6 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
             String patrolDuration = "";
             int patrolDurationInteger = NumConstant.ZERO;
             HashSet set = new HashSet();
-            List<CustomerDataManageResultDTO.CustomerDataManage> workCountListTemp;
             for (CustomerDataManageResultDTO.CustomerDataManage u : patrolEnd) {
                 if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) && org.getOrgId().equals(u.getOrgId())) {
                     patroCount += u.getPatrolCount();
@@ -2099,24 +2094,17 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
             }
             //例行工作次数累加
             int patrolRoutineWorkTimes = NumConstant.ZERO;
-            if (workCountMap != null){
+            if (CollectionUtils.isNotEmpty(workCountList) && workCountList.get(NumConstant.ZERO) != null) {
-                workCountListTemp = workCountMap.get(org.getOrgId());
+                for (CustomerDataManageResultDTO.CustomerDataManage work : workCountList) {
-                if (CollectionUtils.isNotEmpty(workCountListTemp)) {
+                    if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) && org.getOrgId().equals(work.getOrgId())) {
-                    if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
-                        for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) {
                         patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
                         set.add(work.getStaffId());
-                        }
+                    } else if (!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) && work.getOrgId().contains(org.getOrgId())) {
-                    } else {
-                        if (!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
-                            for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) {
                         patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
                         set.add(work.getStaffId());
                     }
                 }
             }
-                }
-            }
 
             patro = set.size();
             Integer minutes = patrolDurationInteger / 60;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java

@@ -10,6 +10,7 @@ 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.constant.PingYinConstant;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginExtractService;
@@ -66,7 +67,7 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
         } catch (Exception e) {
             //失败不重发
             logger.error("consumeMessage fail,msg:{}",e.getMessage());
-            return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+            return ConsumeConcurrentlyStatus.RECONSUME_LATER;
         }
         log.info("consumeMessage success, cost:{} ms",System.currentTimeMillis() - start);
         return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
@@ -94,7 +95,7 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
         }
         log.info("消费了项目变动消息,customer id:{}", msgObj.getCustomerId());
 
-        if (org.apache.commons.lang.StringUtils.isNotBlank(pendingMsgLabel)) {
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
             try {
                 removePendingMqMsgCache(pendingMsgLabel);
             } catch (Exception e) {
@@ -109,19 +110,14 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
         try {
             String customerId = msgObj.getCustomerId();
             distributedLock = SpringContextUtils.getBean(DistributedLock.class);
-            lock = distributedLock.getLock(String.format("lock:project_changed:%s", customerId)
+            lock = distributedLock.getLock(String.format("lock:project_changed:%s:%s", customerId, msgObj.getProjectId())
                     ,30L, 30L, TimeUnit.SECONDS);
 
             if (StringUtils.isBlank(customerId)){
                 logger.error("consumer project_changed fail,msg:{}",customerId);
                 return;
             }
-            //消息被消费太快 业务数据还没有完成 歇一会先
+
-            try {
-                Thread.sleep(60L);
-            } catch (InterruptedException e) {
-                logger.error("consumeMessage sleep exception",e);
-            }
             ExtractOriginFormDTO extractOriginFormDTO = new ExtractOriginFormDTO();
             extractOriginFormDTO.setCustomerId(customerId);
 
@@ -146,8 +142,30 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
             }
             logger.info("consumer projectChanged msg success,{}",aBoolean);
 
+            sendProject2OpenData(msgObj, customerId);
+
+        } catch (RenException e) {
+            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+            logger.error("【RocketMQ】消费项目变动消息失败:",e);
+        } catch (Exception e) {
+            // 不是我们自己抛出的异常，可以让MQ重试
+            logger.error("【RocketMQ】消费项目变动消息异常:",e);
+            throw e;
+        } finally {
+            if (distributedLock != null){
+                distributedLock.unLock(lock);
+            }
+        }
+    }
+
+    /**
+     * desc:发型项目数据到 opendata
+     * @param msgObj
+     * @param customerId
+     */
+    private void sendProject2OpenData(ProjectChangedMQMsg msgObj, String customerId) {
         //发送项目数据上报的mq消息
-            if ("6f203e30de1a65aab7e69c058826cd80".equals(customerId)) {
+        if (PingYinConstant.PROD_PING_YIN_CUSTOMER_ID.equals(customerId)) {
             if ("issue_shift_project".equals(msgObj.getOperation()) || "created".equals(msgObj.getOperation()) || "close".equals(msgObj.getOperation())) {
                 String type;
                 if ("issue_shift_project".equals(msgObj.getOperation()) || "created".equals(msgObj.getOperation())) {
@@ -161,18 +179,6 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
                 SpringContextUtils.getBean(ScreenProjectDataService.class).sendProjectChangeMq(msg);
             }
         }
-        } catch (RenException e) {
-            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
-            logger.error("【RocketMQ】消费项目变动消息失败:",e);
-        } catch (Exception e) {
-            // 不是我们自己抛出的异常，可以让MQ重试
-            logger.error("【RocketMQ】消费项目变动消息异常:",e);
-            throw e;
-        } finally {
-            if (distributedLock != null){
-                distributedLock.unLock(lock);
-            }
-        }
     }
 
     @PreDestroy

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -289,7 +289,7 @@ public class HouseController implements ResultDataResolver {
             s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败";
             return new Result<>().error(9999,String.format(s,num,num - nums.size()));
         }
-        return new Result<>().ok(String.format(s,num,num));
+        return new Result<>().error(9999,String.format(s,num,num));
     }
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java

@@ -128,7 +128,7 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
      * @author zxc
      * @date 2022/2/14 1:25 下午
      */
-    List<ImportGeneralDTO> selectAllBuildingByNeighborHoodId(@Param("neighborHoodId")String neighborHoodId);
+    List<ImportGeneralDTO> selectAllBuildingByNeighborHoodId(@Param("orgId")String orgId);
 
     /**
      * @Description  根据楼栋ID查询楼栋单元
@@ -136,7 +136,7 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
      * @author zxc
      * @date 2022/2/14 1:58 下午
      */
-    List<ImportGeneralDTO> selectAllBuildingUnitByBuildingId(@Param("building")String building);
+    List<ImportGeneralDTO> selectAllBuildingUnitByBuildingId(@Param("orgId")String orgId);
 
     /**
      * @Description  根据ID查询小区

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java

@@ -103,9 +103,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                     if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" +
                             r.getNeighborHoodName() + "_" + r.getBuildingName())){
                         // 集合里重复的
-                        if (r.getExistStatus()){
                         nums.add(r.getNum());
-                        }
                         r.setExistStatus(true);
                     }
                 }
@@ -153,7 +151,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         }
         if (StringUtils.isNotBlank(dto.getNeighborHoodId())){
             //小区ID不为空赋值楼栋ID
-            buildingInfos = null == buildingInfos ? getBuildingInfos(dto.getNeighborHoodId()) : buildingInfos;
+            buildingInfos = null == buildingInfos ? getBuildingInfos(dto.getAgencyId()) : buildingInfos;
             Object cacheBuilding = icHouseRedis.getTemporaryCacheBuilding(formDTO.getCustomerId(), formDTO.getUserId(), dto.getNeighborHoodId() + "_" + dto.getBuildingName());
             dto.setBuildingId(null == cacheBuilding ? "" : cacheBuilding.toString());
             if (StringUtils.isNotBlank(dto.getBuildingId())){
@@ -299,12 +297,12 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
 
     /**
      * @Description  获取小区下的楼栋
-     * @param neighborHoodId
+     * @param orgId
      * @author zxc
      * @date 2022/2/14 1:32 下午
      */
-    public Map<String,Object> getBuildingInfos(String neighborHoodId){
+    public Map<String,Object> getBuildingInfos(String orgId){
-        buildingInfoDTOs = icBuildingDao.selectAllBuildingByNeighborHoodId(neighborHoodId);
+        buildingInfoDTOs = icBuildingDao.selectAllBuildingByNeighborHoodId(orgId);
         buildingInfos = buildingInfoDTOs.stream().collect(Collectors.toMap(n -> n.getNeighborHoodId() + "_" + n.getBuildingName(), n -> n.getBuildingId()));
         icHouseRedis.setTemporaryCacheBuilding(formDTO.getCustomerId(), buildingInfos, formDTO.getUserId());
         return buildingInfos;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -133,23 +133,22 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                     if (k.equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
                         // 集合里重复的
                         if (r.getExistStatus()){
-                            nums.add(r.getNum());
+
                         }
+                        nums.add(r.getNum());
                         r.setExistStatus(true);
                     }
                 }
             }
         });
         // 根据单元ID_doorName查询已存在的
-        List<String> ids = needInsertList.stream().map(m -> m.getBuildingUnitId() + "_" + m.getDoorName()).distinct().collect(Collectors.toList());
+        List<String> ids = needInsertList.stream().filter(n -> StringUtils.isNotBlank(n.getBuildingUnitId())).map(m -> m.getBuildingUnitId() + "_" + m.getDoorName()).distinct().collect(Collectors.toList());
         List<String> existHouses = icBuildingDao.selectExistHouse(ids);
         existHouses.forEach(e -> {
             for (ImportGeneralDTO n : needInsertList) {
                 if ((n.getBuildingUnitId()+"_"+n.getDoorName()).equals(e)){
                     // 库里存在的
-                    if (n.getExistStatus()){
                     nums.add(n.getNum());
-                    }
                     n.setExistStatus(true);
                 }
             }
@@ -213,7 +212,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             dto.setTotalFloorNum(buildingGeneralDTO.getTotalFloorNum());
             dto.setTotalUnitNum(buildingGeneralDTO.getTotalUnitNum());
             // 补充单元ID
-            buildingUnitInfos = null == buildingUnitInfos ? getBuildingUnitInfos(dto.getBuildingId()) : buildingUnitInfos;
+            buildingUnitInfos = null == buildingUnitInfos ? getBuildingUnitInfos(dto.getAgencyId()) : buildingUnitInfos;
             Object cacheBuildingUnit = icHouseRedis.getTemporaryCacheBuildingUnit(formDTO.getCustomerId(), formDTO.getUserId(), dto.getBuildingId() + "_" + dto.getBuildingUnit());
             dto.setBuildingUnitId(null == cacheBuildingUnit ? "" : cacheBuildingUnit.toString());
             if (StringUtils.isNotBlank(dto.getBuildingUnitId())){
@@ -349,7 +348,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             dto.setBuildingId(null == cacheBuilding ? "" : cacheBuilding.toString());
             if (StringUtils.isNotBlank(dto.getBuildingId())){
                 // 楼栋ID不为空赋值单元ID
-                buildingUnitInfos = null == buildingUnitInfos ? getBuildingUnitInfos(dto.getBuildingId()) : buildingUnitInfos;
+                buildingUnitInfos = null == buildingUnitInfos ? getBuildingUnitInfos(dto.getAgencyId()) : buildingUnitInfos;
                 Object cacheBuildingUnit = icHouseRedis.getTemporaryCacheBuildingUnit(formDTO.getCustomerId(), formDTO.getUserId(), dto.getBuildingId() + "_" + dto.getBuildingUnit());
                 dto.setBuildingUnitId(null == cacheBuildingUnit ? "" : cacheBuildingUnit.toString());
                 if (StringUtils.isNotBlank(dto.getBuildingUnitId())){
@@ -398,21 +397,21 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
      * @author zxc
      * @date 2022/2/14 1:32 下午
      */
-    public Map<String,Object> getBuildingInfos(String neighborHoodId){
+    public Map<String,Object> getBuildingInfos(String orgId){
-        buildingInfoDTOs = icBuildingDao.selectAllBuildingByNeighborHoodId(neighborHoodId);
+        buildingInfoDTOs = icBuildingDao.selectAllBuildingByNeighborHoodId(orgId);
         buildingInfos = buildingInfoDTOs.stream().collect(Collectors.toMap(n -> n.getNeighborHoodId() + "_" + n.getBuildingName(), n -> n.getBuildingId()));
         icHouseRedis.setTemporaryCacheBuilding(formDTO.getCustomerId(), buildingInfos, formDTO.getUserId());
         return buildingInfos;
     }
 
     /**
-     * @Description  获取楼栋下的单元
+     * @Description  获取组织下的单元
-     * @param buildingId
+     * @param orgId
      * @author zxc
      * @date 2022/2/14 2:04 下午
      */
-    public Map<String,Object> getBuildingUnitInfos(String buildingId){
+    public Map<String,Object> getBuildingUnitInfos(String orgId){
-        buildingUnitInfoDTOs = icBuildingDao.selectAllBuildingUnitByBuildingId(buildingId);
+        buildingUnitInfoDTOs = icBuildingDao.selectAllBuildingUnitByBuildingId(orgId);
         if (!CollectionUtils.isEmpty(buildingUnitInfoDTOs)){
             buildingUnitInfos = buildingUnitInfoDTOs.stream().collect(Collectors.toMap(n -> n.getBuildingId() + "_" + n.getBuildingUnit(), n -> n.getBuildingUnitId()));
             icHouseRedis.setTemporaryCacheBuildingUnit(formDTO.getCustomerId(), buildingUnitInfos, formDTO.getUserId());

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java

@@ -96,9 +96,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                 for (ImportGeneralDTO r : needDisposeList) {
                     if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" + r.getNeighborHoodName())){
                         // 集合里重复的
-                        if (r.getExistStatus()){
                         nums.add(r.getNum());
-                        }
                         r.setExistStatus(true);
                     }
                 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@@ -429,7 +429,7 @@ public class BuildingServiceImpl implements BuildingService {
             s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败";
             return new Result<>().error(9999,String.format(s,num,num - nums.size()));
         }
-        return new Result<>().ok(String.format(s,num,num));
+        return new Result<>().error(9999,String.format(s,num,num));
     }
 
     private List<IcBuildingExcel> searchAllBuilding(ListIcNeighborHoodFormDTO formDTO) {

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -419,7 +419,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败";
             return new Result<>().error(9999,String.format(s,num,num - nums.size()));
         }
-        return new Result<>().ok(String.format(s,num,num));
+        return new Result<>().error(9999,String.format(s,num,num));
     }
 
     /**

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml

@@ -264,23 +264,26 @@
     <!-- 根据小区ID查询楼栋 -->
     <select id="selectAllBuildingByNeighborHoodId" resultType="com.epmet.dto.ImportGeneralDTO">
         SELECT
-            ID AS buildingId,
+            b.ID AS buildingId,
-            NEIGHBOR_HOOD_ID,
+            b.NEIGHBOR_HOOD_ID,
-            BUILDING_NAME
+            b.BUILDING_NAME
-        FROM ic_building
+        FROM ic_building b
-        WHERE DEL_FLAG = '0'
+        INNER JOIN ic_neighbor_hood h ON (h.ID = b.NEIGHBOR_HOOD_ID AND h.DEL_FLAG = '0')
-          AND NEIGHBOR_HOOD_ID = #{neighborHoodId}
+        WHERE b.DEL_FLAG = '0'
+          AND h.AGENCY_ID = #{orgId}
     </select>
 
     <!-- 根据楼栋ID查询楼栋单元 -->
     <select id="selectAllBuildingUnitByBuildingId" resultType="com.epmet.dto.ImportGeneralDTO">
         SELECT
-            ID AS buildingUnitId,
+            u.ID AS buildingUnitId,
-            UNIT_NUM AS buildingUnit,
+            u.UNIT_NUM AS buildingUnit,
-            BUILDING_ID
+            u.BUILDING_ID,b.NEIGHBOR_HOOD_ID
-        FROM ic_building_unit
+        FROM ic_building_unit u
-        WHERE DEL_FLAG = '0'
+         INNER JOIN ic_building b ON (b.ID = u.BUILDING_ID AND b.DEL_FLAG = '0')
-          AND BUILDING_ID = #{building}
+         INNER JOIN ic_neighbor_hood h ON (h.ID = b.NEIGHBOR_HOOD_ID AND h.DEL_FLAG = '0')
+        WHERE u.DEL_FLAG = '0'
+          AND h.AGENCY_ID = #{orgId}
     </select>
 
     <!-- 根据ID查询小区 -->

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

@@ -317,7 +317,10 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		List<TickStaffFormDTO> staffList = formDTO.getStaffList();
 		//1.文字内容安全校验
 		List<String> list = new ArrayList<>();
-		list.add(formDTO.getTitle());list.add(formDTO.getBackGround());list.add(formDTO.getPublicReply());list.add(formDTO.getInternalRemark());
+		list.add(formDTO.getTitle());
+		list.add(formDTO.getBackGround());
+		list.add(formDTO.getPublicReply());
+		list.add(formDTO.getInternalRemark());
 		safetyCheck(list);
 
 		//2.数据准备，查询需要用到的数据

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -1209,7 +1209,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
         String userCateRedisKey = RedisKeys.icResiImportResiCategoryKey(newlyOrChangedResi.get().getImportTag(), "add", icResiId);
         Map < String, Object > addUserMap = redisUtils.hGetAll(userCateRedisKey);
-        if (addUserMap != null) {
+        if (addUserMap != null && addUserMap.size() > 0) {
             //说明是新增居民
             ResiImportCategoryData newResiCateData = ConvertUtils.mapToEntity(addUserMap, ResiImportCategoryData.class);
             newResiCateData.getCategories().put(columnName, "1");