fixbug：

server-common/src/main/java/com/makeit/enums/CodeMessageEnum.java

@@ -29,6 +29,7 @@ public enum CodeMessageEnum {
     SYSTEM_ERROR_NAME_DUPLICATE(500, "SYSTEM.ERROR.NAME.DUPLICATE"),
     SYSTEM_ERROR_NAME_DUPLICATE(500, "SYSTEM.ERROR.NAME.DUPLICATE"),
     SYSTEM_ERROR_NAME_ENG_DUPLICATE(500, "SYSTEM.ERROR.NAME.ENG.DUPLICATE"),
     SYSTEM_ERROR_NAME_ENG_DUPLICATE(500, "SYSTEM.ERROR.NAME.ENG.DUPLICATE"),
     SYSTEM_ERROR_CODE_DUPLICATE(500, "SYSTEM.ERROR.CODE.DUPLICATE"),
     SYSTEM_ERROR_CODE_DUPLICATE(500, "SYSTEM.ERROR.CODE.DUPLICATE"),
+    SYSTEM_ERROR_MENU_CODE_DUPLICATE(500, "SYSTEM.ERROR.MENU.CODE.DUPLICATE"),
     SYSTEM_ERROR_TENANT_CODE_DUPLICATE(500, "SYSTEM.ERROR.TENANT.CODE.DUPLICATE"),
     SYSTEM_ERROR_TENANT_CODE_DUPLICATE(500, "SYSTEM.ERROR.TENANT.CODE.DUPLICATE"),
     SYSTEM_ERROR_DICT_VALUE_DUPLICATE(500, "SYSTEM.ERROR.DICT.VALUE.DUPLICATE"),
     SYSTEM_ERROR_DICT_VALUE_DUPLICATE(500, "SYSTEM.ERROR.DICT.VALUE.DUPLICATE"),
     SYSTEM_ERROR_DICT_NOT_EXIST(500, "SYSTEM.ERROR.DICT.NOT.EXIST"),
     SYSTEM_ERROR_DICT_NOT_EXIST(500, "SYSTEM.ERROR.DICT.NOT.EXIST"),

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

@@ -113,3 +113,5 @@ PLATFORM.ERROR.ALARM.NOT.FOUND.ELDER=设备空间下无长者
 SYSTEM.ERROR.TENANT.FORBIDDEN=该租户被禁用
 SYSTEM.ERROR.TENANT.FORBIDDEN=该租户被禁用
 SYSTEM.ERROR.ORG.FORBIDDEN=该组织被禁用
 SYSTEM.ERROR.ORG.FORBIDDEN=该组织被禁用
 
 
+SYSTEM.ERROR.MENU.CODE.DUPLICATE=跳转页面已存在
+

server-service/src/main/java/com/makeit/dto/saas/SaasPrivacyConfigDTO.java

@@ -26,7 +26,7 @@ public class SaasPrivacyConfigDTO implements Serializable {
 	@ApiModelProperty("标题")
 	@ApiModelProperty("标题")
 	private String title;
 	private String title;
 	
 	
-	@Size(max = 1800, message = "申请说明最长为1800字符")
+	@Size(max = 5000, message = "申请说明最长为5000字符")
 	@ApiModelProperty(value="内容")
 	@ApiModelProperty(value="内容")
 	private String content;
 	private String content;
 	
 	

server-service/src/main/java/com/makeit/entity/platform/device/PlatDevice.java

@@ -41,9 +41,11 @@ public class PlatDevice extends BaseBusEntity {
     private String firmwareVersion;
     private String firmwareVersion;
 
 
     @ApiModelProperty(value = "注册时间")
     @ApiModelProperty(value = "注册时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime registrationDate;
     private LocalDateTime registrationDate;
 
 
     @ApiModelProperty(value = "最后上线时间")
     @ApiModelProperty(value = "最后上线时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime lastOnlineData;
     private LocalDateTime lastOnlineData;
 
 
     @ApiModelProperty(value = "说明")
     @ApiModelProperty(value = "说明")

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -128,7 +128,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                 .le(Objects.nonNull(param.getCreateDateTo()), BaseEntity::getCreateDate, param.getCreateDateTo())
                 .le(Objects.nonNull(param.getCreateDateTo()), BaseEntity::getCreateDate, param.getCreateDateTo())
                 .eq(StringUtils.isNotBlank(param.getAlarmType()), PlatAlarmRecord::getAlarmType, param.getAlarmType())
                 .eq(StringUtils.isNotBlank(param.getAlarmType()), PlatAlarmRecord::getAlarmType, param.getAlarmType())
                 .eq(StringUtils.isNotBlank(param.getStatus()), PlatAlarmRecord::getStatus, param.getStatus())
                 .eq(StringUtils.isNotBlank(param.getStatus()), PlatAlarmRecord::getStatus, param.getStatus())
-                .eq(StringUtils.isNotBlank(param.getDealUser()), PlatAlarmRecord::getDealUser, param.getDealUser())
+                .like(StringUtils.isNotBlank(param.getDealUser()), PlatAlarmRecord::getDealUser, param.getDealUser())
                 .ge(Objects.nonNull(param.getDealDateFrom()), PlatAlarmRecord::getDealDate, param.getDealDateFrom())
                 .ge(Objects.nonNull(param.getDealDateFrom()), PlatAlarmRecord::getDealDate, param.getDealDateFrom())
                 .le(Objects.nonNull(param.getDealDateTo()), PlatAlarmRecord::getDealDate, param.getDealDateTo())
                 .le(Objects.nonNull(param.getDealDateTo()), PlatAlarmRecord::getDealDate, param.getDealDateTo())
                 .eq(StringUtils.isNotBlank(param.getOrgId()), PlatAlarmRecord::getOrgId, param.getOrgId())
                 .eq(StringUtils.isNotBlank(param.getOrgId()), PlatAlarmRecord::getOrgId, param.getOrgId())

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

@@ -82,6 +82,7 @@ implements PlatRoleService {
                 .like(StringUtils.isNotBlank(dto.getName()), PlatRole::getName, dto.getName())
                 .like(StringUtils.isNotBlank(dto.getName()), PlatRole::getName, dto.getName())
                 .in(dto.getNameList() != null, PlatRole::getName, dto.getNameList())
                 .in(dto.getNameList() != null, PlatRole::getName, dto.getNameList())
                 .eq(StringUtils.isNotBlank(dto.getOrgId()), PlatRole::getOrgId, dto.getOrgId())
                 .eq(StringUtils.isNotBlank(dto.getOrgId()), PlatRole::getOrgId, dto.getOrgId())
+                .eq(StringUtils.isNotBlank(dto.getStatus()),PlatRole::getStatus,dto.getStatus())
                 .orderByDesc(PlatRole::getCreateDate);
                 .orderByDesc(PlatRole::getCreateDate);
     }
     }
 
 

server-service/src/main/java/com/makeit/service/saas/impl/PlatMenuServiceImpl.java

@@ -172,7 +172,7 @@ public class PlatMenuServiceImpl extends ServiceImpl<PlatMenuMapper, PlatMenu>
         PlatMenu old = getOne(new QueryWrapper<PlatMenu>().lambda()
         PlatMenu old = getOne(new QueryWrapper<PlatMenu>().lambda()
                 .eq(PlatMenu::getCode, dto.getCode()));
                 .eq(PlatMenu::getCode, dto.getCode()));
         if (old != null && !old.getId().equals(dto.getId())) {
         if (old != null && !old.getId().equals(dto.getId())) {
-            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_CODE_DUPLICATE);
+            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_MENU_CODE_DUPLICATE);
         }
         }
     }
     }