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

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

@@ -71,8 +71,8 @@ public class ImportTaskServiceImpl implements ImportTaskService {
     public String createProcessTask(String operatorId, String bizType, String originFileName) {
         if (existsProcessingTask(operatorId, bizType)) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
-                    "已存在执行中的导入任务，请等待执行完成。",
+                    "存在进行中的导入",
-                    "已存在执行中的导入任务，请等待执行完成。");
+                    "存在进行中的导入");
         }
 
         ImportTaskEntity importRecord = new ImportTaskEntity();

epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.13__ImportTaskCommentModify.sql

@@ -0,0 +1 @@
+alter table import_task modify column PROCESS_STATUS varchar(32) comment '处理状态。processing:处理中；finished_success:成功；finished_fail:未完全成功'

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java

@@ -186,6 +186,8 @@ public class ResiActDetailResultDTO implements Serializable {
      */
     private String unitId;
     private String unitName;
+    private List<String> unitIdList;
+    private List<String> unitNameList;
     /**
      * 活动目标
      */
@@ -196,4 +198,6 @@ public class ResiActDetailResultDTO implements Serializable {
      */
     private String serviceMatter;
     private String serviceMatterName;
+    private List<String> serviceMatterList;
+    private List<String> serviceMatterNameList;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java

@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -34,6 +33,7 @@ import com.epmet.dao.ActInfoDao;
 import com.epmet.dao.ActUserRelationDao;
 import com.epmet.dao.HeartUserInfoDao;
 import com.epmet.dto.ActInfoDTO;
+import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.resi.*;
 import com.epmet.dto.result.demand.OptionDTO;
@@ -42,7 +42,6 @@ import com.epmet.entity.ActInfoEntity;
 import com.epmet.entity.ActUserRelationEntity;
 import com.epmet.service.*;
 import com.epmet.utils.CaculateDistance;
-import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -77,6 +76,12 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     private IcPartyUnitService icPartyUnitService;
     @Resource
     private IcServiceItemDictService icServiceItemDictService;
+    @Resource
+    private IcPartyActivityService icPartyActivityService;
+    @Resource
+    private IcActivityServiceRelationService icActivityServiceRelationService;
+    @Resource
+    private IcActivityUnitRelationService icActivityUnitRelationService;
 
     @Override
     public PageData<ActInfoDTO> page(Map<String, Object> params) {
@@ -255,16 +260,26 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         String currentUserStatus = getCurrentUserStatus(formDto.getActId(), formDto.getUserId());
         detailResultDTO.setCurrentUserStatus(currentUserStatus);
 
-        if (StringUtils.isNotBlank(detailResultDTO.getServiceMatter())) {
+        if (ActConstant.PARTY.equals(detailResultDTO.getActType())) {
+            IcPartyActivityDTO dto = icPartyActivityService.getActivityByActId(formDto.getActId());
+            if (null != dto) {
                 //获取服务事项
-            List<OptionDTO> serviceItemList=icServiceItemDictService.queryDictList(tokenDto.getCustomerId());
+                List<OptionDTO> serviceItemList = icServiceItemDictService.queryDictList(tokenDto.getCustomerId());
-            Map<String, String> categoryMap=serviceItemList.stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+                Map<String, String> categoryMap = serviceItemList.stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
-            detailResultDTO.setServiceMatterName(MapUtils.isNotEmpty(categoryMap) && categoryMap.containsKey(detailResultDTO.getServiceMatter()) ? categoryMap.get(detailResultDTO.getServiceMatter()) : StrConstant.EPMETY_STR);
+                List<String> services = icActivityServiceRelationService.getServiceList(dto.getId());
-        }
+                List<String> serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList());
-        if (StringUtils.isNotBlank(detailResultDTO.getUnitId())) {
+                detailResultDTO.setServiceMatterList(services);
-            //获取单位名称
+                detailResultDTO.setServiceMatterNameList(serviceNames);
-            IcPartyUnitDTO unitDTO = icPartyUnitService.get(detailResultDTO.getUnitId());
+
-            detailResultDTO.setUnitName(null != unitDTO ? unitDTO.getUnitName() : StrConstant.EPMETY_STR);
+                //获取联建单位
+                IcPartyUnitDTO unitDTO = new IcPartyUnitDTO();
+                unitDTO.setAgencyId(dto.getAgencyId());
+                Map<String, String> option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+                List<String> unitIds = icActivityUnitRelationService.getUnitList(dto.getId());
+                List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
+                detailResultDTO.setUnitIdList(unitIds);
+                detailResultDTO.setUnitNameList(unitNames);
+            }
         }
         return new Result<ResiActDetailResultDTO>().ok(detailResultDTO);
     }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UpdateBuildingHouseNumResultDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/3 5:24 下午
+ * @DESC
+ */
+@Data
+public class UpdateBuildingHouseNumResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4350166505117596584L;
+
+    private String id;
+
+    private Integer num;
+}

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

@@ -219,10 +219,10 @@ public class BuildingController {
         ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
         importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_BUILDING);
         importFormDTO.setOperatorId(formDTO.getUserId());
-        importFormDTO.setOriginFileName(ImportErrorMsgConstants.BUILDING_ERROR_NAME);
+        importFormDTO.setOriginFileName(file.getOriginalFilename());
         Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
         if (!importTask.success()){
-            throw new EpmetException("当前存在上传任务");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"","存在进行中的导入");
         }
         buildingService.buildingImportExcel(formDTO,file,importTask);
         return new Result();

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

