Merge branch 'master' into master_shibei

epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java

@@ -304,7 +304,7 @@ public class LoginServiceImpl implements LoginService {
 		passwordLoginUserInfoFormDTO.setPhone(formDTO.getPhone());
 		Result<PasswordLoginUserInfoResultDTO> userInfoResult = epmetUserFeignClient.selectLoginUserInfoByPassword(passwordLoginUserInfoFormDTO);
 		if (!userInfoResult.success() || null == userInfoResult.getData()) {
-			logger.error("根据手机号查询运营人员信息失败,返回10003账号不存在");
+			// logger.error("根据手机号查询运营人员信息失败,返回10003账号不存在");
 			throw new RenException(EpmetErrorCode.ERR10003.getCode());
 		}
 		//3、密码是否正确

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

@@ -240,28 +240,20 @@
             FROM
                 screen_project_process spp
             WHERE
-                ( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
-                AND OPERATION = 'closed_case' UNION ALL
-            SELECT
-                spp.CUSTOMER_ID,
-                PROJECT_ID,
-                HANDLER_ID,
-                HANDLER_TYPE,
-                ORG_ID_PATH
-            FROM
-                screen_project_process spp
-            WHERE
-                ( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
-                AND OPERATION = 'close'
-            ) b ON a.PROJECT_ID = b.PROJECT_ID
+                (( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+                AND OPERATION = 'closed_case')
+                OR
+                (( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+                AND OPERATION = 'close')
                 <if test='null != customerId and "" != customerId'>
-                AND b.CUSTOMER_ID = #{customerId}
+                    AND spp.CUSTOMER_ID = #{customerId}
                 </if>
                 <if test='null != projectIds and projectIds.size()>0'>
                     <foreach collection="projectIds" item="projectId" open="AND (" separator=" OR " close=" )">
-                   b.PROJECT_ID = #{projectId}
+                       spp.PROJECT_ID = #{projectId}
                     </foreach>
                 </if>
+            ) b ON a.PROJECT_ID = b.PROJECT_ID
             LEFT JOIN screen_customer_agency c ON b.HANDLER_ID = c.AGENCY_ID
             WHERE a.DEL_FLAG = '0'
             AND a.CATEGORY_CODE IS NOT NULL

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

@@ -370,7 +370,6 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
      * @Description 获取/刷新接口调用令牌
      * @author zxc
      */
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void refreshToken() {
         //查询 即将过期的 authorizer_access_token
@@ -408,8 +407,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                     BeanUtils.copyProperties(formDTO, authorizationInfo);
                     authorizationInfo.setAuthorizerAppid(authAppId);
                     // 先逻辑删除，在插入
-                    authorizationInfoDao.deleteOldAuthorizerAccessToken(customerId, clientType);
-                    authorizationInfoDao.insertAuthorizerAccessToken(formDTO);
+                    deleteOldAuthorizerAccessTokenAndInsert(customerId,clientType,formDTO);
                     //缓存 refreshAuthorizerAccessToken
                     redisThird.setAuthorizerRefreshToken(authorizationInfo);
                     AuthorizationInfoResultDTO resultDTO = new AuthorizationInfoResultDTO();
@@ -425,6 +423,21 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
 
     }
 
+    /**
+     * Desc: 删除旧的AuthorizerAccessToken，并新增AuthorizerAccessToken
+     * @param customerId
+     * @param clientType
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/12 09:15
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteOldAuthorizerAccessTokenAndInsert(String customerId,String clientType,AuthorizerAccessTokenFormDTO formDTO){
+        //先逻辑删除，在插入
+        authorizationInfoDao.deleteOldAuthorizerAccessToken(customerId, clientType);
+        authorizationInfoDao.insertAuthorizerAccessToken(formDTO);
+    }
+
     /**
      * @param
      * @Description 授权回调URL, 回调时并获取授权信息

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java

@@ -10,6 +10,8 @@ public class ResidentByIdCardResultDTO implements Serializable {
 
     private static final long serialVersionUID = 3809219691923066512L;
 
+    private Long residentId;
+
     /**
      * 人口性质
      */

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java

@@ -83,7 +83,7 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
         List<EventInfoResultDTO> list = result.getData();
         saveEvent(formDTO, deptMap, userMap, list);
         //分批次循环
-        while (CollectionUtils.isNotEmpty(list)) {
+        while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()) {
             formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
             result = dataStatisticalOpenFeignClient.getEventInfo(formDTO);
             list = result.getData();

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml

@@ -19,6 +19,7 @@
         from
             ca_kettle_base_dispute_process
         <where>
+            DATE_SUB(CURDATE(),INTERVAL 30 DAY) &lt;= date(eventtime)
             <if test="form.wgy != null and form.wgy != ''">
                 AND wgy like '%${form.wgy}%'
             </if>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml

@@ -159,6 +159,7 @@
     <select id="getResidentDetailByIdCard"
             resultType="com.epmet.opendata.dto.result.ResidentByIdCardResultDTO">
         SELECT
+            resident_id,
             resident_property,
             resident_type,
             id_type,

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java

@@ -66,4 +66,9 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * 类别【字典表】
      */
     private String volunteerCategory;
+
+    /**
+     * 是否显示我的家庭
+     */
+    private Boolean homeFlag;
 }

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

@@ -25,5 +25,9 @@ public class BindHomeFormDTO implements Serializable {
     /**
      * 用户id
      */
+    @NotBlank(message = "客户id不能为空")
     private String customerId;
+
+    @NotBlank(message = "人id不能为空")
+    private String userId;
 }

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

@@ -66,4 +66,9 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * 类别【字典表】
      */
     private String volunteerCategory;
+
+    /**
+     * 是否显示我的家庭
+     */
+    private Boolean homeFlag;
 }

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

@@ -1181,8 +1181,9 @@ public class IcResiUserController implements ResultDataResolver {
      */
     @PostMapping("/bindHome")
     public Result bindHome(@RequestBody BindHomeFormDTO form, @LoginUser TokenDto tokenDto) {
-        ValidatorUtils.validateEntity(form);
         form.setCustomerId(tokenDto.getCustomerId());
+        form.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(form);
         icResiUserService.bindHome(form);
         return new Result();
     }

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

@@ -1371,6 +1371,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             //获取用户所在家庭里所有人员信息
             LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId());
+            wrapper.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR);
             wrapper.orderByAsc(IcResiUserEntity::getYhzgx);
             List<IcResiUserEntity> resiUserList = baseDao.selectList(wrapper);
             if (CollectionUtils.isNotEmpty(resiUserList)) {
@@ -2827,9 +2828,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         if(houseInfo == null){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
         }
+        // 变更记录
+        IcResiUserTransferFormDTO formDTO = new IcResiUserTransferFormDTO();
         // 将人的信息放入ic_resi_user对象中
         IcResiUserEntity entity = new IcResiUserEntity();
         entity.setCustomerId(form.getCustomerId());
+        formDTO.setCustomerId(form.getCustomerId());
+        formDTO.setStaffId(form.getUserId());
         // 进行日期转换
         if(residentDetailByIdCard.getBirthday() == null){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取出生日期失败", "获取出生日期失败");
@@ -2863,20 +2868,41 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             HouseAgencyInfoResultDTO data = resultDTOResult.getData();
             entity.setGridId(data.getGridId());
             entity.setPids(data.getPids() + ":" + data.getAgencyId());
+            formDTO.setNewGridId(data.getGridId());
         } else {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "房屋信息不完整", "房屋信息不完整");
         }
         SaveCaResidentUserFormDTO saveForm = new SaveCaResidentUserFormDTO();
         saveForm.setHomeId(form.getHomeId());
         saveForm.setIdCard(form.getIdCard());
+
+        // 添加变更记录
+        formDTO.setType("in");
+        formDTO.setNewAgencyId(houseInfo.getAgencyId());
+        formDTO.setNewNeighborHoodId(houseInfo.getNeighborHoodId());
+        formDTO.setNewBuildingId(houseInfo.getBuildingId());
+        formDTO.setNewBuildingUnitId(houseInfo.getBuildingUnitId());
+        formDTO.setNewHouseId(houseInfo.getHomeId());
+        formDTO.setTransferTime(new Date());
+
+
         if (baseDao.selectCountByIdCard(form.getIdCard(), form.getCustomerId()) > 0) {
            String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());
+           // 变更记录
+           formDTO.setIcUserId(id);
+           icUserTransferRecordService.add(formDTO);
+
            baseDao.updateIcResiUserByIdCard(entity);
            saveForm.setIcResiUserId(id);
         } else {
             baseDao.insert(entity);
+
             String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());
             saveForm.setIcResiUserId(id);
