Merge remote-tracking branch 'origin/dev_bugfix_ljj'

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/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
@@ -407,9 +406,8 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                     AuthorizationInfoFormDTO authorizationInfo = new AuthorizationInfoFormDTO();
                     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-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java

@@ -87,4 +87,6 @@ public interface IcStatsResiWarnDao extends BaseDao<IcStatsResiWarnEntity> {
     List<IcUserWarnNoticeResultDTO> queryUserWarnNotice(@Param("customerId") String customerId,
                                                         @Param("agencyId") String agencyId,
                                                         @Param("configIds") List<String> configIds);
+
+    int deleteByCustomerIdAndConfigId(@Param("configId") String configId, @Param("customerId")String customerId);
 }

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)) {

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

@@ -306,7 +306,12 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
         //保存数据
         List<IcStatsResiWarnEntity> icStatsResiWarnEntities = new ArrayList<>();
         for (IcResiCategoryWarnConfigDTO item : icResiCategoryWarnConfigDTOList) {
-            icStatsResiWarnDao.delete(new QueryWrapper<IcStatsResiWarnEntity>().lambda().eq(IcStatsResiWarnEntity::getConfigId,item.getId()).eq(IcStatsResiWarnEntity::getCustomerId,customerId));
+            int deleteNum;
+            do {
+                // deleteNum = icStatsResiWarnDao.delete(new QueryWrapper<IcStatsResiWarnEntity>().lambda().eq(IcStatsResiWarnEntity::getConfigId,item.getId())
+                //         .eq(IcStatsResiWarnEntity::getCustomerId,customerId));
+                deleteNum = icStatsResiWarnDao.deleteByCustomerIdAndConfigId(item.getId(),customerId);
+            } while (deleteNum > NumConstant.ZERO);
 
 
             List<IcStatsResiWarnEntity> maps = icStatsResiWarnDao.resiWarn(customerId,item.getTableName(), item.getColumnName());

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

@@ -206,4 +206,11 @@
                 </foreach>
             )
     </select>
+
+    <delete id="deleteByCustomerIdAndConfigId" parameterType="map">
+        DELETE FROM ic_stats_resi_warn
+       WHERE config_id = #{configId}
+         and customer_id = #{customerId}
+         limit 1000
+    </delete>
 </mapper>