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/annotation/AnnoOutputColumn.java

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.base.annotation;
+
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @Description : Excel导出列 关系描述
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-01-08 10:42
+ * @Modify:
+ **/
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AnnoOutputColumn {
+
+    // 列名称
+    public String name() default "";
+
+    // 关系对象显示的字段
+    public String value() default "";
+
+    // 显示格式
+    public FORMAT format() default FORMAT.STRING;
+
+    // 关联关系对象的Key
+    public String refForeignKey() default "";
+
+    // 关系对象
+    public Class refClass() default Object.class;
+
+    public boolean hidden() default false;
+
+    // 敬请发挥
+    public enum FORMAT{
+        STRING("STRING","全部显示"),                    // String 类型
+        STRING_50("STRING_50","显示前面50字符"),        // String 长度50
+        DATE("DATE","yyyy-MM-dd"),                      // 日期
+        DATE_TIME("DATE_TIME","yyyy-MM-dd HH:mm:ss");   // 日期及时间
+
+        String name;
+        String description;
+
+        FORMAT(String name, String description) {
+            this.name = name;
+            this.description = description;
+        }
+    };
+}
+

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.base.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -8,10 +9,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import org.hibernate.annotations.GenericGenerator;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.persistence.*;
-import javax.xml.bind.annotation.XmlType;
 import java.io.Serializable;
 
 /**
@@ -39,6 +38,7 @@ public abstract class BaseBean implements Serializable {
     @Column(name="id")
     @ApiParam(value = "主键",example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     public Long id;
 
     //get单独处理
@@ -56,11 +56,13 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="is_valid")
     @ApiParam(value = "有效性",example = "1")
+    @AnnoOutputColumn(hidden = true)
     //启用停用
     public Integer isValid;    //CommonEnumUtil.IS_VAILD;
 
     @Column(name="is_deleted")
     @ApiParam(value = "是否已删除",example = "2")
+    @AnnoOutputColumn(hidden = true)
     //逻辑删除，软删除
     public Integer isDeleted;    //CommonEnumUtil.TRUE_OR_FALSE
 
@@ -83,29 +85,35 @@ public abstract class BaseBean implements Serializable {
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    @AnnoOutputColumn(hidden = true)
     public String createDateTimeStart;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    @AnnoOutputColumn(hidden = true)
     public String createDateTimeEnd;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    @AnnoOutputColumn(hidden = true)
     public String modifyDateTimeStart;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    @AnnoOutputColumn(hidden = true)
     public String modifyDateTimeEnd;
 
     @Transient
     @ApiParam(value = "排序属性")
+    @AnnoOutputColumn(hidden = true)
     public String orderByParam = "";
 
     @Transient
     @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
+    @AnnoOutputColumn(hidden = true)
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
     public Integer ascOrDesc = 1;
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.base.bean;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-01-08 18:46
+ * @Modify:
+ **/
+public class BaseConstWords {
+
+    // 字典代码
+    // 性别 SYS_SEX
+    public static final String DICTIONARY_SEX = "SYS_SEX";
+    // 文件类型 FILE_TYPE
+    public static final String DICTIONARY_FILE_TYPE = "FILE_TYPE";
+    // 婚姻 MARRIAGE
+    public static final String DICTIONARY_MARRIAGE = "MARRIAGE";
+    // 学历 EDUCATION
+    public static final String DICTIONARY_EDUCATION = "EDUCATION";
+    // 民族 NATIONALITY
+    public static final String DICTIONARY_NATIONALITY = "NATIONALITY";
+    // 证件类型 CERTIFICATE_TYPE
+    public static final String DICTIONARY_CERTIFICATE_TYPE = "CERTIFICATE_TYPE";
+    // 员工等级 GRADE
+    public static final String DICTIONARY_EMPLOYEE_GRADE ="GRADE";
+    // 政治面貌 POLITICAL_STATUS
+    public static final String DICTIONARY_POLITICAL_STATUS ="POLITICAL_STATUS";
+    // 员工类型 EMPLOYEE_TYPE
+    public static final String DICTIONARY_EMPLOYEE_TYPE ="EMPLOYEE_TYPE";
+}

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

