Merge remote-tracking branch 'origin/房屋tree_yzm' into dev

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml

@@ -5,7 +5,7 @@
 
     <insert id="upsertTagCount" parameterType="com.epmet.dto.form.UpdateTagFormDTO">
         <selectKey keyProperty="id" order="AFTER" resultType="String">
-            select id from tag_customer where tag_name = #{tagName} AND CUSTOMER_ID = #{customerId}
+            select id from tag_customer where tag_name = #{tagName} AND CUSTOMER_ID = #{customerId} and del_flag='0'
         </selectKey>
         INSERT INTO tag_customer ( ID, CUSTOMER_ID, TAG_NAME, TAG_COLOR, USE_COUNT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDeathDao.java

@@ -29,4 +29,6 @@ public interface DataSyncRecordDeathDao extends BaseDao<DataSyncRecordDeathEntit
                                             @Param("idCard") String idCard,
                                             @Param("name") String name,
                                             @Param("agencyId") String agencyId);
+
+    int deleteByIcResiUserId(String icResiUserId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java

@@ -36,4 +36,11 @@ public interface DataSyncRecordDisabilityDao extends BaseDao<DataSyncRecordDisab
      * @date 2022/10/14 13:44
      */
     void batchUpdateDisability(List<DataSyncRecordDisabilityEntity> entities);
+
+    /**
+     * 删除居民信息时，同时删除data_sync_record_disability
+     * @param icResiUserId
+     * @return
+     */
+    int deleteByIcResiUserId(String icResiUserId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java

@@ -67,4 +67,10 @@ public interface DataSyncRecordDeathService extends BaseService<DataSyncRecordDe
      * @param ids 要操作的记录id
      */
     void batchUpdate(String userId, String customerId, List<String> ids);
+
+    /**
+     * 删除居民信息时，同时删除data_sync_record_death
+     * @param icResiUserId
+     */
+    void deleteByIcResiUserId(String icResiUserId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java

@@ -107,4 +107,10 @@ public interface DataSyncRecordDisabilityService extends BaseService<DataSyncRec
      * @date 2022/10/13 16:18
      */
     void batchUpdate(String[] ids, TokenDto tokenDto);
+
+    /**
+     * 删除居民信息时，同时删除data_sync_record_disability
+     * @param icResiUserId
+     */
+    void deleteByIcResiUserId(String icResiUserId);
 }

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

@@ -155,5 +155,13 @@ public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl<DataSyncReco
         }
     }
 
-
+    /**
+     * 删除居民信息时，同时删除data_sync_record_death
+     *
+     * @param icResiUserId
+     */
+    @Override
+    public void deleteByIcResiUserId(String icResiUserId) {
+        baseDao.deleteByIcResiUserId(icResiUserId);
+    }
 }

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

@@ -10,6 +10,7 @@ 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.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.GenderEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -41,8 +42,10 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -97,17 +100,30 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
     @Override
     public DataSyncRecordDisabilityDTO get(String id) {
         DataSyncRecordDisabilityEntity entity = baseDao.selectById(id);
+        if (null == entity) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "data_sync_record_disability记录不存在，id:" + id, "记录不存在");
+        }
         DataSyncRecordDisabilityDTO result = ConvertUtils.sourceToTarget(entity, DataSyncRecordDisabilityDTO.class);
         result.setGenderCn(GenderEnum.UN_KNOWN.getName());
         if (null != result.getGender()){
             result.setGenderCn(result.getGender() == NumConstant.ONE ? "男" : "女");
         }
