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

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDictFormDTO.java

@@ -13,6 +13,7 @@ public class AreaCodeDictFormDTO implements Serializable {
 
     private static final long serialVersionUID = 5780301376757138238L;
 
+    //平阴传参：rootAreaCode=370124, rootAreaLevel=district
     /**
      * 根结点code  不传，则返回全部
      */

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeChildDao.java

@@ -34,7 +34,7 @@ import java.util.List;
 @Mapper
 public interface AreaCodeChildDao extends BaseDao<AreaCodeChildEntity> {
 
-    List<AreaCodeChildDTO> selectAllChild();
+    List<AreaCodeChildDTO> selectAllChild(String areaCode);
 
     AreaCodeChildDTO selectByCode(@Param("code") String code);
 

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java

@@ -137,7 +137,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
         if (StringUtils.isNotBlank(s)){
             tree = JSON.parseArray(s,AreaCodeDictResultDTO.class);
         }else {
-            List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = disposeTree();
+            List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = disposeTree(formDTO);
             areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE,areaCodeDictResultDTOS);
             tree = areaCodeDictResultDTOS;
         }
@@ -154,11 +154,11 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
      * @author zxc
      * @date 2021/1/8 上午8:57
      */
-    public List<AreaCodeDictResultDTO> disposeTree(){
+    public List<AreaCodeDictResultDTO> disposeTree(AreaCodeDictFormDTO formDTO){
         // 查询所有省市区
         List<AreaCodeDTO> areaCodeDTOS = baseDao.selectAllArea();
         // 查询所有街道、社区
-        List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild();
+        List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild(formDTO.getRootAreaCode());
         List<AreaCodeDictResultDTO> result = new ArrayList<>();
         List<AreaCodeDictResultDTO> fourResult = new ArrayList<>();
         List<AreaCodeDictResultDTO> cityResult = new ArrayList<>();
@@ -388,21 +388,21 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
      * @author zxc
      * @date 2021/1/11 上午9:48
      */
-    public List<AreaCodeDictResultDTO> afterTwoTree(){
+    public List<AreaCodeDictResultDTO> afterTwoTree(AreaCodeDictFormDTO form){
         // 查询所有街道、社区
-        List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild();
+        List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild(form.getRootAreaCode());
         List<AreaCodeDictResultDTO> fourResult = new ArrayList<>();
         List<AreaCodeDictResultDTO> fiveResult = new ArrayList<>();
         // 街道-社区
         Map<Integer, List<AreaCodeChildDTO>> groupByLevel = areaCodeChildDTOS.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getLevel));
         //社区
-        List<AreaCodeChildDTO> levelFive = groupByLevel.get(NumConstant.FIVE);
-        Map<String, List<AreaCodeChildDTO>> groupByPCode = levelFive.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode));
+        List<AreaCodeChildDTO> levelFive = org.apache.commons.collections4.CollectionUtils.isNotEmpty(groupByLevel.get(NumConstant.FIVE)) ? groupByLevel.get(NumConstant.FIVE) : new ArrayList<>();
+        Map<String, List<AreaCodeChildDTO>> groupByPCode = CollectionUtils.isEmpty(levelFive) ? new HashMap<>() : levelFive.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode));
         //街道
-        List<AreaCodeChildDTO> levelFour = groupByLevel.get(NumConstant.FOUR);
+        List<AreaCodeChildDTO> levelFour = org.apache.commons.collections4.CollectionUtils.isNotEmpty(groupByLevel.get(NumConstant.FOUR)) ?groupByLevel.get(NumConstant.FOUR):new ArrayList<>();
         // 6级
         List<AreaCodeChildDTO> levelSix = groupByLevel.get(NumConstant.SIX);
-        Map<String, List<AreaCodeChildDTO>> groupBySixPCode = levelSix.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode));
+        Map<String, List<AreaCodeChildDTO>> groupBySixPCode = CollectionUtils.isEmpty(levelSix) ? new HashMap<>() : levelSix.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode));
 
         levelFive.forEach(f -> {
             AreaCodeDictResultDTO dto = new AreaCodeDictResultDTO();
@@ -450,7 +450,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
      */
     public List<AreaCodeDictResultDTO> disposeAfterTwoLevel(AreaCodeDictFormDTO form){
         List<AreaCodeDictResultDTO> result = new ArrayList<>();
-        List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = afterTwoTree();
+        List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = afterTwoTree(form);
         if (CollectionUtils.isEmpty(areaCodeDictResultDTOS)){
             return new ArrayList<>();
         }
@@ -532,7 +532,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
      */
     public List<AreaCodeDictResultDTO> disposeBeforeThreeLevelFinal(AreaCodeDictFormDTO form,List<AreaCodeDictResultDTO> tree){
         List<AreaCodeDictResultDTO> threeDto = disposeBeforeThreeLevel(form, tree);
-        List<AreaCodeDictResultDTO> twoDto = afterTwoTree();
+        List<AreaCodeDictResultDTO> twoDto = afterTwoTree(form);
         if (CollectionUtils.isEmpty(threeDto)){
             return new ArrayList<>();
         }

epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml

@@ -5,7 +5,9 @@
 
 
     <select id="selectAllChild" resultType="com.epmet.dto.AreaCodeChildDTO">
-        select * from area_code_child m where m.DEL_FLAG = '0'
+        select * from area_code_child m
+        where m.DEL_FLAG = '0'
+        and m.code like concat(#{areaCode},'%')
     </select>
 
     <select id="selectByCode" resultType="com.epmet.dto.AreaCodeChildDTO">

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

@@ -23,7 +23,7 @@ public class HouseErrorInfoModel {
     private String buildingName;
 
     @Excel(name = "单元号", width = 20)
-    private Integer buildingUnit;
+    private String buildingUnit;
 
     @Excel(name = "门牌号", width = 20)
     private String doorName;

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

@@ -16,7 +16,6 @@ import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
 import com.epmet.opendata.service.BaseGridDailyworkService;
-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;
@@ -90,10 +89,11 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr
             Boolean aBoolean = false;
             switch (tags) {
                 case SystemMessageType.USER_PATROL_START:
-                    aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).insertPatrolRecord(patrolRecordForm);
+                    //巡查的未对接暂时不用同步了
+                    //aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).insertPatrolRecord(patrolRecordForm);
                     break;
                 case SystemMessageType.USER_PATROL_STOP:
-                    aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm);
+                    //aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm);
                     break;
                 case SystemMessageType.PATROL_ROUTINE_WORK_ADD:
                     aBoolean = SpringContextUtils.getBean(BaseGridDailyworkService.class).insertBaseGridWorkRecord(patrolRecordForm);