@@ -269,10 +269,10 @@ public class HouseController implements ResultDataResolver {
         ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
         importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_HOUSE);
         importFormDTO.setOperatorId(formDTO.getUserId());
-        importFormDTO.setOriginFileName(ImportErrorMsgConstants.HOUSE_ERROR_NAME);
+        importFormDTO.setOriginFileName(file.getOriginalFilename());
         Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
         if (!importTask.success()){
-            throw new EpmetException("当前存在上传任务");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"","存在进行中的导入");
         }
         houseService.dispose(file,formDTO,importTask);
         return new Result<>();

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

@@ -19,6 +19,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -139,10 +140,10 @@ public class IcNeighborHoodController {
         ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
         importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_NEIGHBOR_HOOD);
         importFormDTO.setOperatorId(formDTO.getUserId());
-        importFormDTO.setOriginFileName(ImportErrorMsgConstants.NEIGHBORHOOD_ERROR_NAME);
+        importFormDTO.setOriginFileName(file.getOriginalFilename());
         Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
         if (!importTask.success()){
-            throw new EpmetException("当前存在上传任务");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"","存在进行中的导入");
         }
         icNeighborHoodService.neighborhoodImport(formDTO,file,importTask);
         return new Result();

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

@@ -22,6 +22,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.result.BaseInfoFamilyBuildingResultDTO;
 import com.epmet.dto.result.BuildingResultDTO;
+import com.epmet.dto.result.UpdateBuildingHouseNumResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.IcBuildingEntity;
 import com.epmet.entity.IcHouseEntity;
@@ -162,4 +163,28 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
      */
     List<String> selectExistHouse(@Param("ids")List<String> ids);
 
+    /**
+     * Desc: 查询客户下户数为空的
+     * @param customerId
+     * @author zxc
+     * @date 2022/3/3 5:20 下午
+     */
+    List<String> selectHouseTotalIsNull(@Param("customerId")String customerId);
+
+    /**
+     * Desc: 查询楼栋下的户数
+     * @param ids
+     * @author zxc
+     * @date 2022/3/3 5:26 下午
+     */
+    List<UpdateBuildingHouseNumResultDTO> selectHouseNum(@Param("ids")List<String> ids);
+
+    /**
+     * Desc: 批量更新楼栋户数
+     * @param nums
+     * @author zxc
+     * @date 2022/3/3 5:31 下午
+     */
+    void allUpdateHouseNum(@Param("nums") List<UpdateBuildingHouseNumResultDTO> nums);
+
 }

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

