Merge remote-tracking branch 'remotes/origin/dev' into test

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

@@ -218,6 +218,17 @@ public class ImppEnumUtil {
             return tmp;
         }
 
+
+        public static LOG_LEVEL valueOf(int val) {
+            LOG_LEVEL tmp = ERROR;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
         public static String codeOfDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {

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

@@ -1,6 +1,8 @@
 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.ImppEnumUtil;
 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 org.hibernate.annotations.Type;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -139,4 +140,14 @@ public class SysTaskPlan extends BaseBean {
         }
         return taskPlanStatus.intValue();
     }
+
+    // 枚举 ImppEnumUtil.MESSAGE_TYPE
+    @Column(name = "LOG_LEVEL")
+    @ApiParam(value = "日志等级")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class)
+    private Integer logLevel;
+
+    public int getLogLevelVal() {
+        return logLevel == null ? ImppEnumUtil.LOG_LEVEL.ERROR.getValue() : logLevel;
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -467,15 +467,13 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(message.getMessageContent(), "messageContent", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(message.getMessageType(), "messageType", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd",
+        DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd", ddlPackBean);
-                ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd",
+        DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean, false, false);
-                ddlPackBean);
-        DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean,
-                false, false);
         DdlPreparedPack.getNumEqualPack(message.getMessageSenderId(), "messageSenderId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean);
 
         DdlPreparedPack.getOrderDefault(message);
 

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-TEST-SNAPSHOT
+sonar.projectVersion=1.0-DEV-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./