Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

saas-module/src/main/java/com/makeit/controller/device/SaasDeviceReportDayController.java

@@ -38,18 +38,21 @@ public class SaasDeviceReportDayController {
 
 
     @ApiOperation("睡眠评价")
     @ApiOperation("睡眠评价")
     @PostMapping("sleepEvaluation")
     @PostMapping("sleepEvaluation")
+    @TenantIdIgnore
     public ApiResponseEntity<PlatElderSleepEvaluationVO> sleepEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
     public ApiResponseEntity<PlatElderSleepEvaluationVO> sleepEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
         return ApiResponseUtils.success(platElderDayReportDayService.sleepEvaluation(platElderIdDTO));
         return ApiResponseUtils.success(platElderDayReportDayService.sleepEvaluation(platElderIdDTO));
     }
     }
 
 
     @ApiOperation("睡眠图表")
     @ApiOperation("睡眠图表")
     @PostMapping("sleepDiagram")
     @PostMapping("sleepDiagram")
+    @TenantIdIgnore
     public ApiResponseEntity<List<PlatElderSleepDiagramVO>> sleepDiagram(@RequestBody PlatElderReportDTO platElderIdDTO) {
     public ApiResponseEntity<List<PlatElderSleepDiagramVO>> sleepDiagram(@RequestBody PlatElderReportDTO platElderIdDTO) {
         return ApiResponseUtils.success(platElderDayReportDayService.sleepDiagram(platElderIdDTO));
         return ApiResponseUtils.success(platElderDayReportDayService.sleepDiagram(platElderIdDTO));
     }
     }
 
 
     @ApiOperation("心率呼吸评价")
     @ApiOperation("心率呼吸评价")
     @PostMapping("heartRespiratoryEvaluation")
     @PostMapping("heartRespiratoryEvaluation")
+    @TenantIdIgnore
     public ApiResponseEntity<PlatElderHeartRespiratoryEvaluationVO> heartRespiratoryEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
     public ApiResponseEntity<PlatElderHeartRespiratoryEvaluationVO> heartRespiratoryEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
         return ApiResponseUtils.success(platElderDayReportDayService.heartRespiratoryEvaluation(platElderIdDTO));
         return ApiResponseUtils.success(platElderDayReportDayService.heartRespiratoryEvaluation(platElderIdDTO));
     }
     }

server-common/src/main/resources/locale/business_messages.properties

@@ -61,7 +61,7 @@ SYSTEM.ERROR.TENANT.NOT.EXIST=该租户不存在或者被禁用
 SYSTEM.ERROR.DUPLICATE.REQUEST=请勿重复请求
 SYSTEM.ERROR.DUPLICATE.REQUEST=请勿重复请求
 
 
 #SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=该用户已经离职/冻结
 #SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=该用户已经离职/冻结
-SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=用户不存在/已冻结
+SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=用户不存在
 SYSTEM.ERROR.AUTH.USER.ACCOUNT.PASSWORD=账号或者密码错误!
 SYSTEM.ERROR.AUTH.USER.ACCOUNT.PASSWORD=账号或者密码错误!
 SYSTEM.ERROR.AUTH.USER.PASSWORD=密码错误
 SYSTEM.ERROR.AUTH.USER.PASSWORD=密码错误
 SYSTEM.ERROR.AUTH.USER.OLD.PASSWORD=旧密码错误
 SYSTEM.ERROR.AUTH.USER.OLD.PASSWORD=旧密码错误

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -371,6 +371,9 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
                 .or()
                 .or()
                 .eq(PlatUser::getMobile, loginDTO.getAccount())
                 .eq(PlatUser::getMobile, loginDTO.getAccount())
         );
         );
+        if(platUser == null ){
+            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_AUTH_USER_HAS_DISABLED);
+        }
 
 
         checkTenantOrgStatus(platUser);
         checkTenantOrgStatus(platUser);
 
 
@@ -657,6 +660,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
                 .like(StringUtils.isNotBlank(dto.getMobile()), PlatUser::getMobile, dto.getMobile())
                 .like(StringUtils.isNotBlank(dto.getMobile()), PlatUser::getMobile, dto.getMobile())
                 .eq(StringUtils.isNotBlank(dto.getStatus()), PlatUser::getStatus, dto.getStatus())
                 .eq(StringUtils.isNotBlank(dto.getStatus()), PlatUser::getStatus, dto.getStatus())
                 .like(StringUtils.isNotBlank(dto.getEmail()),PlatUser::getEmail,dto.getEmail())
                 .like(StringUtils.isNotBlank(dto.getEmail()),PlatUser::getEmail,dto.getEmail())
+                .eq(StringUtils.isNotBlank(dto.getOrgId()),PlatUser::getOrgId,dto.getOrgId())
                 .eq(PlatUser::getTenantId, TenantIdUtil.getTenantId());
                 .eq(PlatUser::getTenantId, TenantIdUtil.getTenantId());
 
 
         roleIdFilter(lambdaQueryWrapper, dto);
         roleIdFilter(lambdaQueryWrapper, dto);
@@ -1056,7 +1060,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
         LambdaUpdateWrapper<PlatUser> updateWrapper = Wrappers.lambdaUpdate(PlatUser.class)
         LambdaUpdateWrapper<PlatUser> updateWrapper = Wrappers.lambdaUpdate(PlatUser.class)
                 .set(PlatUser::getTenantId, tenantId)
                 .set(PlatUser::getTenantId, tenantId)
                 .set(PlatUser::getOrgId, tenantId)
                 .set(PlatUser::getOrgId, tenantId)
-                .set(PlatUser::getOrgPath, tenantId)
+                .set(PlatUser::getOrgPath, "1,"+tenantId)
                 .eq(BaseEntity::getId, platUserId);
                 .eq(BaseEntity::getId, platUserId);
         this.update(updateWrapper);
         this.update(updateWrapper);
     }
     }

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -246,6 +246,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
 
 
         deviceCacheUtil.put(db);
         deviceCacheUtil.put(db);
 
 
+        other.setOriDeviceId(db.getOriDeviceId());
         platDeviceOtherService.saveOrUpdate(other);
         platDeviceOtherService.saveOrUpdate(other);
     }
     }
 
 

server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java

@@ -33,6 +33,7 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
     private String alarmType;
     private String alarmType;
 
 
     @ApiModelProperty(value = "告警时间")
     @ApiModelProperty(value = "告警时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime alarmDate;
     private LocalDateTime alarmDate;
 
 
     @ApiModelProperty(value = "状态 0 待处理 1 已处理")
     @ApiModelProperty(value = "状态 0 待处理 1 已处理")

server-service/src/main/resources/mappers/PlatRoleMapper.xml

@@ -11,6 +11,7 @@
         from plat_user_role pur
         from plat_user_role pur
         left join plat_role pr on pur.role_id = pr.id
         left join plat_role pr on pur.role_id = pr.id
         <where>
         <where>
+            pur.del_flag = 0
             <if test="userIdList != null and userIdList.size()>0">
             <if test="userIdList != null and userIdList.size()>0">
                 AND pur.user_id IN
                 AND pur.user_id IN
                 <foreach collection="userIdList" item="item" separator="," open="(" close=")" index="">
                 <foreach collection="userIdList" item="item" separator="," open="(" close=")" index="">