Merge remote-tracking branch 'origin/master'

src/main/java/com/unissoft/constant/GrainConstant.java

@@ -7,7 +7,6 @@ package com.unissoft.constant;
  */
 public class GrainConstant {
     /**
-     * Ma Huixia:
      * 保管员每周检查粮情
      * 主管科长每2周检查粮情
      * 分管副总每月检查粮情
@@ -17,6 +16,15 @@ public class GrainConstant {
     public static final String GUARDIAN = "保管员每周检查粮情";
     public static final String DEPUTY_GENERAL = "分管副总每月检查粮情";
     public static final String GENERAL_MANAGER = "总经理每季检查粮情";
+    /**
+     * 最新设施检查记录
+     */
+    public static final int KIND_LONG = 5;
+    public static final int KIND_41 = 41; // 仓房设施
+    public static final int KIND_42 = 42; // 消防设施
+    public static final int KIND_43 = 43; // 计量设施
+    public static final int KIND_44 = 44; // 药品库设施
+    public static final int KIND_45 = 45; // 配电室设施
     // 虫害异常
     public static final String PEST_ABNORMAL = "pest_abnormal";
     // 粮情异常
@@ -37,10 +45,10 @@ public class GrainConstant {
 
 
     public static final String STR_JOBNAME = "jobName";
-    public static final String STR_CONTENT= "content";
+    public static final String STR_CONTENT = "content";
 
-    public static final String MQ_MSG_CHANNEL= "mqMsgChannel";
-    public static final String MQ_USER_STATUS_CHANNEL= "mqUserStatusChannel";
+    public static final String MQ_MSG_CHANNEL = "mqMsgChannel";
+    public static final String MQ_USER_STATUS_CHANNEL = "mqUserStatusChannel";
     public static final String ONLINE_USERS = "websocket.onlineUsers";
 
 }

src/main/java/com/unissoft/result/PageParam.java

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