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

 Conflicts:

	epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml

epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml

@@ -93,6 +93,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml

@@ -111,6 +111,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000

epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml

@@ -113,6 +113,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,6 @@ version: "3.7"
 services:
   epmet-oss-server:
     container_name: epmet-oss-server-dev
-#    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
     image: 192.168.1.140:5000/epmet-cloud-dev/epmet-oss-server:version_placeholder
     ports:
       - "8083:8083"

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml

@@ -2,8 +2,7 @@ version: "3.7"
 services:
   epmet-oss-server:
     container_name: epmet-oss-server-prod
-#    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.42
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.40
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml

@@ -2,7 +2,6 @@ version: "3.7"
 services:
   epmet-oss-server:
     container_name: epmet-oss-server-test
-#    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
     image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:version_placeholder
     ports:
       - "8083:8083"

epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml

@@ -93,6 +93,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000
@@ -171,4 +177,4 @@ thread:
     queueCapacity: @thread.threadPool.queue-capacity@
     keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
     threadNamePrefix: @thread.threadPool.thread-name-prefix@
-    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
+    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@

epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml

@@ -112,6 +112,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000
@@ -141,4 +147,4 @@ thread:
     queueCapacity: @thread.threadPool.queue-capacity@
     keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
     threadNamePrefix: @thread.threadPool.thread-name-prefix@
-    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
+    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java

@@ -75,7 +75,7 @@ public class EditAgencyFormDTO implements Serializable {
     /**
      * open: 选择地区编码必填；closed:  无需选择地区编码;0409新增返参
      */
-    @NotBlank(message = "areaCodeSwitch不能为空", groups = AddUserInternalGroup.class)
+    // @NotBlank(message = "areaCodeSwitch不能为空", groups = AddUserInternalGroup.class)
     private String areaCodeSwitch;
 
     /**
@@ -108,4 +108,6 @@ public class EditAgencyFormDTO implements Serializable {
      * 中心点位位置
      */
     private String centerAddress;
+
+    private String customerId;
 }

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

