hanqingsong %!s(int64=3) %!d(string=hai) anos
pai
achega
440a59d7b2

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

@@ -12,10 +12,10 @@ public class GrainConstant {
12 12
      * 分管副总每月检查粮情
13 13
      * 总经理每季检查粮情
14 14
      */
15
-    public static final String SECTION_CHIEF = "主管科长每2周检查粮情";
16
-    public static final String GUARDIAN = "保管员每周检查粮情";
17
-    public static final String DEPUTY_GENERAL = "分管副总每月检查粮情";
18
-    public static final String GENERAL_MANAGER = "总经理每季检查粮情";
15
+    public static final Integer SECTION_CHIEF = 20;
16
+    public static final Integer GUARDIAN = 19;
17
+    public static final Integer DEPUTY_GENERAL = 21;
18
+    public static final Integer GENERAL_MANAGER = 22;
19 19
     /**
20 20
      * 最新设施检查记录
21 21
      */
@@ -25,14 +25,6 @@ public class GrainConstant {
25 25
     public static final int KIND_43 = 43; // 计量设施
26 26
     public static final int KIND_44 = 44; // 药品库设施
27 27
     public static final int KIND_45 = 45; // 配电室设施
28
-    // 虫害异常
29
-    public static final String PEST_ABNORMAL = "pest_abnormal";
30
-    // 粮情异常
31
-    public static final String GRAIN_ABNORMAL = "grain_abnormal";
32
-    // 水分异常
33
-    public static final String WATER_ABNORMAL = "water_abnormal";
34
-    // 选项
35
-    public static final String CHOOSE = "choose";
36 28
 
37 29
     public static final String STR_SECOND = "second";
38 30
     public static final String STR_MINUTE = "minute";
@@ -52,4 +44,9 @@ public class GrainConstant {
52 44
     public static final String MQ_USER_STATUS_CHANNEL = "mqUserStatusChannel";
53 45
     public static final String ONLINE_USERS = "websocket.onlineUsers";
54 46
 
47
+    /*
48
+     * 非空常量定义
49
+     */
50
+    public static final String DEPOT_HOUSE_NOT_NULL = "depotId and houseId is not null";
51
+
55 52
 }

+ 30 - 0
src/main/java/com/unissoft/model/BasicsEnumGain.java

@@ -0,0 +1,30 @@
1
+package com.unissoft.model;
2
+
3
+import lombok.Data;
4
+import lombok.EqualsAndHashCode;
5
+
6
+import java.io.Serializable;
7
+
8
+/**
9
+ * @author qingsong.han
10
+ * @description: 枚举类参数抽取
11
+ * @create 2021-02-09 15:01
12
+ */
13
+@Data
14
+@EqualsAndHashCode(callSuper = false)
15
+public class BasicsEnumGain implements Serializable {
16
+    private static final long serialVersionUID = -1114254127947073412L;
17
+
18
+    // 枚举id
19
+    private Integer enumId;
20
+
21
+    // 菜单名称,不能为空
22
+    private String enumName;
23
+
24
+    // 父id,默认为0
25
+    private Integer parentId;
26
+
27
+    // 顺序
28
+    private Integer enumOrder;
29
+
30
+}