彭伟代码恢复

定时任务日志过滤器

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

@@ -1006,7 +1006,7 @@ public class CommonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum USER_LOGIN_STATUS {
         LOGIN_SUCCESS(1, "登录成功", "登录成功"),
-        WRONG_PASSWORD(3, "密码错误", "Linux 密码错误"),
+        WRONG_PASSWORD(3, "密码错误", "用户密码错误"),
         WRONG_USERNAME_OR_PASSWORD(2, "用户名或密码错误", "用户名或密码错误"),
         USER_LOGIN_LOCKING(4, "账号已锁定", "账号已锁定"),
         USER_INFO_NULL(5, "用户信息不存在", "用户信息不存在"),

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

@@ -843,7 +843,8 @@ public class ImppEnumUtil {
         DATE(3, "date", "时间"),
         SWITCH(4, "switch", "布尔"),
         SELECT(5, "select", "选择"),
-        FILE(6, "select", "选择");
+        FILE(6, "select", "选择"),
+        ARRAY(7, "array", "数组");
 
         private int value;
         private String name;

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -55,8 +55,9 @@ public class LacHqlPack {
     }
 
     public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean) {
-        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
 
+        DdlPreparedPack.getNumEqualPack(bean.getLogTaskId(),"logTaskId",ddlPackBean);
         return ddlPackBean;
     }
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.model.lac;
 
-import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
 
@@ -29,10 +28,4 @@ public class LacSuitRequest implements Serializable {
      */
     private List<Task> taskList;
 
-    /**
-     * 指令集代码
-     */
-    @XStreamCDATA
-    private String paramList;
-
 }

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 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;
@@ -10,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Subselect;
 
 import javax.persistence.*;
 import java.util.List;
@@ -32,6 +30,7 @@ import java.util.List;
 public class SysMessage extends BaseBean {
 
     private static final long serialVersionUID = -6090909263221993356L;
+
     @Column(name = "MESSAGE_TITLE")
     @ApiParam(value = "消息标题", access = "消息标题")
     private String messageTitle;
@@ -45,7 +44,7 @@ public class SysMessage extends BaseBean {
     private Integer messageType;
 
     public int getMessageTypeValue() {
-        if(this.messageType == null){
+        if (this.messageType == null) {
             return 0;
         } else {
             return this.messageType.intValue();

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

@@ -13,7 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import java.text.DecimalFormat;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 关系-角色菜单
@@ -50,10 +51,18 @@ public class SysRefRoleMenu extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
+    @Column(name="SOFT_TYPE")
+    @ApiParam(value ="产品类型")
+    private Integer softType;
+
     @Column(name="ROLE_NAME_Rdd")
     @ApiParam(value ="角色名称" , access ="角色名称")
     private String roleNameRdd;
 
+    @Transient
+    @ApiParam(value ="权限ID列表" , access ="权限ID列表")
+    private List<Long> menuIdList;
+
     public SysRefRoleMenu() {
     }
 

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

@@ -587,10 +587,11 @@ public class CoreHqlPack {
         DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", result);
 //        DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
 
-        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result);
+        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
-        DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", result);
+        DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
-        DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", result);
+        DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
-        DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", result);
+        DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result);
 //        DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
 
         DdlPreparedPack.getInPackList(idList, "id", result);

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -34,6 +35,7 @@ public class BrCssStyle extends BaseBean {
     @ApiParam(value ="样式编码")
     private String styleCode;
 
+    @Lob
     @Column(name="STYLE_CONTENT")
     @ApiParam(value ="样式内容")
     private String styleContent;