hanqingsong před 3 roky
rodič
revize
e5fcba843e

+ 12 - 4
src/main/java/com/unissoft/constant/GrainConstant.java

@@ -7,7 +7,6 @@ package com.unissoft.constant;
7 7
  */
8 8
 public class GrainConstant {
9 9
     /**
10
-     * Ma Huixia:
11 10
      * 保管员每周检查粮情
12 11
      * 主管科长每2周检查粮情
13 12
      * 分管副总每月检查粮情
@@ -17,6 +16,15 @@ public class GrainConstant {
17 16
     public static final String GUARDIAN = "保管员每周检查粮情";
18 17
     public static final String DEPUTY_GENERAL = "分管副总每月检查粮情";
19 18
     public static final String GENERAL_MANAGER = "总经理每季检查粮情";
19
+    /**
20
+     * 最新设施检查记录
21
+     */
22
+    public static final int KIND_LONG = 5;
23
+    public static final int KIND_41 = 41; // 仓房设施
24
+    public static final int KIND_42 = 42; // 消防设施
25
+    public static final int KIND_43 = 43; // 计量设施
26
+    public static final int KIND_44 = 44; // 药品库设施
27
+    public static final int KIND_45 = 45; // 配电室设施
20 28
     // 虫害异常
21 29
     public static final String PEST_ABNORMAL = "pest_abnormal";
22 30
     // 粮情异常
@@ -37,10 +45,10 @@ public class GrainConstant {
37 45
 
38 46
 
39 47
     public static final String STR_JOBNAME = "jobName";
40
-    public static final String STR_CONTENT= "content";
48
+    public static final String STR_CONTENT = "content";
41 49
 
42
-    public static final String MQ_MSG_CHANNEL= "mqMsgChannel";
43
-    public static final String MQ_USER_STATUS_CHANNEL= "mqUserStatusChannel";
50
+    public static final String MQ_MSG_CHANNEL = "mqMsgChannel";
51
+    public static final String MQ_USER_STATUS_CHANNEL = "mqUserStatusChannel";
44 52
     public static final String ONLINE_USERS = "websocket.onlineUsers";
45 53
 
46 54
 }

+ 4 - 0
src/main/java/com/unissoft/result/PageParam.java

@@ -1,5 +1,7 @@
1 1
 package com.unissoft.result;
2 2
 
3
+import javax.validation.constraints.Min;
4
+
3 5
 /**
4 6
  * 分页参数类
5 7
  */
@@ -7,10 +9,12 @@ public class PageParam {
7 9
     /**
8 10
      * 当前页
9 11
      */
12
+    @Min(value = 1) // 被注释的元素必须是一个数字,其值必须大于等于指定的最小值
10 13
     private int pageIndex;
11 14
     /**
12 15
      * 当前页有多少数据
13 16
      */
17
+    @Min(value = 1) // 被注释的元素必须是一个数字,其值必须大于等于指定的最小值
14 18
     private int pageSize;
15 19
     /**
16 20
      * 要查的字段(别名=model属性名)