@@ -172,6 +172,7 @@ public class AgencyController {
     @RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_UPDATE)
     public Result editAgency(@LoginUser TokenDto tokenDTO, @RequestBody EditAgencyFormDTO formDTO) {
         formDTO.setUserId(tokenDTO.getUserId());
+        formDTO.setCustomerId(tokenDTO.getCustomerId());
         ValidatorUtils.validateEntity(formDTO, EditAgencyFormDTO.DefaultUserShowGroup.class, EditAgencyFormDTO.AddUserInternalGroup.class);
         Result result =  agencyService.editAgency(formDTO);
 

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

@@ -19,9 +19,6 @@ package com.epmet.controller;
 
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelReader;
-import com.alibaba.excel.read.metadata.ReadSheet;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -32,40 +29,32 @@ import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.constant.ImportErrorMsgConstants;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.HouseInfoDTO;
+import com.epmet.dto.result.IcNeighborHoodResultDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.excel.IcHouseExcel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.feign.GovOrgOpenFeignClient;
-import com.epmet.model.HouseInfoModel;
-import com.epmet.model.ImportHouseInfoListener;
 import com.epmet.redis.IcHouseRedis;
 import com.epmet.service.HouseService;
 import com.epmet.service.IcHouseService;
-import com.epmet.service.IcNeighborHoodService;
 import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.tomcat.util.http.MimeHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Field;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 
@@ -283,7 +272,7 @@ public class HouseController implements ResultDataResolver {
             input.setTaskId(importTask.getData().getTaskId());
             input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
             epmetCommonServiceOpenFeignClient.finishImportTask(input);
-            log.error("读取文件失败");
+            log.error("读取文件失败",e);
         }
         houseService.dispose(inputStream,formDTO,importTask);
         return new Result<>();

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

@@ -167,6 +167,8 @@ public class AgencyServiceImpl implements AgencyService {
             originalEntity.setLongitude(formDTO.getLongitude());
         }
         originalEntity.setCenterAddress(formDTO.getCenterAddress());
+        //平阴的工作端小程序与产品入参有差距，为了接口兼容，这个参数不让前端传了...
+        formDTO.setAreaCodeSwitch(customerOrgParameterService.getAreaCodeSwitch(formDTO.getCustomerId()));
         //当前客户开启了area_code_switch参数：open: 选择地区编码必填；closed:  无需选择地区编码
         if (CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN.equals(formDTO.getAreaCodeSwitch())) {
             CustomerAgencyEntity parent = customerAgencyDao.selectById(originalEntity.getPid());
@@ -184,7 +186,7 @@ public class AgencyServiceImpl implements AgencyService {
                 }
                 //什么时候要全部置为空呢？原来没有现在有 || 原来与现在不一致
                 if ((StringUtils.isBlank(originalAreaCode) && StringUtils.isNotBlank(formDTO.getAreaCode()))
-                        || (!formDTO.getAreaCode().equals(originalAreaCode))) {
+                        || (StringUtils.isNotBlank(formDTO.getAreaCode()) && !formDTO.getAreaCode().equals(originalAreaCode))) {
                     updateSubOrg(originalEntity.getCustomerId(), formDTO, originalAreaCode);
                 }
             }
@@ -319,12 +321,13 @@ public class AgencyServiceImpl implements AgencyService {
     private void checkEditAgencyFormDTO(EditAgencyFormDTO formDTO,CustomerAgencyEntity originalEntity) {
         //根组织不允许修改
         if (StringUtils.isNotBlank(originalEntity.getPid()) && !NumConstant.ZERO_STR.equals(originalEntity.getPid())) {
-            if (StringUtils.isBlank(formDTO.getAreaCode())) {
+            //03.23:平阴线上版本与产品主线版本差距太大，平阴的修改组织只能修改组织名称。
+            /*if (StringUtils.isBlank(formDTO.getAreaCode())) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "area_code_switch is open areaCode不能为空", "组织区划不能为空");
             }
             if (StringUtils.isBlank(formDTO.getParentAreaCode())) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "area_code_switch is open parentAreaCode不能为空", "请先设置上级组织的组织区划");
-            }
+            }*/
             //如果当前组织已经使用了自定义编码，不允许在选择其他。
             if (StringUtils.isNotBlank(originalEntity.getAreaCode())
                     && originalEntity.getAreaCode().contains("UD")

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

@@ -1,14 +1,12 @@
 package com.epmet.service.impl;
 
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.read.metadata.ReadSheet;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -18,9 +16,8 @@ import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constants.ImportTaskConstants;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerGridConstant;
+import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcBuildingDao;
 import com.epmet.dao.IcBuildingUnitDao;
 import com.epmet.dao.IcHouseDao;
@@ -29,11 +26,7 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.IcBuildingDTO;
 import com.epmet.dto.IcBuildingUnitDTO;
 import com.epmet.dto.IcHouseDTO;
-import com.epmet.dto.form.IcHouseFormDTO;
-import com.epmet.dto.form.ImportInfoFormDTO;
-import com.epmet.dto.form.ImportTaskCommonFormDTO;
-import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
-import com.epmet.dto.form.NeighborHoodManageDelFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
@@ -49,25 +42,17 @@ import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.model.HouseInfoModel;
 import com.epmet.model.ImportHouseInfoListener;
 import com.epmet.redis.IcHouseRedis;
-import com.epmet.service.HouseService;
-import com.epmet.service.IcBuildingService;
-import com.epmet.service.IcBuildingUnitService;
-import com.epmet.service.IcHouseService;
 import com.epmet.service.*;
 import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
@@ -376,6 +361,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
                         .build();
                 excelReader.read(readSheet);
             } catch (Exception e){
+                log.error("dispose exception",e);
                 ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
                 input.setOperatorId(formDTO.getUserId());
                 input.setTaskId(importTask.getData().getTaskId());

epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml

@@ -127,6 +127,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
@@ -20,7 +21,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author wxz
@@ -68,6 +68,12 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
         npcData.stream().forEach(npc -> {
                     if (StringUtils.isBlank(excludeUserId) || !npc.getUserId().equals(excludeUserId)) {
                         OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId());
+                        String pids;
+                        if (StringUtils.isNotBlank(gridInfo.getPids()) && !NumConstant.ZERO_STR.equals(gridInfo.getPids())) {
+                            pids = gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId());
+                        } else {
+                            pids = gridInfo.getAgencyId();
+                        }
                         ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO(
                                 npc.getUserId(),
                                 npc.getGridId(),
@@ -75,7 +81,8 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
                                 npc.getRealName(),
                                 npc.getHeadImgUrl(),
                                 gridInfo != null ? gridInfo.getAgencyId() : null,
-                                gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null);
+                                // gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null
+                                pids);
                         npcResultList.add(resiEventNpcInfo);
                     }
                 }
@@ -122,7 +129,13 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
         OrgInfoResultDTO currentGridInfo = currentGridInfos.get(0);
 
         // 因为上游接口的值对应问题，这里只好做一个适配，拼接起来，希望上游代码不要再改了...
-        String pids = currentGridInfo.getPids().concat(":").concat(currentGridInfo.getAgencyId());
+        // String pids = currentGridInfo.getPids().concat(":").concat(currentGridInfo.getAgencyId());
+        String pids;
+        if (StringUtils.isNotBlank(currentGridInfo.getPids()) && !NumConstant.ZERO_STR.equals(currentGridInfo.getPids())) {
+            pids = currentGridInfo.getPids().concat(":").concat(currentGridInfo.getAgencyId());
+        } else {
+            pids = currentGridInfo.getAgencyId();
+        }
         // 父ID列表的index排序字段是从0开始，网格要排在他们前面，则网格的index为-1
         targetLevels.add(new ResiEventTargetLevelResultDTO(OrgLevelEnums.GRID.getLevel(), OrgLevelEnums.GRID.getLevelName(), currentGridInfo.getOrgId(), currentGridInfo.getAgencyId(), pids, -1));
 
@@ -135,7 +148,12 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
                 throw new RenException(String.format("根据级别%s没有找到对应的组织级别枚举", porg.getLevel()));
             }
             //parentOrgIds.indexOf(porg.getOrgId()为当前orgId在pids中的位置，得到之后，赋值给index字段，treeset会利用这个字段进行排序
-            ResiEventTargetLevelResultDTO pLevel = new ResiEventTargetLevelResultDTO(porg.getLevel(), levelName, porg.getOrgId(), porg.getPid(), porg.getPids(), parentOrgIds.indexOf(porg.getOrgId()));
+            ResiEventTargetLevelResultDTO pLevel = new ResiEventTargetLevelResultDTO(porg.getLevel(),
+                    levelName,
+                    porg.getOrgId(),
+                    porg.getPid(),
+                    porg.getPids(),
+                    parentOrgIds.indexOf(porg.getOrgId()));
             targetLevels.add(pLevel);
         });
 

epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

@@ -132,6 +132,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000
@@ -175,4 +181,4 @@ thread:
     queueCapacity: @thread.threadPool.queue-capacity@
     keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
     threadNamePrefix: @thread.threadPool.thread-name-prefix@
-    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
+    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@