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

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

@@ -497,7 +497,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                 //爱心互助的志愿者
                 Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(Arrays.asList(serverId));
                 if (!userInfoRes.success() || CollectionUtils.isEmpty(userInfoRes.getData())) {
-                    throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询爱心互助志愿者信息异常","志愿者信息查询异常");
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询爱心互助志愿者信息异常","志愿者信息查询异常");
                 }
                 serviceName=userInfoRes.getData().get(NumConstant.ZERO).getRealName();
                 mobile = userInfoRes.getData().get(NumConstant.ZERO).getMobile();
@@ -506,7 +506,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                 //居民信息的志愿者 ic_resi_user
                 Result<IcResiUserDTO> icUserInfoRes = epmetUserOpenFeignClient.getIcResiUserDTO(serverId);
                 if (!icUserInfoRes.success() || null==icUserInfoRes.getData()) {
-                    throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常","查询居民信息志愿者信息异常");
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询居民信息志愿者信息异常","查询居民信息志愿者信息异常");
                 }
                 serviceName=icUserInfoRes.getData().getName();
                 mobile = icUserInfoRes.getData().getMobile();

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -280,12 +281,16 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
      * @param enterpriseId
      * @return
      */
+    @NoRepeatSubmit
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(String enterpriseId, String customerId, String userId) {
         //如果是编辑判断下权限要删除的记录的agencyId要与当前登录用户的agencyId一致
         IcEnterpriseEntity origin = baseDao.selectById(enterpriseId);
-
+        if(null==origin){
+            // 已经不存在了，返回！
+            return;
+        }
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
         if (!staffInfo.getAgencyId().equals(origin.getAgencyId())) {
             AgencyInfoCache orginAgencyInfo = CustomerOrgRedis.getAgencyInfo(origin.getAgencyId());

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InternalDelIcResiUserFormDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2023/1/11 15:26
+ */
+@Data
+public class InternalDelIcResiUserFormDTO {
+
+    public interface DefaultGroup {
+    }
+
+    private List<String> icResiUserIds;
+
+    private String formCode = IcFormCodeEnum.RESI_BASE_INFO.getCode();
+
+    @NotBlank(message = "token获取的customerId不能为空", groups = DefaultGroup.class)
+    private String customerId;
+
+    @NotBlank(message = "token获取的userId不能为空", groups = DefaultGroup.class)
+    private String currentStaffId;
+
+    @NotBlank(message = "agencyId不能为空", groups = DefaultGroup.class)
+    private String agencyId;
+}
+

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListDTO.java

@@ -1,9 +1,11 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description
@@ -17,4 +19,11 @@ public class NatListDTO implements Serializable {
     private String testTime;
     private String address;
     private String result;
+    //01.11，增加以下两个参数
+    private String idNatId;
+    /**
+     * 采样时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date sampleTime;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java

@@ -99,6 +99,12 @@ public class IcEpidemicPreventionController{
         return new Result<EpidemicPreventionResultDTO>().ok(result);
     }
 
+    /**
+     * 居民防疫信息-点击查看
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
     @PostMapping("info")
     public Result<EpidemicPreventionInfoDTO> info(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -225,7 +225,32 @@ public class IcResiUserController implements ResultDataResolver {
         return new Result();
     }
 
+    /**
+     * 该接口供开发人员，手动调用
+     * 项目上经常要求删除某个社区的人房数据， 索性写一个接口。供开发人员调用
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @NoRepeatSubmit
+    @PostMapping("delete-interal")
+    public Result deleteInternal(@LoginUser TokenDto tokenDto, @RequestBody InternalDelIcResiUserFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setCurrentStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO, InternalDelIcResiUserFormDTO.DefaultGroup.class);
+        icResiUserService.deleteInternal(formDTO);
 
+        //推送MQ事件
+        IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();
+        mqMsg.setCustomerId(tokenDto.getCustomerId());
+        // mqMsg.setIcResiUser(userId);
+        SystemMsgFormDTO form = new SystemMsgFormDTO();
+        form.setMessageType(SystemMessageType.IC_RESI_USER_DEL);
+        form.setContent(mqMsg);
+        epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
+        log.error(String.format("!!!!!当前组织下的居民已删除agencyId:%s",formDTO.getAgencyId()));
+        return new Result();
+    }
     /**
      * @Author sun
      * @Description 党建互联平台--保存居民信息

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

@@ -53,6 +53,12 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      */
     void delete(DelIcResiUserFormDTO formDTO);
 
+    /**
+     * 开发人员掉员工此接口
+     * @param formDTO
+     */
+    void deleteInternal(InternalDelIcResiUserFormDTO formDTO);
+
     /**
      * @Author sun
      * @Description 党建互联平台--保存居民信息

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

@@ -457,18 +457,24 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
         }
         return list.stream().map(item -> {
             NatListDTO dto = new NatListDTO();
+            dto.setIdNatId(item.getId());
+            dto.setSampleTime(item.getSampleTime());
             dto.setAddress(item.getNatAddress());
             dto.setTestTime(DateUtils.format(item.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE));
-            switch (item.getNatResult())
-            {
-                case NumConstant.ZERO_STR:
-                    dto.setResult("阴性");
-                    break;
-                case NumConstant.ONE_STR:
-                    dto.setResult("阳性");
-                    break;
-                default:
-                    dto.setResult("未知");
+            if(StringUtils.isNotBlank(item.getNatResult())){
+                switch (item.getNatResult())
+                {
+                    case NumConstant.ZERO_STR:
+                        dto.setResult("阴性");
+                        break;
+                    case NumConstant.ONE_STR:
+                        dto.setResult("阳性");
+                        break;
+                    default:
+                        dto.setResult("未知");
+                }
+            }else{
+                dto.setResult("未知");
             }
             return dto;
         }).collect(Collectors.toList());

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

@@ -213,6 +213,38 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         icUserChangeDetailedService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId());
     }
 
+    /**
+     * 该接口供开发人员，手动调用
+     * 项目上经常要求删除某个社区的人房数据， 索性写一个接口。供开发人员调用
+     * @param formDTO
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteInternal(InternalDelIcResiUserFormDTO formDTO){
+        if(StringUtils.isNotBlank(formDTO.getAgencyId())){
+            LambdaQueryWrapper<IcResiUserEntity> resiWrapper=new LambdaQueryWrapper<>();
+            resiWrapper.eq(IcResiUserEntity::getAgencyId,formDTO.getAgencyId());
+            resiWrapper.select(IcResiUserEntity::getId);
+            List<IcResiUserEntity> resiIds=icResiUserDao.selectList(resiWrapper);
+            for(IcResiUserEntity entity:resiIds){
+                baseDao.updateToDel(entity.getId(),formDTO.getCurrentStaffId());
+                CustomerFormQueryDTO queryDTO = ConvertUtils.sourceToTarget(formDTO, CustomerFormQueryDTO.class);
+                Result<Set<String>> subTableRes = operCustomizeOpenFeignClient.queryIcResiSubTables(queryDTO);
+                if (subTableRes.success() && !CollectionUtils.isEmpty(subTableRes.getData())) {
+                    for (String subTalbeName : subTableRes.getData()) {
+                        baseDao.updateSubTableToDel(subTalbeName, entity.getId(),formDTO.getCurrentStaffId());
+                    }
+                }
+                //删除ic_user_transfer_record、ic_user_change_record、ic_user_change_detailed
+                icUserTransferRecordService.deleteByIcResiUserId(entity.getId(),formDTO.getCurrentStaffId());
+                icUserChangeRecordService.deleteByIcResiUserId(entity.getId(),formDTO.getCurrentStaffId());
+                icUserChangeDetailedService.deleteByIcResiUserId(entity.getId(),formDTO.getCurrentStaffId());
+            }
+        }
+    }
+
+
     /**
      * @Author sun
      * @Description 党建互联平台--保存居民信息

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

@@ -861,7 +861,7 @@
         FROM
             ic_resi_user a
             LEFT JOIN (
-                SELECT ID_CARD, count( id ) AS count
+                SELECT ID_CARD, count(distinct INOCULATE_TIME ) AS count
                 FROM ic_vaccine
                 WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId}
                 <if test="startDate != null and startDate != ''">