定时任务

定时任务表达式     功能完成
    定时任务           功能完成

权限
    用户管理           功能完成
    用户登录           功能完成

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

@@ -15,13 +15,13 @@ public class CommonEnumUtil {
      * 软件类型
      */
     public enum SOFT_TYPE {
-        IMPP(1,"IMPP", "IMPP平台"),CORE(2,"CORE", "i3业务平台"), WMS(3,"WMS", "仓库管理软件"), MES(4,"MES", "生产管理软件");
+        IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件");
 
         private int value;
         private String code;
         private String description;
 
-        private SOFT_TYPE(int value,String code, String description) {
+        private SOFT_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -140,8 +140,8 @@ public class CommonEnumUtil {
      * 处理标识
      */
     public enum SYS_LOCALE_RESOURCE_TYPE {
-        COMMON(1,"通用"),
-        MODULE(10, "模块"),METHOD(11, "功能"),BUTTON(12, "按钮");
+        COMMON(1, "通用"),
+        MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮");
 
         private int value;
         private String description;
@@ -176,14 +176,15 @@ public class CommonEnumUtil {
      * admin 包含所有模块及功能权限
      * sa 包含admin权限，以及后台管理权限
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum USER_TYPE {
-        USER(1,"user", "普通用户"), ADMIN(2,"admin", "系统管理员"), SA(3,"sa", "超级管理员");
+        USER(1, "user", "普通用户"), ADMIN(2, "admin", "系统管理员"), SA(3, "sa", "超级管理员");
 
         private int value;
         private String code;
         private String description;
 
-        private USER_TYPE(int value,String code, String description) {
+        private USER_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -197,7 +198,66 @@ public class CommonEnumUtil {
             return description;
         }
 
-        public String getCode(){
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 用户状态
+     * 1正常
+     * 2冻结使用
+     * 3账号异常
+     * 4离职
+     * 5服务到期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum USER_STATUS {
+        NORMAL(1, "NORMAL", "正常"),
+        FREEZE(2, "FREEZE", "冻结"),
+        ABERRANT(3, "ABERRANT", "异常"),
+        RESIGNATION(4, "RESIGNATION", "离职"),
+        EXPIRE(5, "EXPIRE", "服务到期");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private USER_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
             return code;
         }
 
@@ -224,7 +284,7 @@ public class CommonEnumUtil {
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_STATUS {
-        Enable(1, "启用","fa fa-success cell-fa fa-check"), Disable(2, "禁止","fa fa-disabled cell-fa fa-times-circle"), locking(3, "锁定","fa cell-fa fa-lock");
+        Enable(1, "启用", "fa fa-success cell-fa fa-check"), Disable(2, "禁止", "fa fa-disabled cell-fa fa-times-circle"), locking(3, "锁定", "fa cell-fa fa-lock");
 
         private int value;
         private String name;
@@ -275,6 +335,7 @@ public class CommonEnumUtil {
     /**
      * 功能级别
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum METHOD_LEVEL {
         MODULE(1, "模块"), METHOD(2, "功能"), BUTTON(3, "按钮");
 

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

@@ -13,10 +13,11 @@ public class ImppEnumUtil {
 
     /**
      * 组织类型
+     * 1.集团，2.公司，3.工厂
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORGANIZE_YTPE{
-//        1.集团，2.公司，3.工厂
+
         TYPE_GROUP(1,"集团","组织类型为集团"),
         TYPE_COMPANY(2,"公司","组织类型为公司"),
         TYPE_FACTORY(3,"工厂","组织类型为集团"),
@@ -78,4 +79,74 @@ public class ImppEnumUtil {
         }
     }
 
+
+    /**
+     * 组织类型
+     * 1.Java Class 方法
+     * 2.Http URL
+     * 3.权限CODE
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TASK_METHOD_TYPE{
+        TYPE_GROUP(1,"类方法","Java Class 方法"),
+        TYPE_COMPANY(2,"链接","Http URL"),
+        TYPE_FACTORY(3,"权限CODE","权限CODE"),
+        ;
+
+        private int value;
+        private String name;
+        private String description;
+
+        TASK_METHOD_TYPE() {
+        }
+
+        TASK_METHOD_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;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -138,7 +138,7 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
 
     public int listCount();
 
-    public int findByPropertyCount(String propertyName, Object value);
+    public long findByPropertyCount(String propertyName, Object value);
 
     public int findByPropertyCount(String[] propertyNames, Object[] values);
 

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

@@ -8,6 +8,7 @@ import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
 import javax.persistence.EntityManager;
 import javax.persistence.Id;
 import javax.persistence.Query;
+import javax.persistence.TypedQuery;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.util.*;
@@ -342,11 +343,11 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     @Override
-    public int findByPropertyCount(String propertyName, Object value) {
+    public long findByPropertyCount(String propertyName, Object value) {
         String queryString = "select count(distinct model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName;
-        return entityManager.createQuery(queryString,Integer.class)
-                    .setParameter(propertyName, value)
-                    .getSingleResult();
+        return entityManager.createQuery(queryString, Long.class)
+                .setParameter(propertyName, value)
+                .getSingleResult();
     }
 
     @Override

modules/i3plus-pojo-model/pom.xml

@@ -18,6 +18,12 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-platform</artifactId>
+        </dependency>
+
     </dependencies>
 
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.model.flatform;
+
+import cn.estsh.i3plus.pojo.platform.bean.*;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Set;
+
+
+/**
+ * @Description : 用户封装对象
+ * <pre>
+ *      用户对象        </br>
+ *      用户详细对象    </br>
+ *      角色对象        </br>
+ *      部门对象        </br>
+ *      组织对象        </br>
+ *      岗位对象        </br>
+ * </pre>
+ *
+ * @Reference :
+ * @Author : wei.peng
+ * @Date : 2018-10-25 16:54
+ * @Modify :
+ **/
+@Data
+public class UserModel {
+
+    @ApiParam("用户对象信息")
+    private SysUser user;
+
+    @ApiParam("用户对象信息")
+    private SysUserInfo userInfo;
+
+    @ApiParam(value = "角色信息",access = "用户所拥有岗位信息集合")
+    private Set<SysRole> roles;
+
+    @ApiParam(value = "岗位信息",access = "用户所拥有岗位信息集合")
+    private Set<Position> positions;
+
+    @ApiParam(value = "部门信息",access = "用户所有用部门信息集合")
+    private Set<Department> departments;
+
+    @ApiParam(value = "组织信息",access = "用户所拥有的组织信息集合")
+    private Set<Organize> organizes;
+
+    @ApiParam(value = "角色信息",access = "用户所拥有岗位信息")
+    private SysRole role;
+
+    @ApiParam(value = "岗位信息",access = "用户所拥有岗位信息")
+    private Position position;
+
+    @ApiParam(value = "部门信息",access = "用户所有用部门信息")
+    private Department department;
+
+    @ApiParam(value = "组织信息",access = "用户所拥有的组织信息")
+    private Organize organize;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/hardware/EsbXmlMessage.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.model.hardware;
 
 import io.swagger.annotations.ApiParam;
+import lombok.Data;
 
 /**
  * @Description :
@@ -9,6 +10,7 @@ import io.swagger.annotations.ApiParam;
  * @CreateDate : 2018-09-04 15:58
  * @Modify:
  **/
+@Data
 public class EsbXmlMessage {
     //
     @ApiParam("主键id")
@@ -35,67 +37,4 @@ public class EsbXmlMessage {
     @ApiParam("解析是否成功")
     private Boolean isParse;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getsId() {
-        return sId;
-    }
-
-    public void setsId(String sId) {
-        this.sId = sId;
-    }
-
-    public String getServiceId() {
-        return serviceId;
-    }
-
-    public void setServiceId(String serviceId) {
-        this.serviceId = serviceId;
-    }
-
-    public String getTopicDesc() {
-        return topicDesc;
-    }
-
-    public void setTopicDesc(String topicDesc) {
-        this.topicDesc = topicDesc;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public String getSourceSysId() {
-        return sourceSysId;
-    }
-
-    public void setSourceSysId(String sourceSysId) {
-        this.sourceSysId = sourceSysId;
-    }
-
-    public String getSerialNo() {
-        return serialNo;
-    }
-
-    public void setSerialNo(String serialNo) {
-        this.serialNo = serialNo;
-    }
-
-    public Boolean getParse() {
-        return isParse;
-    }
-
-    public void setParse(Boolean parse) {
-        isParse = parse;
-    }
 }

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

@@ -50,4 +50,6 @@ public class Position extends BaseBean {
     @ApiParam(value ="描述" , access ="描述")
     private String positionDescription;
 
+
+
 }

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

@@ -44,4 +44,12 @@ public class RefUserDepartment extends BaseBean {
     @ApiParam(value ="部门名称" , access ="部门名称")
     private String redDepartmentName;
 
+    public RefUserDepartment() {
+    }
+
+    public RefUserDepartment(Long userId, Long departmentId, String redDepartmentName) {
+        this.userId = userId;
+        this.departmentId = departmentId;
+        this.redDepartmentName = redDepartmentName;
+    }
 }

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

@@ -43,4 +43,12 @@ public class RefUserPosition extends BaseBean {
     @ApiParam(value ="岗位名称" , access ="岗位名称")
     private String redPositionName;
 
+    public RefUserPosition() {
+    }
+
+    public RefUserPosition(Long userId, Long positionId, String redPositionName) {
+        this.userId = userId;
+        this.positionId = positionId;
+        this.redPositionName = redPositionName;
+    }
 }

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

@@ -44,4 +44,12 @@ public class RefUserRole extends BaseBean {
     @ApiParam(value ="角色名称" , access ="角色名称")
     private String redRoleName;
 
+    public RefUserRole() {
+    }
+
+    public RefUserRole(Long userId, Long roleId, String redRoleName) {
+        this.userId = userId;
+        this.roleId = roleId;
+        this.redRoleName = redRoleName;
+    }
 }

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

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import io.swagger.annotations.ApiParam;
+import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description : 操作人对象，用于登陆，非持久化
@@ -11,6 +13,7 @@ import java.io.Serializable;
  * @CreateDate : 2018-09-04 15:58
  * @Modify:
  **/
+@Data
 public class SessionUser implements Serializable {
 
     @ApiParam("用户工号")
@@ -19,9 +22,6 @@ public class SessionUser implements Serializable {
     @ApiParam("用户姓名")
     private String userName;
 
-    @ApiParam("站点代码")
-    private String siteCode;
-
     @ApiParam("语言代码")
     private String languageCode;
 
@@ -29,60 +29,38 @@ public class SessionUser implements Serializable {
     //CommonEnumUtil.USER_TYPE.xxx.getCode()
     private String userType;
 
+    @ApiParam("用户信息")
+    private SysUser user;
+
+    @ApiParam("用户对象信息")
+    private SysUser userInfo;
+
+    @ApiParam(value = "角色信息",access = "用户所拥有岗位信息集合")
+    private List<SysRole> roleList;
+
+    @ApiParam(value = "岗位信息",access = "用户所拥有岗位信息集合")
+    private List<Position> positionList;
+
+    @ApiParam(value = "部门信息",access = "用户所有用部门信息集合")
+    private List<Department> departmentList;
+
+    @ApiParam(value = "组织信息",access = "用户所拥有的组织信息集合")
+    private Organize organize;
+
     public SessionUser() {
     }
 
     public SessionUser(String userCode, String userName, String siteCode) {
         this.userCode = userCode;
         this.userName = userName;
-        this.siteCode = siteCode;
+
     }
 
     public SessionUser(String userCode, String userName, String siteCode, String languageCode, String userType) {
         this.userCode = userCode;
         this.userName = userName;
-        this.siteCode = siteCode;
         this.languageCode = languageCode;
         this.userType = userType;
     }
 
-    public String getUserCode() {
-        return userCode;
-    }
-
-    public void setUserCode(String userCode) {
-        this.userCode = userCode;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getSiteCode() {
-        return siteCode;
-    }
-
-    public void setSiteCode(String siteCode) {
-        this.siteCode = siteCode;
-    }
-
-    public String getLanguageCode() {
-        return languageCode;
-    }
-
-    public void setLanguageCode(String languageCode) {
-        this.languageCode = languageCode;
-    }
-
-    public String getUserType() {
-        return userType;
-    }
-
-    public void setUserType(String userType) {
-        this.userType = userType;
-    }
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -8,6 +10,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description : 用户登陆表
@@ -22,31 +25,98 @@ import javax.persistence.Table;
 @Api(value="用户登陆表",description = "用户登陆系统账户。")
 public class SysUser extends BaseBean {
 
-    @Column(name="employee_id")
-    @ApiParam(value = "人员主键")
-    private Long employeeId;
+    @Column(name="NAME")
+    @ApiParam(value ="名称" , access ="名称")
+    private String name;
 
-    @Column(name="login_name")
-    @ApiParam(value = "登陆名",example = "前台显示的名称")
-    private String loginName;
+    @Column(name="USER_LOGIN_NAME")
+    @ApiParam(value ="登陆名称" , access ="登陆名称")
+    private String userLoginName;
 
-    @Column(name="login_pwd")
-    @ApiParam(value = "登陆密码",example = "使用浏览器语言代码，参考java.util.Locale中的代码。CN/zh，TW/zh，HK/zh，US/en, FR/en,GB/en,JP/en,DE/en,KR/en")
-    private String loginPwd;
+    @Column(name="USER_EMP_NO")
+    @ApiParam(value ="工号" , access ="工号")
+    private String userEmpNo;
 
-    //@Column(name="login_pwd_salt")
-    //@ApiParam(value = "密码盐",example = "系统生成6位随机数")
-    //private String loginPwdSalt;
+    @Column(name="USER_LOGIN_PASSWORD")
+    @ApiParam(value ="登陆密码" , access ="登陆密码")
+    private String userLoginPassword;
 
-    @Column(name="employee_code")
-    @ApiParam(value = "员工工号（冗余）")
-    private String employeeCodeRdd;
+    @Column(name="USER_TYPE_ID")
+    @ApiParam(value ="用户类型（待定）" , example ="1" , access ="用户类型（待定）")
+    private Integer userTypeId;
 
-    @Column(name="employee_name_rdd")
-    @ApiParam(value = "姓名（冗余）")
-    private String employeeNameRdd;
+    @Column(name="DEPARTMENT_ID")
+    @ApiParam(value ="部门ID" , access ="部门ID，多部门机制")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long departmentId;
+
+    @Column(name="POSITION_ID")
+    @ApiParam(value ="岗位ID" , access ="主岗位ID，多岗位机制")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long positionId;
+
+    @Column(name="ROLE_ID")
+    @ApiParam(value ="角色ID" , access ="角色ID，多角色机制")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long roleId;
+
+    @Column(name="ORGANIZE_ID")
+    @ApiParam(value ="组织ID" , example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizeId;
+
+    @Column(name="RED_ROLE_NAME")
+    @ApiParam(value ="角色名称" , access ="角色名称")
+    private String redRoleName;
+
+    @Column(name="RED_POSITION_NAME")
+    @ApiParam(value ="岗位名称" , access ="岗位名称")
+    private String redPositionName;
+
+    @Column(name="RED_DEPARTMENT_NAME")
+    @ApiParam(value ="部门名称" , access ="部门名称")
+    private String redDepartmentName;
+
+    @Column(name="RED_ORGANIZE_NAME")
+    @ApiParam(value ="组织名称" , access ="组织名称")
+    private String redOrganizeName;
+
+    @Column(name="USER_ONLINE")
+    @ApiParam(value ="是否在线(1.在线，2.离线)" , example ="2" , access ="是否在线(1.在线，2.离线)")
+    private Integer userOnline;
+
+    @Column(name="USER_EMAIL")
+    @ApiParam(value ="邮箱" , access ="邮箱")
+    private String userEmail;
+
+    @Column(name="USER_PHONE")
+    @ApiParam(value ="手机号" , access ="手机号")
+    private String userPhone;
+
+    @Column(name="USER_STATUS")
+    @ApiParam(value ="用户状态(1正常,2冻结使用,3账号异常,4离职5服务到期)" , example ="1" , access ="用户状态(1正常,2冻结使用,3账号异常,4离职5服务到期)")
+    private Integer userStatus;
+
+    @Column(name="USER_LOGIN_LAST_DATE_TIME")
+    @ApiParam(value ="用户最后登录时间" , access ="用户最后登录时间")
+    private String userLoginLastDateTime;
+
+    @ApiParam(value ="用户详细信息")
+    private transient SysUserInfo userInfo;
+
+    @ApiParam(value ="用户所有角色信息")
+    private transient List<SysRole> roleList;
+
+    @ApiParam(value ="用户所有权限信息")
+    private transient List<SysMenu> menuList;
+
+    @ApiParam(value ="用户所有部门信息")
+    private transient List<Department> departmentList;
+
+    @ApiParam(value ="用户所有岗位信息")
+    private transient List<Position> positionList;
+
+    @ApiParam(value ="用户组织信息")
+    private transient Organize organize;
 
-    @Column(name="organization_name_rdd")
-    @ApiParam(value = "组织名称（冗余）")
-    private String organizationNameRdd;
 }

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

@@ -38,12 +38,27 @@ public class SysUserInfo extends BaseBean {
     @ApiParam(value ="用户ID" , example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
- 
-    @Column(name="ORGANIZE_ID")
-    @ApiParam(value ="组织ID" , example = "0")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long organizeId;
- 
+
+    @Column(name="LANGUAGE_CODE")
+    @ApiParam(value ="用户语言")
+    private String languageCode;
+
+    @Column(name="RED_DEPARTMENT_NAMES")
+    @ApiParam(value ="部门集合" , access ="部门集合")
+    private String redDepartmentNames;
+
+    @Column(name="RED_POSITION_NAMES")
+    @ApiParam(value ="岗位集合" , access ="岗位集合")
+    private String redPositionNames;
+
+    @Column(name="RED_ROLE_NAMES")
+    @ApiParam(value ="角色集合" , access ="角色集合")
+    private String redRoleNames;
+
+    @Column(name="RED_ORGANIZE_NAMES")
+    @ApiParam(value ="组织集合" , access ="组织集合")
+    private String redOrganizeNames;
+
     @Column(name="USER_IMAGE_ID")
     @ApiParam(value ="用户图像" , example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -57,8 +72,6 @@ public class SysUserInfo extends BaseBean {
     @ApiParam(value ="年龄" , example ="1" , access ="年龄")
     private Integer userAge;
  
-    @Column(name="USER_LOGIN_LAST_DATE_TIME")
-    @ApiParam(value ="用户最后登录时间" , access ="用户最后登录时间")
-    private String userLoginLastDateTime;
+
 
 }

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

@@ -23,7 +23,7 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="TASK_TIMED")
+@Table(name="TASK_TIME")
 @DynamicInsert
 @DynamicUpdate
 @Api(value="定时任务",description = "定时任务")
@@ -67,17 +67,13 @@ public class TaskTime extends BaseBean {
     @ApiParam(value ="任务类型（1.定时任务）" , example ="1" , access ="任务类型（1.定时任务）")
     private Integer taskTypeId;
  
-    @Column(name="RESOURCE_CODE")
-    @ApiParam(value ="资源代码" , access ="资源代码")
-    private String resourceCode;
+    @Column(name="TASK_METHOD")
+    @ApiParam(value ="执行方法" , access ="执行方法")
+    private String taskMethod;
  
-    @Column(name="TASK_CLASS_PATH")
-    @ApiParam(value ="任务 class path" , access ="任务 class path")
-    private String taskClassPath;
- 
-    @Column(name="TASK_URL")
-    @ApiParam(value ="任务 url" , access ="任务 url")
-    private String taskUrl;
+    @Column(name="TASK_METHOD_TYPE_ID")
+    @ApiParam(value ="任务执行类型" ,example = "1", access ="任务执行类型")
+    private Integer taskMethodTypeId;
  
     @Column(name="TASK_DESCRIPTION")
     @ApiParam(value ="任务描述" , access ="任务描述")
@@ -85,7 +81,7 @@ public class TaskTime extends BaseBean {
  
     @Column(name="TASK_STATUS")
     @ApiParam(value ="任务状态（1.正常，2.禁用）" , example ="1" , access ="任务状态（1.正常，2.禁用）")
-    private Integer taskStatus;
+    private Integer taskStatus = 1;
  
     @Column(name="LAST_RUN_DATE_TIME")
     @ApiParam(value ="最后运行时间" , access ="最后运行时间")

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

@@ -23,7 +23,7 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="TASK_TIMED_RECORDING")
+@Table(name="TASK_TIME_RECORDING")
 @DynamicInsert
 @DynamicUpdate
 @Api(value="定时任务执行记录",description = "定时任务执行记录")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeExpressionRepository.java

@@ -1,14 +1,14 @@
 package cn.estsh.i3plus.pojo.platform.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.platform.bean.SysTimeExpression;
+import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression;
 
 /**
- * @Description : 系统时间表达式
+ * @Description : 定时任务时间表达式
  * @Reference   :
  * @Author      : wei.peng
  * @Date        : 2018-10-22 12:03:01.252
  * @Modify      :
  **/
-public interface SysTimeExpressionRepository extends BaseRepository<SysTimeExpression, Long> {
+public interface TaskTimeExpressionRepository extends BaseRepository<TaskTimeExpression, Long> {
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeRecordingRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.platform.bean.TaskTimedRecording;
+import cn.estsh.i3plus.pojo.platform.bean.TaskTimeRecording;
 
 /**
  * @Description : 定时任务执行记录
@@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.TaskTimedRecording;
  * @Date        : 2018-10-22 12:03:01.409
  * @Modify      :
  **/
-public interface TaskTimedRecordingRepository extends BaseRepository<TaskTimedRecording, Long> {
+public interface TaskTimeRecordingRepository extends BaseRepository<TaskTimeRecording, Long> {
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.platform.bean.TaskTimed;
+import cn.estsh.i3plus.pojo.platform.bean.TaskTime;
 
 /**
  * @Description : 定时任务
@@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.TaskTimed;
  * @Date        : 2018-10-22 12:03:01.372
  * @Modify      :
  **/
-public interface TaskTimedRepository extends BaseRepository<TaskTimed, Long> {
+public interface TaskTimeRepository extends BaseRepository<TaskTime, Long> {
 }

pom.xml

@@ -84,6 +84,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>i3plus.pojo</groupId>
+                <artifactId>i3plus-pojo-platform</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <!-- spring-json转换 -->
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>