[chg] 推送消息设备查询

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/service/AnnualInspectionService.java

@@ -16,7 +16,6 @@ import cn.com.ty.lift.business.maintenance.service.MaintenancePlanService;
 import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.ty.lift.common.verify.Verify;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -201,7 +200,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
         liftHistory.setLiftId(liftId);
         liftHistory.setCode(lift.getLiftCode());
         liftHistory.setDescription("修改电梯年检日期");
-        liftHistory.setContent(StrUtil.format("电梯年检日期由:{}修改成{}", oldInspectionDate, nextInspectionTime));
+        liftHistory.setContent(String.format("电梯年检日期由:%tF %tT修改成%tF %tT", oldInspectionDate, oldInspectionDate, nextInspectionTime, nextInspectionTime));
         //fixme:获取当前登录用户
         liftHistory.setOperatorId(entity.getUpdateId());
         liftHistory.setOperateDate(LocalDateTime.now());

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/dto/RepairRequest.java

@@ -108,9 +108,9 @@ public class RepairRequest extends PageRequest {
     private LocalDateTime stopDate;
 
     /**
-     * 签到位置
+     * 位置信息
      */
-    @NotBlank(message = "缺少签到位置")
+    @NotBlank(message = "缺少位置信息")
     private String position;
 
     /**
@@ -166,7 +166,7 @@ public class RepairRequest extends PageRequest {
     /**
      * 故障性质
      */
-    @NotEmpty(message = "缺少故障性质")
+    @NotBlank(message = "缺少故障性质")
     private String faultNature;
     /**
      * 故障责任

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/Region.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.project.dao.entity;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
@@ -72,7 +73,7 @@ public class Region implements Serializable {
      * 拆分解析文员的id
      */
     public List<Long> splitClerk(){
-        if(Objects.isNull(clerk)){
+        if(StrUtil.isBlank(clerk)){
             return Collections.emptyList();
         }
         if(clerk.contains(",")){

lift-common/src/main/java/cn.com.ty.lift.common/verify/VerifyProcessor.java

@@ -941,7 +941,7 @@ public class VerifyProcessor {
                 setIllegalArgMessage("The @NotBlank only supports CharSequence.");
                 return false;
             }
-            return ((CharSequence) value).toString().trim().isEmpty();
+            return !((CharSequence) value).toString().trim().isEmpty();
         }
 
         /**