-        IcResiUserDTO icResiUserDTO = icResiUserService.get(entity.getIcResiUserId());
-        ResiInfoDTO resiInfoDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiInfoDTO.class);
-        resiInfoDTO.setGenderCn(resiInfoDTO.getGender().equals(NumConstant.ONE_STR) ? "男" : "女");
-        resiInfoDTO.setCjzkCn(getCj(resiInfoDTO.getCjzk()));
-        resiInfoDTO.setCjlbCn(getCjlb(resiInfoDTO.getCjlb(),entity.getCustomerId()));
-        result.setResiInfo(resiInfoDTO);
+        if (StringUtils.isNotBlank(entity.getIcResiUserId())) {
+            IcResiUserDTO icResiUserDTO = icResiUserService.get(entity.getIcResiUserId());
+            if (null != icResiUserDTO) {
+                ResiInfoDTO resiInfoDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiInfoDTO.class);
+                if (StringUtils.isNotBlank(resiInfoDTO.getGender())) {
+                    resiInfoDTO.setGenderCn(resiInfoDTO.getGender().equals(NumConstant.ONE_STR) ? "男" : "女");
+                } else {
+                    resiInfoDTO.setGenderCn(GenderEnum.UN_KNOWN.getName());
+                }
+                resiInfoDTO.setCjzkCn(getCj(resiInfoDTO.getCjzk()));
+                resiInfoDTO.setCjlbCn(getCjlb(resiInfoDTO.getCjlb(), entity.getCustomerId()));
+                result.setResiInfo(resiInfoDTO);
+            } else {
+                log.warn(String.format("ic_resi_user is null icResiUserId:%s", entity.getIcResiUserId()));
+            }
+        }
         return result;
     }
 
@@ -145,7 +161,10 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
             throw new EpmetException("operCustomizeOpenFeignClient.getOptionsMap执行失败");
         }
         Map<String, String> data = cjlbOptionsMap.getData();
-        return data.get(cjlb);
+        if(MapUtils.isNotEmpty(data)&&data.containsKey(cjlb)){
+            return data.get(cjlb);
+        }
+        return StrConstant.EPMETY_STR;
     }
 
     @Override
@@ -307,4 +326,14 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
         baseDao.batchUpdateDisability(entities);
     }
 
+    /**
+     * 删除居民信息时，同时删除data_sync_record_disability
+     *
+     * @param icResiUserId
+     */
+    @Async
+    @Override
+    public void deleteByIcResiUserId(String icResiUserId) {
+        baseDao.deleteByIcResiUserId(icResiUserId);
+    }
 }

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

@@ -58,7 +58,6 @@ import com.epmet.dao.*;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
-import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.dto.result.demand.IcResiDemandDictDTO;
 import com.epmet.dto.result.demand.OptionDTO;
@@ -74,7 +73,6 @@ import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO;
 import com.epmet.opendata.feign.GuardarDatosFeignClient;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import com.epmet.service.*;
-import com.epmet.stats.UserHouseStatsResultDTO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -211,6 +209,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         icUserTransferRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId());
         icUserChangeRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId());
         icUserChangeDetailedService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId());
+        //如果是烟台客户，删除居民时，同时删除死亡数据data_sync_record_death、残疾记录data_sync_record_disability
+        if(CustomerIdConstant.YT_CUSTOMER_ID.equals(formDTO.getCustomerId())){
+            SpringContextUtils.getBean(DataSyncRecordDisabilityService.class).deleteByIcResiUserId(formDTO.getIcResiUserId());
+            SpringContextUtils.getBean(DataSyncRecordDeathService.class).deleteByIcResiUserId(formDTO.getIcResiUserId());
+        }
     }
 
     /**

epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDeathDao.xml

@@ -60,4 +60,10 @@
         ORDER BY
             d.CREATED_TIME DESC
     </select>
+
+    <delete id="deleteByIcResiUserId" parameterType="java.lang.String">
+
+        delete from data_sync_record_death
+        where IC_RESI_USER_ID = #{icResiUserId}
+    </delete>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml

@@ -215,4 +215,10 @@
 <!--        sex = values(sex),-->
 <!--        class = values(class)-->
 <!--    </insert>-->
+
+
+    <delete id="deleteByIcResiUserId" parameterType="java.lang.String">
+        delete from data_sync_record_disability
+        where IC_RESI_USER_ID = #{icResiUserId}
+    </delete>
 </mapper>