@@ -80,6 +80,12 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         ImportGeneralDTO dto = ConvertUtils.sourceToTarget(data, ImportGeneralDTO.class);
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());
+        if (StringUtils.isBlank(data.getAgencyName()) || StringUtils.isBlank(data.getGridName()) || StringUtils.isBlank(data.getNeighborHoodName()) ||
+                StringUtils.isBlank(data.getBuildingName()) || StringUtils.isBlank(data.getType()) || null == data.getTotalUnitNum()){
+            nums.add(num);
+            disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
+            return;
+        }
         // 应产品要求添加
         if (StringUtils.isNotBlank(dto.getType()) && (!dto.getType().equals("商品房") && !dto.getType().equals("自建房")) && !dto.getType().equals("别墅")){
             nums.add(num);

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

@@ -16,6 +16,7 @@ import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.result.ImportResultDTO;
+import com.epmet.dto.result.UpdateBuildingHouseNumResultDTO;
 import com.epmet.entity.IcHouseEntity;
 import com.epmet.enums.HousePurposeEnums;
 import com.epmet.enums.HouseRentFlagEnums;
@@ -89,6 +90,14 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         ImportGeneralDTO dto = ConvertUtils.sourceToTarget(data, ImportGeneralDTO.class);
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());
+        if (StringUtils.isBlank(data.getAgencyName()) || StringUtils.isBlank(data.getGridName()) || StringUtils.isBlank(data.getNeighborHoodName()) ||
+                StringUtils.isBlank(data.getBuildingName()) || StringUtils.isBlank(data.getHouseType()) || StringUtils.isBlank(data.getPurpose()) ||
+                StringUtils.isBlank(data.getRentFlagString()) || StringUtils.isBlank(data.getOwnerIdCard()) || StringUtils.isBlank(data.getOwnerName()) ||
+                StringUtils.isBlank(data.getOwnerPhone()) || StringUtils.isBlank(data.getDoorName()) || null == data.getBuildingUnit()){
+            nums.add(num);
+            disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+            return;
+        }
         // 应产品要求
         if (StringUtils.isNotBlank(dto.getHouseType()) ){
             if( !"楼房".equals(dto.getHouseType()) && !dto.getHouseType().equals("平房") && !dto.getHouseType().equals("别墅") ){
@@ -450,6 +459,14 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
     @Override
     public void doAfterAllAnalysed(AnalysisContext context) {
         finalDispose();
+        // 更新ic_building户数
+        List<String> list = icBuildingDao.selectHouseTotalIsNull(formDTO.getCustomerId());
+        if (!CollectionUtils.isEmpty(list)){
+            List<UpdateBuildingHouseNumResultDTO> houseNum = icBuildingDao.selectHouseNum(list);
+            if (!CollectionUtils.isEmpty(houseNum)){
+                icBuildingDao.allUpdateHouseNum(houseNum);
+            }
+        }
         // 删除缓存
         icHouseRedis.delTemporaryCacheGrids(formDTO.getCustomerId(), formDTO.getUserId());
         icHouseRedis.delTemporaryCacheNeighBorHood(formDTO.getCustomerId(), formDTO.getUserId());

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

@@ -83,6 +83,12 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
         }
         info = data;
         num = num + NumConstant.ONE;
+        if (StringUtils.isBlank(data.getNeighborHoodName()) ||
+                StringUtils.isBlank(data.getGridName()) || StringUtils.isBlank(data.getAgencyName()) || StringUtils.isBlank(data.getAddress())){
+            nums.add(num);
+            disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+            return;
+        }
         ImportGeneralDTO dto = ConvertUtils.sourceToTarget(data, ImportGeneralDTO.class);
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());

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

@@ -25,6 +25,23 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 批量更新楼栋户数 -->
+    <update id="allUpdateHouseNum">
+        UPDATE ic_building
+        set
+        TOTAL_HOUSE_NUM = CASE
+        <foreach collection="nums" item="n">
+            when id = #{n.id} then #{n.num}
+        </foreach> end,
+        UPDATED_TIME = NOW()
+        WHERE DEL_FLAG = '0'
+            AND id in(
+        <foreach collection="nums" item="n" separator=",">
+            #{n.id}
+        </foreach>
+        )
+    </update>
+
     <!--<select id="searchBuildingByPage" resultType="map">
         select
         a.ID as buildingId,
@@ -329,4 +346,25 @@
                 )
     </select>
 
+    <!-- 查询客户下户数为空的 -->
+    <select id="selectHouseTotalIsNull" resultType="java.lang.String">
+        SELECT ID FROM ic_building WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} AND TOTAL_HOUSE_NUM IS NULL
+    </select>
+
+    <!-- 查询楼栋下的户数 -->
+    <select id="selectHouseNum" resultType="com.epmet.dto.result.UpdateBuildingHouseNumResultDTO">
+        SELECT
+            BUILDING_ID AS id,
+            COUNT( ID ) AS num
+        FROM ic_house
+        WHERE DEL_FLAG = '0'
+          AND BUILDING_ID IN (
+              <foreach collection="ids" item="id" separator=",">
+                  #{id}
+              </foreach>
+            )
+        GROUP BY
+            BUILDING_ID
+    </select>
+
 </mapper>