Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

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

@@ -73,7 +73,7 @@ public class InspectionRequest extends PageRequest {
      * 自检时间
      */
     @NotNull(message = "缺少自检时间")
-    @PastOrPresent(message = "自检时间不能早于标准北京时间")
+    @PastOrPresent(message = "自检时间不能早于当前时间")
     private LocalDate selfcheckDate;
     /**
      * 自检报告路径
@@ -89,7 +89,8 @@ public class InspectionRequest extends PageRequest {
      * 现场检验时间
      */
     @NotNull(message = "缺少现场检验时间")
-    @PastOrPresent(message = "现场检验时间不能早于标准北京时间")
+//    @PastOrPresent(message = "现场检验时间不能早于当前时间")
+    @FutureOrPresent(message = "现场检验时间不能早于当前时间")
     private LocalDate checkDate;
 
     /**
@@ -146,7 +147,7 @@ public class InspectionRequest extends PageRequest {
      * 下次年检日期
      */
     @NotNull(message = "请设置下次年检时间")
-    @FutureOrPresent(message = "下次年检时间不得晚于标准北京时间")
+    @FutureOrPresent(message = "下次年检时间不得晚于当前时间")
     private LocalDate nextInspectionTime;
 
     /**

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

@@ -47,7 +47,7 @@ public class AnnualInspection extends BaseEntity {
      * 计划年检时间
      */
     @NotNull(message = "计划年检时间不能为空")
-    @FutureOrPresent(message = "计划年检时间不得晚于标准北京时间")
+    @FutureOrPresent(message = "计划年检时间不得晚于当前时间")
     private LocalDate planDate;
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/entity/EmergencyRepair.java

@@ -101,7 +101,7 @@ public class EmergencyRepair extends BaseEntity {
      * 报修时间 手动填写
      */
     @NotNull(message = "报修时间不能为空")
-    @PastOrPresent(message = "报修时间不能早于标准北京时间")
+    @PastOrPresent(message = "报修时间不能早于标当前时间")
     private LocalDateTime callerDate;
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/MaintenanceRecord.java

@@ -91,21 +91,21 @@ public class MaintenanceRecord extends BaseEntity {
 	 * 实际保养时间
 	 */
 	@NotNull(message = "缺少实际保养时间")
-	@PastOrPresent(message = "保养时间不能早于标准北京时间")
+	@PastOrPresent(message = "保养时间不能早于当前时间")
 	private LocalDate workDate;
 
 	/**
 	 * 停梯时间
 	 */
 	@NotNull(message = "缺少停梯时间")
-	@PastOrPresent(message = "停梯时间不能早于标准北京时间")
+	@PastOrPresent(message = "停梯时间不能早于当前时间")
 	private LocalDateTime stopDate;
 
 	/**
 	 * 恢复时间
 	 */
 	@NotNull(message = "缺少恢复时间")
-	@PastOrPresent(message = "恢复时间不能早于标准北京时间")
+	@PastOrPresent(message = "恢复时间不能早于当前时间")
 	private LocalDateTime recoveryDate;
 
 	/**

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/request/MtPlanRequest.java

@@ -51,7 +51,7 @@ public class MtPlanRequest extends PageRequest {
      * 执行时间
      */
     @NotNull(message = "缺少计划执行时间")
-    @PastOrPresent(message = "计划执行时间不得早于标准北京时间")
+    @PastOrPresent(message = "计划执行时间不得早于当前时间")
     private LocalDate workDate;
     /**
      * 公司id

lift-system-service/src/main/java/cn/com/ty/lift/system/version/controller/VersionController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
@@ -27,25 +28,25 @@ public class VersionController {
      * @return 版本信息
      */
     @PostMapping("version")
-    public RestResponse<?> version(HttpServletRequest request) {
+    public RestResponse<?> version(HttpServletRequest request, @RequestBody Version version) {
         String mobileType = request.getHeader("mobileType");
-        if (mobileType == null) {
+        if (mobileType == null || version.getDeviceModel() == null) {
             return RestResponse.fail();
         }
         int type = Integer.parseInt(mobileType);
         QueryWrapper<Version> query = Wrappers.query();
         switch (type) {
             case ApiConstants.ACCESS_TYPE_PC:
-                query.eq("device", ApiConstants.ACCESS_TYPE_PC);
+                query.eq("device", ApiConstants.ACCESS_TYPE_PC).eq("device_model", version.getDeviceModel());
                 break;
             case ApiConstants.ACCESS_TYPE_APP:
-                query.eq("device", ApiConstants.ACCESS_TYPE_APP);
+                query.eq("device", ApiConstants.ACCESS_TYPE_APP).eq("device_model", version.getDeviceModel());
                 break;
             case ApiConstants.ACCESS_TYPE_PUBLIC:
-                query.eq("device", ApiConstants.ACCESS_TYPE_PUBLIC);
+                query.eq("device", ApiConstants.ACCESS_TYPE_PUBLIC).eq("device_model", version.getDeviceModel());
                 break;
             case ApiConstants.ACCESS_TYPE_APPLETS:
-                query.eq("device", ApiConstants.ACCESS_TYPE_APPLETS);
+                query.eq("device", ApiConstants.ACCESS_TYPE_APPLETS).eq("device_model", version.getDeviceModel());
                 break;
         }
         return RestResponse.success(versionMapper.selectOne(query));

lift-system-service/src/main/java/cn/com/ty/lift/system/version/dao/entity/Version.java

@@ -14,4 +14,5 @@ public class Version {
     private String url;
     private Integer code;
     private Integer forceUpdate;
+    private Integer deviceModel;
 }