Job测试

新增资源初始化方式（导入，导出）
异常日志持久化bug
OPC服务
MQ管理接口

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

@@ -110,6 +110,24 @@ public class CommonEnumUtil {
             }
             return null;
         }
+        public static int descriptionOfValue(String desc) {
+            int tmp = IMPP.value;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name().equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+        public static int descOf(String desc) {
+            int tmp = IMPP.value;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name().equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -218,13 +236,15 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYS_LOCALE_RESOURCE_TYPE {
-        COMMON(1, "通用"),
+        COMMON(10, "通用"),
-        EXCEPTION(2, "异常"),
+        EXCEPTION_DETAIL(20, "异常信息"),
-        EXCEPTION_DETAIL(3, "异常明细"),
+        EXCEPTION_SOLUTION(30, "解决方案"),
-        EXCEPTION_SOLUTION(4, "解决方案"),
+        ENUM(40, "枚举"),
-        ENUM(5, "枚举"),
+        MENU(50, "功能权限"),
-        MENU(10, "功能权限"),
+        WEB(60, "前端"),
-        WEB(13, "前端");
+        SYS_CONFIG(70, "系统参数"),
+        SYS_DICTIONARY(80, "系统字典"),
+        MISSING(90, "缺失");
 
         private int value;
         private String description;
@@ -251,6 +271,21 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+        public static int descOf(String desc) {
+            int tmp = COMMON.value;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+        public static int descriptionOfValue(String val) {
+            return descOf(val);
+        }
     }
 
     /**

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java

@@ -30,10 +30,13 @@ public class LacCommandOperate {
 
     public LacCommandOperate(){}
 
-    public LacCommandOperate(Long operateObjId,LacEnumUtil.OPERATE_COMMAND operateCommand){
+    public LacCommandOperate(Long operateObjId,Integer operate){
         this.operateObjId = operateObjId;
-        this.operateCommand = operateCommand.getValue();
+        LacEnumUtil.OPERATE_COMMAND operate_command = LacEnumUtil.OPERATE_COMMAND.valueOf(operate);
-        this.operateObjType = operateCommand.getOperateObjType().getValue();
+        if(operate_command!=null) {
+            this.operateCommand = operate_command.getValue();
+            this.operateObjType = operate_command.getOperateObjType().getValue();
+        }
     }
 
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java

@@ -1,12 +1,12 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Lob;
@@ -30,7 +30,9 @@ import javax.persistence.Transient;
 public class SysLocaleResource  extends BaseBean {
 
     private static final long serialVersionUID = -2397207310100672746L;
+
     @Column(name="resource_type")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.class, refForeignKey = "value", value = "description")
     @ApiParam(value = "资源类型",example = "1",access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE")
     private Integer resourceType;
 
@@ -62,8 +64,14 @@ public class SysLocaleResource  extends BaseBean {
     @ApiParam(value = "资源Value",example = "通过resourceType，languageId和key获取")
     private String resourceValue;
 
+    @Column(name="SOFT_TYPE")
+    @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description",required = false)
+    private Integer softType;
+
     //系统自带需要有初始化表，只能修改value，无法删除。
     @Column(name="is_system")
     @ApiParam(value = "是否系统参数",example = "2")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     private Integer isSystem;
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.platbean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -9,7 +11,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
@@ -48,6 +49,10 @@ public class SysLogTaskTime extends BaseBean {
     @ApiParam(value ="调度服务器端口")
     private String schedulerServerPort;
 
+    @Column(name="TaskThreadId")
+    @ApiParam(value ="任务线程id")
+    private String taskThreadId;
+
     @Column(name="NAME")
     @ApiParam(value ="任务名称")
     private String name;
@@ -80,6 +85,7 @@ public class SysLogTaskTime extends BaseBean {
 
     @Column(name="TASK_STATUS")
     @ApiParam(value ="任务完成情况(枚举：1正常，2失败)")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     private Integer taskStatus;
 
     @Column(name="TASK_LOG_ERROR")