+            formDTO.setIcUserId(id);
+
+            // 变更记录
+            icUserTransferRecordService.add(formDTO);
         }
         guardarDatosFeignClient.saveCaResidentUser(saveForm);
     }

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

@@ -213,6 +213,17 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             MyResiUserInfoResultDTO result = ConvertUtils.sourceToTarget(myselfMsg, MyResiUserInfoResultDTO.class);
             //registerFlag 是否已注册居民，true ,false
             result.setRegisterFlag(StringUtils.isNotBlank(myselfMsg.getResiId()));
+            if(StringUtils.isNotBlank(myselfMsg.getIdNum()) && StringUtils.isNotBlank(myselfMsg.getResiId())){
+                //找到该身份证号的居民
+                IcResiUserDTO icResiUserDTO = icResiUserService.getByIdCard(myResiUserInfoFormDTO.getCustomerId(), myselfMsg.getIdNum(), null);
+                if(null != icResiUserDTO && "0".equals(icResiUserDTO.getStatus())){
+                    result.setHomeFlag(true);
+                }else{
+                    result.setHomeFlag(false);
+                }
+            }else{
+                result.setHomeFlag(false);
+            }
             // 已录入身份证号：true;未完善：false.
             result.setCompleteIdNum(StringUtils.isNotBlank(myselfMsg.getIdNum()));
             result.setRegisterGridName(ModuleConstant.EMPTY_STR);