Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -1134,4 +1134,51 @@ public class CommonEnumUtil {
     // 数据未删除的静态常量
     public static final int FALSE = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
+    /**
+     * 日志记录方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum  LOG_DETAIL_SHOW_TYPE {
+        DEBUG(1, "DEBUG"),
+        OVER_TIME(2, "记录超时服务"),
+        ALL_METHOD(3, "所有服务"),
+        ALL_METHOD_PARAMETER(4, "所有服务和入参");
+
+        private int value;
+        private String description;
+
+        private LOG_DETAIL_SHOW_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -2712,7 +2712,8 @@ public class MesEnumUtil {
         PCN_PUSH(70, "PCN_PUSH"),
         FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"),
         REWORK_REPAIR(90, "REWORK_REPAIR"),
-        PCN_LOGIN(100, "PCN_LOGIN");
+        PCN_LOGIN(100, "PCN_LOGIN"),
+        PCN_MENU(110, "PCN_MENU");
 
         private int value;
         private String description;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java

@@ -46,15 +46,6 @@ public class MesPcnSysUserOffline extends BaseBean {
     @ApiParam(value = "登陆名称", access = "登陆名称")
     private String loginName;
 
-    @Column(name = "ORGANIZE_ID")
-    @ApiParam(value = "部门ID", example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long organizeId;
-
-    @Column(name = "ORGANIZE_NAME")
-    @ApiParam(value = "部门名称", access = "部门名称")
-    private String organizeName;
-
     @Column(name="USER_TYPE")
     @ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
     private Integer userType;