@@ -114,6 +114,10 @@ public class CommonEnumUtil {
             return value;
         }
 
+        public String getValueStr() {
+            return value + "";
+        }
+
         public String getDescription() {
             return description;
         }
@@ -137,6 +141,9 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+        public static String valueOfDescription(int val) {return valueOf(val);}
+        public static int descriptionOfValue(String desc) {return descOf(desc);}
+
     }
 
     /**
@@ -806,4 +813,43 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 数学表达式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MATH_SYMBOL {
+        GREATER(1, ">"),
+        GREATER_OR_EQUAL(2, ">="),
+        LESS(3, "<"),
+        LESS_OR_EQUAL(4, "<="),
+        EQUAL(5, "="),
+        NOT_EQUAL(6, "<>");
+
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private MATH_SYMBOL(int value, String description) {
+            this.value = value;
+            this.description = 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;
+        }
+    }
 }

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

@@ -896,4 +896,155 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 系统值类型
+     * 1. String
+     * 2. Number
+     * 3. Date
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYS_CACHE_TYPE {
+
+        REDIS(1,"Redis","Redis 缓存方式");
+
+        private int value;
+        private String name;
+        private String description;
+
+        SYS_CACHE_TYPE() {
+        }
+
+        SYS_CACHE_TYPE(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].name;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(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 String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 导出列关系类型
+     */
+    public enum COL_REF_TYPE {
+        REF_NO(1, "无"),
+        REF_ENUM(2, "枚举"),
+        REF_OBJECT(3, "对象"),
+        REF_DICT(4, "字典");
+
+        private int value;
+        private String description;
+
+        private COL_REF_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(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 descriptionOfValue(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;
+        }
+    }
+
+    /**
+     * 系统表达式组
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYS_CONFIG_GROUP {
+        EXCEL(1, "excel导入导出"),
+        PASSWORD(2, "密码安全策略"),
+        MAIL(3, "邮件配置"),
+        CONTACT(4, "联系人"),
+        BASIS(5, "基础");
+
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private SYS_CONFIG_GROUP(int value, String description) {
+            this.value = value;
+            this.description = 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;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -941,12 +941,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username) {
         if(propValues != null && propValues.length > 0){
             String hql = "update " + persistentClass.getName()
-                    + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime  where model."
+                    + " model set model.isDeleted =:modelIsDeleted,model.modifyUser=:modelModifyUser,model.modifyDatetime=:modelModifyDatetime  where model."
                     + propName + " in(:"+propName+") ";
             Query query = entityManager.createQuery(hql);
-            query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+            query.setParameter("modelIsDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
-            query.setParameter("modifyUser",username);
+            query.setParameter("modelModifyUser",username);
-            query.setParameter("modifyDatetime",getNowTime(true));
+            query.setParameter("modelModifyDatetime",getNowTime(true));
             query.setParameter(propName, Arrays.asList(propValues));
 
             return query.executeUpdate();
@@ -963,12 +963,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int deleteWeaklyByProperties(String[] propName, Object[] propValue,String username) {
         if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) {
             StringBuffer sb = new StringBuffer("update " + persistentClass.getName()
-                    + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 ");
+                    + " model set model.isDeleted = :modelDeleted,model.modifyUser= :modelModifyUser,model.modifyDatetime=:modelModifyDatetime where 1=1 ");
             appendQL(sb,propName,propValue);
             Query query = entityManager.createQuery(sb.toString());
-            query.setParameter("modifyUser",username);
+            query.setParameter("modelModifyUser",username);
-            query.setParameter("modifyDatetime",getNowTime(true));
+            query.setParameter("modelModifyDatetime",getNowTime(true));
-            query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+            query.setParameter("modelDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
 
             setParameter(query,propName,propValue);
 
@@ -1001,12 +1001,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status,String username) {
         if(propValues != null && propValues.length > 0){
             String hql = "update " + persistentClass.getName()
-                    + " model set model.isValid = :isValid ,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where model."
+                    + " model set model.isValid =:modelIsValid ,model.modifyUser=:modelModifyUser,model.modifyDatetime=:modelModifyDatetime where model."
                     + propName + " in(:"+propName+") ";
             Query query = entityManager.createQuery(hql);
-            query.setParameter("modifyUser",username);
+            query.setParameter("modelModifyUser",username);
-            query.setParameter("modifyDatetime",getNowTime(true));
+            query.setParameter("modelModifyDatetime",getNowTime(true));
-            query.setParameter("isValid",status);
+            query.setParameter("modelIsValid",status);
             query.setParameter(propName, Arrays.asList(propValues));
 
             return query.executeUpdate();
@@ -1023,12 +1023,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int updateValidStatusByProperties(String[] propName, Object[] propValue,int status,String username) {
         if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) {
             StringBuffer sb = new StringBuffer("update " + persistentClass.getName()
-                    + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 ");
+                    + " model set model.isValid = :modelIsValid,model.modifyUser= :modelModifyUser,model.modifyDatetime=:modelModifyDatetime where 1=1 ");
             appendQL(sb,propName,propValue);
             Query query = entityManager.createQuery(sb.toString());
-            query.setParameter("modifyUser",username);
+            query.setParameter("modelModifyUser",username);
-            query.setParameter("modifyDatetime",getNowTime(true));
+            query.setParameter("modelModifyDatetime",getNowTime(true));
-            query.setParameter("isValid",status);
+            query.setParameter("modelIsValid",status);
 
             setParameter(query,propName,propValue);
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.model.platform;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2019-01-10 13:52
+ * @Modify:
+ **/
+@Data
+public class UserDetailPagerModel {
+
+    private UserDetailModel userDetailModel;
+
+    private Pager pager;
+}

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

@@ -41,6 +41,11 @@ public class SysConfig extends BaseBean {
     @ApiParam(value ="配置代码")
     private String configCode;
 
+    // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP
+    @Column(name="CONFIG_GROUP")
+    @ApiParam(value ="配置组")
+    private Integer configGroup;
+
     // 枚举 ImppEnumUtil.SYS_VALUE_TYPE
     @Column(name="CONFIG_VALUE_TYPE")
     @ApiParam(value ="配置值类型")

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

@@ -42,7 +42,7 @@ public class SysMessage extends BaseBean {
     @ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)" , example ="-1")
     private Integer messageContentType;
 
-    @Column(name="MESSAGE_CONTENT")
+    @Column(name="MESSAGE_CONTENT",columnDefinition = "TEXT")
     @ApiParam(value ="消息内容" , access ="消息内容")
     private String messageContent;
 

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

@@ -1,8 +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.CommonEnumUtil;
-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;
@@ -15,7 +15,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 单号规则
@@ -62,36 +61,24 @@ public class SysOrderNoRule extends BaseBean {
     private Long serialNoLength;
 
     @Column(name = "IS_CYCLE")
-    @ApiParam(value = "达到最大值后是否循环",example = "1",hidden = true)
+    @ApiParam(value = "达到最大值后是否循环",example = "1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     private Integer isCycle;
 
-    @Transient
-    @ApiParam(value = "达到最大值后是否循环",example = "否")
-    private String isCycleName;
-
-    public String getIsCycleName() {
-        if(isCycle != null){
-            CommonEnumUtil.TRUE_OR_FALSE.valueOf(isCycle);
-        }
-        return isCycleName;
-    }
-
-    public void setIsCycleName(String isCycleName) {
-        this.isCycleName = isCycleName;
-        this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName);
-    }
-
     @Column(name = "SERIAL_NO")
-    @ApiParam(value = "当前流水号",example = "-1",hidden = true)
+    @ApiParam(value = "当前流水号",example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     private Long serialNo;
 
     @Column(name = "ORDER_NO")
-    @ApiParam(value = "当前单号",hidden = true)
+    @ApiParam(value = "当前单号")
+    @AnnoOutputColumn(hidden = true)
     private String orderNo;
 
     @Column(name = "ORDER_NO_RULE_STATUS")
-    @ApiParam(value = "单号规则状态",hidden = true)
+    @ApiParam(value = "单号规则状态")
+    @AnnoOutputColumn(hidden = true)
     private Integer orderNoRuleStatus;
 
     @Column(name="ORDER_NO_RULE_DESCRIPTION")

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

@@ -60,6 +60,10 @@ public class SysRefUserMessage extends BaseBean {
     @ApiParam(value = "接收时间")
     private String receiverTime;
 
+    @Column(name="IS_URGENT")
+    @ApiParam(value ="是否紧急")
+    private Integer isUrgent;
+
     @Column(name="MESSAGE_STATUS")
     @ApiParam(value = "消息状态")
     private Integer messageStatus;

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

@@ -1,6 +1,10 @@
 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.bean.BaseConstWords;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -36,6 +40,7 @@ public class  SysUserInfo extends BaseBean {
     @Column(name="USER_ID")
     @ApiParam(value ="账号ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     private Long userId;
 
     @Column(name="NAME")
@@ -48,10 +53,12 @@ public class  SysUserInfo extends BaseBean {
 
     @Column(name="USER_EMPLOYEE_TYPE")
     @ApiParam(value ="员工类型", access ="实习、试用期、正式")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_TYPE)
     private Integer userEmployeeType;
 
     @Column(name="USER_GRADE")
     @ApiParam(value ="员工等级")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_GRADE)
     private Integer userGrade;
 
     @Column(name="USER_JOIN_DATE")
@@ -64,6 +71,7 @@ public class  SysUserInfo extends BaseBean {
 
     @Column(name="USER_CARD_TYPE")
     @ApiParam(value ="证件类型")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_CERTIFICATE_TYPE)
     private Integer userCardType;
 
     @Column(name="USER_CARD_NUMBER")
@@ -84,10 +92,12 @@ public class  SysUserInfo extends BaseBean {
 
     @Column(name="user_School_Education")
     @ApiParam(value ="学历")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EDUCATION)
     private Integer userSchoolEducation;
 
     @Column(name="USER_SEX")
     @ApiParam(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_SEX)
     private Integer userSex;
 
     @Column(name="USER_BIRTHPLACE")
@@ -95,11 +105,13 @@ public class  SysUserInfo extends BaseBean {
     private String userBirthplace;
 
     @Column(name="USER_RACE")
-    @ApiParam(value ="种族")
+    @ApiParam(value ="民族")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_NATIONALITY)
     private Integer userRace;
 
     @Column(name="USER_MARRIAGE")
     @ApiParam(value ="婚姻" , example ="1" , access ="性别（1.未知，2.已婚,3未婚）")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_MARRIAGE)
     private Integer userMarriage;
 
     @Column(name="USER_EMERGENCY_CONTACT")
@@ -120,6 +132,7 @@ public class  SysUserInfo extends BaseBean {
 
     @Column(name="USER_POLITICAL_STATUS")
     @ApiParam(value ="政治面貌")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_POLITICAL_STATUS)
     private Integer userPoliticalStatus;
 
     @Column(name="USER_HOBBY")
@@ -128,6 +141,7 @@ public class  SysUserInfo extends BaseBean {
 
     @Column(name="USER_INFO_STATUS")
     @ApiParam(value ="用户状态" , example ="-1")
+    @AnnoOutputColumn(hidden = true)
     private Integer userInfoStatus;
 
     @Column(name="USER_LOGIN_NUM")
@@ -143,21 +157,25 @@ public class  SysUserInfo extends BaseBean {
     @Column(name="USER_IMAGE_ID")
     @ApiParam(value ="用户图像" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     private Long userImageId;
 
     @Column(name="DEPARTMENT_ID")
     @ApiParam(value ="部门ID" , example ="-1")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     private Long departmentId;
 
     @Column(name="POSITION_ID")
     @ApiParam(value ="岗位ID" , example ="-1")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     private Long positionId;
 
     @Column(name="ORGANIZE_ID")
     @ApiParam(value ="组织ID" , example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     private Long organizeId;
 
 /********************************** 冗余信息 ********************************/
@@ -168,6 +186,7 @@ public class  SysUserInfo extends BaseBean {
 
     @Column(name="DEPARTMENT_NAMES_RDD")
     @ApiParam(value ="部门集合" , access ="部门集合")
+    @AnnoOutputColumn(hidden = true)
     private String departmentNamesRdd;
 
     @Column(name="POSITION_NAME_RDD")
@@ -176,6 +195,7 @@ public class  SysUserInfo extends BaseBean {
 
     @Column(name="POSITION_NAMES_RDD")
     @ApiParam(value ="岗位集合" , access ="岗位集合")
+    @AnnoOutputColumn(hidden = true)
     private String positionNamesRdd;
 
     @Column(name="ORGANIZE_NAME_RDD")
@@ -184,40 +204,48 @@ public class  SysUserInfo extends BaseBean {
 
     @Column(name="ORGANIZE_NAMES_RDD")
     @ApiParam(value ="组织集合" , access ="组织集合")
+    @AnnoOutputColumn(hidden = true)
     private String organizeNamesRdd;
 
 /********************************** 非数据库信息 ********************************/
 
     @Transient
     @ApiParam(value ="用户所有部门信息")
+    @AnnoOutputColumn(hidden = true)
     private List<SysDepartment> departmentList;
 
     @Transient
     @ApiParam(value ="用户所有部门Id信息")
+    @AnnoOutputColumn(hidden = true)
     private List<String> departmentIdList;
 
     @Transient
     @ApiParam(value ="用户所有岗位信息")
+    @AnnoOutputColumn(hidden = true)
     private List<SysPosition> positionList;
 
     @Transient
     @ApiParam(value ="用户所有组织信息")
+    @AnnoOutputColumn(hidden = true)
     private List<SysOrganize> organizeList;
 
     @Transient
     @ApiParam(value ="用户所有组织Id信息")
+    @AnnoOutputColumn(hidden = true)
     private List<String> organizeIdList;
 
     @Transient
     @ApiParam(value ="用户部门信息")
+    @AnnoOutputColumn(hidden = true)
     private SysDepartment department;
 
     @Transient
     @ApiParam(value ="用户组织信息")
+    @AnnoOutputColumn(hidden = true)
     private SysOrganize organize;
 
     @Transient
     @ApiParam(value = "岗位信息")
+    @AnnoOutputColumn(hidden = true)
     private SysPosition position;
-
 }

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

@@ -1,5 +1,6 @@
 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 io.swagger.annotations.Api;
@@ -32,6 +33,7 @@ public class SysLogException extends BaseBean {
     //CommonEnumUtil.SOFT_TYPE
     @Column(name="EXC_MODULE_ID")
     @ApiParam(value ="系统模块（枚举）", example = "1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
     private Integer excModule;
 
     private String excModuleName;

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

@@ -1,7 +1,9 @@
 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 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;
@@ -34,6 +36,7 @@ public class SysLogOperate extends BaseBean {
     //CommonEnumUtil.SOFT_TYPE
     @Column(name="OPERATE_MODULE")
     @ApiParam(value ="系统模块（枚举）", example = "1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
     private Integer operateModule;
 
     private String operateModuleName;
@@ -47,6 +50,7 @@ public class SysLogOperate extends BaseBean {
     //ImppEnumUtil.OPERATE_TYPE（枚举）
     @Column(name="OPERATE_TYPE")
     @ApiParam(value ="操作类型" , example = "-1")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description")
     private Integer operateType;
 
     @Column(name="OPERATE_MESSAGE")

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

@@ -1,6 +1,9 @@
 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 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;
@@ -33,11 +36,13 @@ public class SysLogSystem extends BaseBean {
     @Column(name="LOG_LEVEL")
     @ApiParam(value ="日志级别" , example ="1")
     //ImppEnumUtil.LOG_LEVEL
+    @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name")
     private Integer logLevel;
 
     @Column(name="LOG_MODULE_ID")
     @ApiParam(value ="系统模块（枚举）", example = "1")
     //CommonEnumUtil.SOFT_TYPE
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
     private Integer logModuleId;
 
     @Column(name="REMOTE_IP")