Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

modules/i3plus-pojo-base/pom.xml

@@ -20,6 +20,11 @@
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-model</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-core</artifactId>
+        </dependency>
     </dependencies>
 
 

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

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.model.base;
+package cn.estsh.i3plus.pojo.base.bean;
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -86,4 +87,25 @@ public abstract class BaseBean implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "修改日期查询用，查询结束日期",example = "用于前台查询")
     public transient String modifyDateTimeEnd;
+
+    @ApiParam(value = "排序属性")
+    public transient String orderByParam;
+
+    @ApiParam(value = "排序属性")
+    //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
+    public transient int ascOrDesc;
+
+    //排序方式
+    public String orderBy(){
+        String result = "";
+        if (orderByParam!=null&&orderByParam.trim().length()>0) {
+            result = " order by " + orderByParam;
+            if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
+                result += " asc";
+            }else{
+                result += " desc";
+            }
+        }
+        return result;
+    }
 }

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

@@ -1,7 +1,6 @@
-package cn.estsh.i3plus.pojo.model.base;
+package cn.estsh.i3plus.pojo.base.bean;
 
-import cn.estsh.i3plus.pojo.model.busi.OperateUser;
-import cn.estsh.i3plus.pojo.model.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import io.swagger.annotations.ApiParam;
 
 /**
@@ -21,9 +20,6 @@ public class BaseModelBean<Obj> {
 
     private String OrdersString;
 
-    @ApiParam("操作用户")
-    private OperateUser operateUser;
-
     public BaseModelBean(Obj obj, Pager pager) {
         this.obj = obj;
         this.pager = pager;
@@ -32,17 +28,6 @@ public class BaseModelBean<Obj> {
     public BaseModelBean() {
     }
 
-    public BaseModelBean(Obj obj, OperateUser operateUser) {
-        this.obj = obj;
-        this.operateUser = operateUser;
-    }
-
-    public BaseModelBean(Obj obj, Pager pager, OperateUser operateUser) {
-        this.obj = obj;
-        this.pager = pager;
-        this.operateUser = operateUser;
-    }
-
     public Obj getObj() {
         return obj;
     }
@@ -66,12 +51,4 @@ public class BaseModelBean<Obj> {
     public void setOrdersString(String ordersString) {
         OrdersString = ordersString;
     }
-
-    public OperateUser getOperateUser() {
-        return operateUser;
-    }
-
-    public void setOperateUser(OperateUser operateUser) {
-        this.operateUser = operateUser;
-    }
 }

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

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.base.bean;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+
+import java.util.List;
+
+/**
+ * @Description : service层封装列表与分页，传至controller
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-10-23 12:10
+ * @Modify:
+ **/
+public class ListPager<Obj> {
+
+    public ListPager(List<Obj> objectList, Pager objectPager) {
+        this.objectList = objectList;
+        this.objectPager = objectPager;
+    }
+
+    private List<Obj> objectList;
+    private Pager objectPager;
+
+    public List<Obj> getObjectList() {
+        return objectList;
+    }
+
+    public void setObjectList(List<Obj> objectList) {
+        this.objectList = objectList;
+    }
+
+    public Pager getObjectPager() {
+        return objectPager;
+    }
+
+    public void setObjectPager(Pager objectPager) {
+        this.objectPager = objectPager;
+    }
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.model.common;
+package cn.estsh.i3plus.pojo.base.common;
 
 import io.swagger.annotations.ApiParam;
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.model.common;
+package cn.estsh.i3plus.pojo.base.common;
 
 /**
  * @Description:    分页辅助工具

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

@@ -0,0 +1,333 @@
+package cn.estsh.i3plus.pojo.base.enumutil;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-09-12 14:32
+ * @Modify:
+ **/
+public class CommonEnumUtil {
+
+    /**
+     * 软件类型
+     */
+    public enum SOFT_TYPE {
+        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) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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].code;
+                }
+            }
+            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].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 处理标识
+     */
+    public enum TRUE_OR_FALSE {
+        TRUE(1, "是"), FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        private TRUE_OR_FALSE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return 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;
+        }
+    }
+
+    /**
+     * 处理标识
+     */
+    public enum IS_DEAL {
+        YES(1, "已处理"), NO(2, "未处理");
+
+        private int value;
+        private String description;
+
+        private IS_DEAL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return 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;
+        }
+    }
+
+    /**
+     * 处理标识
+     */
+    public enum SYS_LOCALE_RESOURCE_TYPE {
+        COMMON(1,"通用"),
+        MODULE(10, "模块"),METHOD(11, "功能"),BUTTON(12, "按钮");
+
+        private int value;
+        private String description;
+
+        private SYS_LOCALE_RESOURCE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return 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;
+        }
+    }
+
+    /**
+     * 用户类型
+     * user 通过权限设置分配权限
+     * admin 包含所有模块及功能权限
+     * sa 包含admin权限，以及后台管理权限
+     */
+    public enum USER_TYPE {
+        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) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 功能级别
+     */
+    public enum METHOD_LEVEL {
+        MODULE(1, "模块"), METHOD(2, "功能"), BUTTON(3, "按钮");
+
+        private int value;
+        private String description;
+
+        private METHOD_LEVEL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return 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;
+        }
+
+        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;
+        }
+    }
+
+
+    /**
+     * 是否有效
+     */
+    public enum IS_VAILD {
+        VAILD(1, "有效"), INVAILD(2, "无效");
+
+        private int value = 0;
+        private String description = null;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private IS_VAILD(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;
+        }
+    }
+
+
+    /**
+     * 排序方式
+     */
+    public enum ASC_OR_DESC {
+        ASC(1, "正序"), DESC(2, "倒序");
+
+        private int value = 0;
+        private String description = null;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private ASC_OR_DESC(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/MesEnumUtil.java

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.base.enumutil;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-10-23 15:53
+ * @Modify:
+ **/
+public class MesEnumUtil {
+}

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

@@ -0,0 +1,88 @@
+package cn.estsh.i3plus.pojo.base.enumutil;
+
+/**
+ * @Description : 系统资源匹配，此枚举中所有的值都需要持久化在资源表中，并且不能删除
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-09-12 14:32
+ * @Modify:
+ **/
+public class ResourceEnumUtil {
+
+    /**
+     * 异常对应
+     */
+    public enum EXCEPTION {
+        NOT_NULL("10001", "不为空"),
+        NEED_NULL("10002", "需要为空"),
+        NEED_TRUE("10003", "需要为True"),
+        NEED_FALSE("10004", "需要为False"),
+        LOWER_NUM("10005", "小于最小值"),
+        OVER_NUM("10006", "大于最大值"),
+        NUM_NOT_EQUAL("10007", "字符值不相同"),
+        STRING_NOT_EQUAL("10008", "数字值不相同"),
+        OVER_SIZE("10009", "长度超出"),
+        NOT_ZERO("10010", "不能为0");
+
+        private String code;
+        private String description;
+
+        EXCEPTION(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
+     * 消息对应
+     */
+    public enum MESSAGE {
+        SUCCESS("20001", "成功"),
+        FAIL("20002", "失败");
+
+        private String code;
+        private String description;
+
+        MESSAGE(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.base.enumutil;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-10-23 15:53
+ * @Modify:
+ **/
+public class WmsEnumUtil {
+}

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

@@ -1,8 +1,7 @@
 package cn.estsh.i3plus.pojo.base.jpa.dao;
 
-import cn.estsh.i3plus.pojo.model.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 
 import java.io.Serializable;

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

@@ -2,11 +2,8 @@ package cn.estsh.i3plus.pojo.base.jpa.daoimpl;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.base.tool.SnowflakeIdMaker;
-import cn.estsh.i3plus.pojo.model.common.Pager;
-import org.hibernate.SQLQuery;
-import org.hibernate.query.NativeQuery;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
-import org.springframework.util.CollectionUtils;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Id;
@@ -528,7 +525,14 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlWherePage(String hqlWhere, Pager pager) {
-        return entityManager.createQuery(hqlWhere)
+        StringBuffer queryString = new StringBuffer();
+        queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
+
+        if (hqlWhere != null && hqlWhere.length() > 0) {
+            queryString.append(hqlWhere);
+        }
+
+        return entityManager.createQuery(queryString.toString())
                     .setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())
                     .getResultList();

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.base.shirotoken;
+
+/**
+ * @Description : 管理员token
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-10-13 18:00
+ * @Modify:
+ **/
+public class AdminToken extends BaseToken {
+
+    public AdminToken(String loginName, String loginPwd, String languageCode) {
+        super(loginName, loginPwd, languageCode);
+    }
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.base.shirotoken;
+
+import org.apache.shiro.authc.AuthenticationToken;
+
+/**
+ * @Description : 基本验证类
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-10-13 18:00
+ * @Modify:
+ **/
+public class BaseToken implements AuthenticationToken {
+
+    private String loginName;
+    private String loginPwd;
+    private String languageCode;
+
+    public BaseToken(String loginName, String loginPwd, String languageCode) {
+        this.loginName = loginName;
+        this.loginPwd = loginPwd;
+        this.languageCode = languageCode;
+    }
+
+    //身份
+    @Override
+    public Object getPrincipal() {
+        return this.loginName;
+    }
+
+    //验证
+    @Override
+    public Object getCredentials() {
+        return this.loginPwd;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getLoginPwd() {
+        return loginPwd;
+    }
+
+    public void setLoginPwd(String loginPwd) {
+        this.loginPwd = loginPwd;
+    }
+
+    public String getLanguageCode() {
+        return languageCode;
+    }
+
+    public void setLanguageCode(String languageCode) {
+        this.languageCode = languageCode;
+    }
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.base.shirotoken;
+
+/**
+ * @Description : 超级管理员token
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-10-13 18:00
+ * @Modify:
+ **/
+public class SaAdminToken extends BaseToken {
+
+    public SaAdminToken(String loginName, String loginPwd, String languageCode) {
+        super(loginName, loginPwd, languageCode);
+    }
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.base.shirotoken;
+
+/**
+ * @Description : 普通用户token
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-10-13 18:00
+ * @Modify:
+ **/
+public class UserToken extends BaseToken {
+
+    public UserToken(String loginName, String loginPwd, String languageCode) {
+        super(loginName, loginPwd, languageCode);
+    }
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java

@@ -0,0 +1,413 @@
+package cn.estsh.i3plus.pojo.base.tool;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class HqlPack {
+
+	/**
+	 * 防止sql注入
+	 * @param data
+	 * @return
+	 */
+	public static String getSafeParam(Object data){
+		return data.toString().replaceAll(";","")
+					.replaceAll("'","")
+					.replaceAll("\"","")
+					.replaceAll("delete","")
+					.replaceAll("update","")
+					.replaceAll("insert","");
+	}
+
+	/**
+	 * 封装日期
+	 * @param startDate 开始日期
+	 * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间）
+	 * @param columnName HQL里对应的时间字段
+	 * @param result 封装的HQL
+	 * @param isShowTime 是否包含时分秒
+	 */
+	public static void timeBuilder( String startDate,String endDate, String columnName, StringBuffer result, boolean isShowTime) {
+		startDate = getSafeParam(startDate);
+		endDate = getSafeParam(endDate);
+
+		if (startDate == null || startDate.trim().length() == 0) {
+			startDate = "1900-01-01";
+		} else {
+			startDate = startDate.trim();
+		}
+		if (isShowTime && startDate.trim().length()<=11) {
+			startDate+= " 00:00:00";
+		}
+		if (endDate == null || endDate.trim().length() == 0) {
+			endDate = "2100-01-01";
+		} else {
+			endDate = endDate.trim();
+		}
+		if (isShowTime&& endDate.trim().length()<=11) {
+			endDate+= " 23:59:59";
+		}
+		result.append(" and model." + columnName + " between '" + startDate + "' and '" + endDate + "'");
+	}
+
+	/**
+	 * 封装日期
+	 * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间）
+	 * @param columnName HQL里对应的时间字段
+	 * @param result 封装的HQL
+	 * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有
+	 * @param isShowTime 是否包含时分秒
+	 */
+	public static void timeBuilder( String date, String columnName, StringBuffer result, Boolean showTaday,boolean isShowTime) {
+		date = getSafeParam(date);
+
+		String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
+		if(date != null && date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))){
+			//只有一个逗号
+			date = "";
+		}
+		if(date != null && date.trim().length() > 0){
+			String[] time = date.split(",");
+			if(time.length == 1){
+				//只有开始日期，没有结束日期
+				result.append(" and model." + columnName + " like '%" + time[0] + "%'");
+			}else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0) || (time[1] != null & time[1].trim().length() > 0))) {
+				if (time[0] == null || time[0].trim().length() == 0) {
+					time[0] = "1900-01-01";
+				} else {
+					time[0] = time[0].trim();
+				}
+				if (isShowTime && time[0].trim().length()<=11) {
+					time[0]+= " 00:00:00";
+				}
+				if (time[1] == null || time[1].trim().length() == 0) {
+					time[1] = "2100-01-01";
+				} else {
+					time[1] = time[1].trim();
+				}
+				if (isShowTime&& time[1].trim().length()<=11) {
+					time[1]+= " 23:59:59";
+				}
+				result.append(" and model." + columnName + " between '" + time[0] + "' and '" + time[1] + "'");
+			} else {
+				if (showTaday) {
+					if (isShowTime) {
+						result.append(" and model." + columnName + " between '" + today + " 00:00:00' and '" + today + " 23:59:59'");
+					}else{
+						result.append(" and model." + columnName + " between '" + today + "' and '" + today + "'");
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 封装String对象成order by排序
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getOrderByPack(Object order[],String[] columnName, StringBuffer result) {
+		String sqlStr = "";
+		String orderByStr = "";
+		for(int i=0;i < order.length;i++){
+			if (order[i] != null && order[i].toString().trim().length() > 0) {
+				if(Integer.parseInt(order[i].toString()) == 1){
+					order[i] = "asc";
+				}else{
+					order[i] = "desc";
+				}
+				sqlStr += " model."+columnName[i]+" " + order[i].toString() + ",";
+			}
+		}
+
+		if(sqlStr.length() > 0 && sqlStr.lastIndexOf(",") == sqlStr.length() -1){
+			sqlStr = sqlStr.substring(0,sqlStr.length()-1);
+			orderByStr = " order by " + sqlStr;
+		}
+
+		result.append(orderByStr);
+	}
+
+	/**
+	 * 封装String对象成like语句
+	 * @param str 对象值
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getStringLikerPack(String str,String columnName, StringBuffer result) {
+		if (str != null && str.trim().length() > 0) {
+			str = getSafeParam(str);
+			result.append(" and model."+columnName+" like '%" + str + "%'");
+		}
+	}
+
+	/**
+	 * 封装String对象成like语句
+	 * @param str 对象值
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getStringLikerPackOr(String str,String columnName, StringBuffer result) {
+		if (str != null && str.trim().length() > 0) {
+			str = getSafeParam(str);
+			result.append(" or model."+columnName+" like '%" + str + "%'");
+		}
+	}
+
+	/**
+	 * 封装String对象成like语句(右侧模糊)
+	 * @param str 对象值
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getStringRightLikerPack(String str,String columnName, StringBuffer result) {
+		if (str != null && str.trim().length() > 0) {
+			str = getSafeParam(str);
+			result.append(" and model."+columnName+" like '" + str + "%'");
+		}
+	}
+
+	/**
+	 * 封装String对象成like语句(左侧模糊)
+	 * @param str 对象值
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getStringLeftLikerPack(String str,String columnName, StringBuffer result) {
+		if (str != null && str.trim().length() > 0) {
+			str = getSafeParam(str);
+			result.append(" and model."+columnName+" like '%" + str + "'");
+		}
+	}
+
+	/**
+	 * 封装String对象成equal语句
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getStringEqualPack(String data,String columnName, StringBuffer result) {
+		if(data != null && data.trim().length() > 0){
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" = '" + data + "'");
+		}
+	}
+
+	/**
+	 * 封装long或者int的整数对象成equal语句
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getNumEqualPack(Object data,String columnName, StringBuffer result) {
+		if(data!=null&&Long.parseLong(data.toString()) > 0){
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" = " + data + "");
+		}
+	}
+
+	/**
+	 * 封装long或者int的整数对象成equal语句
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getNumEqualPackForZero(Object data,String columnName, StringBuffer result) {
+		if(data!=null&&Long.parseLong(data.toString()) >= 0){
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" = " + data + "");
+		}
+	}
+
+	/**
+	 * 封装long或者int的整数对象成equal语句
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getNumWithZeroEqualPack(Object data,String columnName, StringBuffer result) {
+		if(data!=null&&Long.parseLong(data.toString()) >= 0){
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" = " + data + "");
+		}
+	}
+
+	/**
+	 * 封装long或者int的整数对象成大于语句
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getNumBiggerPack(Object data,String columnName, StringBuffer result) {
+		if(data!=null&&Long.parseLong(data.toString()) > 0){
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" > " + data + "");
+		}
+	}
+
+	/**
+	 * 封装long或者int的整数对象成小于语句
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getNumSmallerPack(Object data,String columnName, StringBuffer result) {
+		if(data!=null&&Long.parseLong(data.toString()) > 0){
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" < " + data + "");
+		}
+	}
+
+	/**
+	 * 封装double对象成大于语句
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getDoubleBiggerPack(Object data,String columnName, StringBuffer result) {
+		if(data!=null&&Double.parseDouble(data.toString()) > 0){
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" > " + data + "");
+		}
+	}
+
+	/**
+	 * 封装double对象成小于语句
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getDoubleSmallerPack(Object data,String columnName, StringBuffer result) {
+		if(data!=null&&Double.parseDouble(data.toString()) > 0){
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" < " + data + "");
+		}
+	}
+
+	/**
+	 * 封装long或者int的整数对象成equal语句
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getNumEqualPack(Object data,String columnName, StringBuffer result,Integer expvalue) {
+		if(data!=null&&Long.parseLong(data.toString()) > (long)expvalue){
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" = " + data + "");
+		}
+	}
+
+	/**
+	 * 封装double对象成equal语句
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getNumEqualPackDouble(Object data,String columnName, StringBuffer result) {
+		if(data!=null&&Double.parseDouble(data.toString()) > 0){
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" = " + data + "");
+		}
+	}
+
+	/**
+	 * 封装long或者int的整数对象成equal语句
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getNumEqualPackDouble(Object data,String columnName, StringBuffer result,Integer expvalue) {
+		if(data!=null&&Double.parseDouble(data.toString()) > (double)expvalue){
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" = " + data + "");
+		}
+	}
+
+	/**
+	 * 封装long或者int的整数对象成equal语句(不等于)
+	 * @param columnName 列名
+	 * @param result
+	 */
+	public static void getNumNOEqualPack(Object data,String columnName, StringBuffer result) {
+		if(data!=null){
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" <> " + data + "");
+		}
+	}
+
+	/**
+	 * 封装in查询语句
+	 * @param data
+	 * @param columnName
+	 * @param result
+	 */
+	public static void getInPack(String data,String columnName, StringBuffer result){
+		if (data!=null&&data.trim().length()>0) {
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" in ( "+ data+ " )");
+		}
+	}
+
+	/**
+	 * 封装in String查询语句
+	 * @param data
+	 * @param columnName
+	 * @param result
+	 */
+	public static void getInPackString(String data,String columnName, StringBuffer result){
+		if (data != null && data.trim().length()>0) {
+			data = getSafeParam(data);
+			//判断最后一位是不是逗号
+			if(data.lastIndexOf(",") != (data.length()-1)){
+				data += ",";
+			}
+			String[] dataArray = data.substring(0, data.length()-1).split(",");
+			data = "";
+			for (int i = 0 ; i < dataArray.length ;i++) {
+				if(i ==  dataArray.length -1){
+					data += "'" + dataArray[i] + "'";
+				}else{
+					data += "'" + dataArray[i] + "',";
+				}
+			}
+			result.append(" and model."+columnName+" in ( "+ data+ " )");
+		}
+	}
+
+	/**
+	 * 封装in String查询语句
+	 * @param data
+	 * @param columnName
+	 * @param result
+	 */
+	public static void getNotInPackString(String data,String columnName, StringBuffer result){
+		if (data != null && data.trim().length()>0) {
+			data = getSafeParam(data);
+			//判断最后一位是不是逗号
+			if(data.lastIndexOf(",") != (data.length()-1)){
+				data += ",";
+			}
+			String[] dataArray = data.substring(0, data.length()-1).split(",");
+			data = "";
+			for (int i = 0 ; i < dataArray.length ;i++) {
+				if(i ==  dataArray.length -1){
+					data += "'" + dataArray[i] + "'";
+				}else{
+					data += "'" + dataArray[i] + "',";
+				}
+			}
+			result.append(" and model."+columnName+" not in ( "+ data+ " )");
+		}
+	}
+
+	/**
+	 * 封装not in查询语句
+	 * @param data
+	 * @param columnName
+	 * @param result
+	 */
+	public static void getNotInPack(String data,String columnName, StringBuffer result){
+		if (data!=null&&data.trim().length()>0) {
+			data = getSafeParam(data);
+			result.append(" and model."+columnName+" not in ( "+ data+ " )");
+		}
+	}
+
+	public static void getCheckStrInArr(String data,String columnName,StringBuffer result){
+		if (data!=null&&data.trim().length()>0) {
+			data = getSafeParam(data);
+			result.append(" and dbo.CheckStrInArr('"+data+"',model."+columnName+")>0 ");
+		}
+	}
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/SqlPack.java

@@ -0,0 +1,163 @@
+package cn.estsh.i3plus.pojo.base.tool;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class SqlPack {
+	/**
+	 * 封装日期
+	 * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间）
+	 * @param columnName HQL里对应的时间字段
+	 * @param result 封装的HQL
+	 * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有
+	 */
+	public static void timeBuilder( String date, String columnName, StringBuffer result, Boolean showTaday,Boolean isshowTime) {
+		String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
+		if(date != null && date.trim().length() > 0){
+			String[] time = date.split(",");
+			if(time.length == 1){
+				//只有开始日期，没有结束日期
+				result.append(" and " + columnName + " like '%" + time[0] + "%'");
+			}else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0) || (time[1] != null & time[1].trim().length() > 0))) {
+				if (time[0] == null || time[0].trim().length() == 0) {
+					time[0] = "1900-01-01";
+				} else{
+					time[0] = time[0].trim();
+				}
+				if (isshowTime && time[0].trim().length()<=11) {
+					time[0]+=" 00:00:00";
+				}
+				if (time[1] == null || time[1].trim().length() == 0) {
+					time[1] = "2100-01-01";
+				} else {
+					time[1] = time[1].trim();
+				}
+				if (isshowTime && time[1].trim().length()<=11) {
+					time[1]+=" 23:59:59";
+				}
+				result.append(" and " + columnName + " between '" + time[0] + "' and '" + time[1] + "'");
+			} else {
+				if (showTaday) {
+					if (isshowTime) {
+						result.append(" and " + columnName + " between '" + today + " 00:00:00' and '" + today + " 23:59:59'");
+					}else{
+						result.append(" and " + columnName + " between '" + today + "' and '" + today + "'");
+					}
+				}
+			}
+		}
+	}
+	
+
+	/**
+	 * 封装String对象成like语句
+	 * @param str 对象值
+	 * @param columnName 列名
+	 * @param result 
+	 */
+	public static void getStringLikerPack(String str,String columnName, StringBuffer result) {
+		if (str != null && str.trim().length() > 0) {
+			result.append("  and "+columnName+" like '%" + str + "%'");
+		}
+	}
+	public static void getStringLikerPack(String str,String columnName, StringBuffer result,String andor) {
+		if (str != null && str.trim().length() > 0) {
+			result.append("  "+andor+" "+columnName+" like '%" + str + "%'");
+		}
+	}
+	/**
+	 * 封装String对象成like语句(右侧模糊)
+	 * @param str 对象值
+	 * @param columnName 列名
+	 * @param result 
+	 */
+	public static void getStringRightLikerPack(String str,String columnName, StringBuffer result) {
+		if (str != null && str.trim().length() > 0) {
+			result.append(" and "+columnName+" like '" + str + "%'");
+		}
+	}
+	/**
+	 * 封装String对象成like语句(左侧模糊)
+	 * @param str 对象值
+	 * @param columnName 列名
+	 * @param result 
+	 */
+	public static void getStringLeftLikerPack(String str,String columnName, StringBuffer result) {
+		if (str != null && str.trim().length() > 0) {
+			result.append(" and "+columnName+" like '%" + str + "'");
+		}
+	}
+	
+	/**
+	 * 封装String对象成equal语句
+	 * @param columnName 列名
+	 * @param result 
+	 */
+	public static void getStringEqualPack(String data,String columnName, StringBuffer result) {
+		if(data != null && data.trim().length() > 0){
+			result.append(" and "+columnName+" = '" + data + "'");
+		}
+	}
+	
+	/**
+	 * 封装long或者int的整数对象成equal语句
+	 * @param columnName 列名
+	 * @param result 
+	 */
+	public static void getNumEqualPack(Object data,String columnName, StringBuffer result) {
+		if(data!=null&&Long.parseLong(data.toString()) > 0){
+			result.append(" and "+columnName+" = " + data + "");
+		}
+	}
+	
+	/**
+	 * 封装long或者int的整数对象成equal语句
+	 * @param columnName 列名
+	 * @param result 
+	 */
+	public static void getNumEqualPack(Object data,String columnName, StringBuffer result,Integer expvalue) {
+		if(data!=null&&Long.parseLong(data.toString()) > (long)expvalue){
+			result.append(" and "+columnName+" = " + data + "");
+		}
+	}
+	
+	/**
+	 * 封装long或者int的整数对象成equal语句(不等于)
+	 * @param columnName 列名
+	 * @param result 
+	 */
+	public static void getNumNOEqualPack(Object data,String columnName, StringBuffer result) {
+		if(data!=null){
+			result.append(" and "+columnName+" <> " + data + "");
+		}
+	}
+	/**
+	 * 封装in查询语句
+	 * @param data
+	 * @param columnName
+	 * @param result
+	 */
+	public static void getInPack(String data,String columnName, StringBuffer result){
+		if (data!=null&&data.trim().length()>0) {
+			result.append(" and "+columnName+" in ( "+ data+ " )");
+		}
+	}
+	
+	/**
+	 * 封装not in查询语句
+	 * @param data
+	 * @param columnName
+	 * @param result
+	 */
+	public static void getNotInPack(String data,String columnName, StringBuffer result){
+		if (data!=null&&data.trim().length()>0) {
+			result.append(" and "+columnName+" not in ( "+ data+ " )");
+		}
+	}
+	
+	public static void getCheckStrInArr(String data,String columnName,StringBuffer result){
+		if (data!=null&&data.trim().length()>0) {
+			result.append(" and dbo.CheckStrInArr('"+data+"',"+columnName+")>0 ");
+		}
+	}
+}

modules/i3plus-pojo-factory/pom.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>i3plus-pojo</artifactId>
-        <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>i3plus-pojo-factory</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-    </dependencies>
-
-
-
-</project>

modules/i3plus-pojo-factory/src/main/resources/init.sql

@@ -1,10 +0,0 @@
-create database i3wms;
-use i3wms;
-
-create table machine_factory(
-  id long,
-  factory_name varchar(50)
-);
-insert into machine_factory values(1,'geely');
-insert into machine_factory values(2,'benz');
-insert into machine_factory values(3,'bmw');

modules/i3plus-pojo-mes/pom.xml

@@ -13,5 +13,12 @@
     <artifactId>i3plus-pojo-mes</artifactId>
     <packaging>jar</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-base</artifactId>
+        </dependency>
+    </dependencies>
+
 
 </project>

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java

@@ -1,6 +1,6 @@
-package cn.estsh.i3plus.pojo.factory.bean;
+package cn.estsh.i3plus.pojo.mes;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java

@@ -1,4 +1,4 @@
-package pojo;
+package cn.estsh.i3plus.pojo.mes;
 
 /**
  * @Description :

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/busi/OperateUser.java

@@ -1,88 +0,0 @@
-package cn.estsh.i3plus.pojo.model.busi;
-
-import io.swagger.annotations.ApiParam;
-
-import java.io.Serializable;
-
-/**
- * @Description :
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-09-04 15:58
- * @Modify:
- **/
-public class OperateUser implements Serializable {
-
-    @ApiParam("用户代码")
-    private String userCode;
-
-    @ApiParam("用户姓名")
-    private String userName;
-
-    @ApiParam("站点代码")
-    private String siteCode;
-
-    @ApiParam("语言代码")
-    private String languageCode;
-
-    @ApiParam("登陆方式")
-    private String loginType;
-
-    public OperateUser() {
-    }
-
-    public OperateUser(String userCode, String userName, String siteCode) {
-        this.userCode = userCode;
-        this.userName = userName;
-        this.siteCode = siteCode;
-    }
-
-    public OperateUser(String userCode, String userName, String siteCode, String languageCode, String loginType) {
-        this.userCode = userCode;
-        this.userName = userName;
-        this.siteCode = siteCode;
-        this.languageCode = languageCode;
-        this.loginType = loginType;
-    }
-
-    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 getLoginType() {
-        return loginType;
-    }
-
-    public void setLoginType(String loginType) {
-        this.loginType = loginType;
-    }
-}
-

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/busi/ResultBean.java

@@ -1,189 +0,0 @@
-package cn.estsh.i3plus.pojo.model.busi;
-
-import cn.estsh.i3plus.pojo.model.common.Pager;
-import io.swagger.annotations.ApiParam;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description :
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-09-04 15:58
- * @Modify:
- **/
-public class ResultBean<Obj>{
-        @ApiParam("是否成功")
-        private boolean success;
-
-        @ApiParam("信息代码-国际化")
-        private String code;
-
-        @ApiParam("操作消息")
-        private String msg;
-
-        @ApiParam("错误消息")
-        private String errorMsg;
-
-        @ApiParam("http路径")
-        private String url;
-
-        @ApiParam("List结果集")
-        private List<Obj> resultList;
-
-        @ApiParam("单个结果")
-        private Obj resultObject;
-
-        @ApiParam("Map结果集")
-        private Map<String, Object> resultMap;
-
-        @ApiParam("翻页操作")
-        private Pager pager;
-
-        @ApiParam("总记录数")
-        private int totalCount;
-
-        public ResultBean() {
-            success = false;
-        }
-
-        public ResultBean(boolean success,String code, String message) {
-            this.success = success;
-            this.code = code;
-            if(this.success) {
-                this.msg = message;
-            }else{
-                this.errorMsg = message;
-            }
-        }
-
-        public ResultBean(boolean success,String code, String msg, String errorMsg) {
-            this.success = success;
-            this.code = code;
-            this.msg = msg;
-            this.errorMsg = errorMsg;
-        }
-
-        public ResultBean(boolean success, List<Obj> resultList) {
-            this.success = success;
-            this.resultList = resultList;
-        }
-
-        public ResultBean(boolean success, Obj resultObject) {
-            this.success = success;
-            this.resultObject = resultObject;
-        }
-
-        public ResultBean(boolean success, String message, List<Obj> resultList) {
-            this.success = success;
-            this.msg = message;
-            this.resultList = resultList;
-        }
-
-        public ResultBean(boolean success, String message, Obj resultObject) {
-            this.success = success;
-            this.msg = message;
-            this.resultObject = resultObject;
-        }
-
-        public ResultBean(boolean success, List<Obj> resultList, Pager pager) {
-            this.success = success;
-            this.resultList = resultList;
-            this.pager = pager;
-        }
-
-        public ResultBean(boolean success, String message, List<Obj> resultList, Pager pager) {
-            this.success = success;
-            this.msg = message;
-            this.resultList = resultList;
-            this.pager = pager;
-        }
-
-        public ResultBean(boolean success, String message, Obj resultObject, Pager pager) {
-            this.success = success;
-            this.msg = message;
-            this.resultObject = resultObject;
-            this.pager = pager;
-        }
-
-        public boolean isSuccess() {
-            return success;
-        }
-
-        public void setSuccess(boolean success) {
-            this.success = success;
-        }
-
-        public List<Obj> getResultList() {
-            return resultList;
-        }
-
-        public void setResultList(List<Obj> resultList) {
-            this.resultList = resultList;
-        }
-
-        public Object getResultObject() {
-            return resultObject;
-        }
-
-        public void setResultObject(Obj resultObject) {
-            this.resultObject = resultObject;
-        }
-
-        public Pager getPager() {
-            return pager;
-        }
-
-        public void setPager(Pager pager) {
-            this.pager = pager;
-        }
-
-        public String getMsg() {
-            return msg;
-        }
-
-        public void setMsg(String msg) {
-            this.msg = msg;
-        }
-
-        public String getErrorMsg() {
-            return errorMsg;
-        }
-
-        public void setErrorMsg(String errorMsg) {
-            this.errorMsg = errorMsg;
-        }
-
-        public int getTotalCount() {
-            return pager != null ? pager.getTotalRows() : this.totalCount;
-        }
-
-        public void setTotalCount(int totalCount) {
-            this.totalCount = totalCount;
-        }
-
-        public Map<String, Object> getResultMap() {
-            return resultMap;
-        }
-
-        public void setResultMap(Map<String, Object> resultMap) {
-            this.resultMap = resultMap;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public void setCode(String code) {
-            this.code = code;
-        }
-
-        public String getUrl() {
-            return url;
-        }
-
-        public void setUrl(String url) {
-            this.url = url;
-        }
-}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ValidatorBean.java

@@ -1,11 +0,0 @@
-package cn.estsh.i3plus.pojo.model.common;
-
-/**
- * @Description :   验证工具
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-09-04 15:58
- * @Modify:
- **/
-public class ValidatorBean {
-}

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,11 +1,9 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

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

@@ -1,8 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -42,10 +41,12 @@ public class SysLocaleResource  extends BaseBean {
     private String resourceValue;
 
     @Column(name="is_system")
-    @ApiParam(value = "是否系统参数",example = "2",access = "系统自带需要有初始化表，只能修改value，无法删除。")
+    @ApiParam(value = "是否系统参数",example = "2")
+    //系统自带需要有初始化表，只能修改value，无法删除。
     private Integer isSystem;
 
     @Column(name="is_default")
-    @ApiParam(value = "是否默认",example = "2",access = "CommonEnumUtil.TRUE_OR_FALSE，新增resources时如果")
+    @ApiParam(value = "是否默认",example = "2")
+    //CommonEnumUtil.TRUE_OR_FALSE，新增resources时如果
     private Integer isDefault;
 }

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.platform.sqlpack;
+
+import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
+import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
+
+/**
+ * @Description : 平台对象封装
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-10-23 21:15
+ * @Modify:
+ **/
+public class CoreHqlPack {
+
+    /**
+     * 资源查询
+     * @param sysLocaleResource
+     * @return
+     */
+    public static String packHqlSysLocaleResource(SysLocaleResource sysLocaleResource){
+        StringBuffer result = new StringBuffer();
+
+        //查询日期
+        HqlPack.timeBuilder(sysLocaleResource.getCreateDateTimeStart(),sysLocaleResource.getCreateDateTimeEnd(),
+                "createDateTime", result, false);
+        //数字类型封装
+        HqlPack.getNumEqualPack(sysLocaleResource.getResourceType(),"resourceType",result);
+        //字符串类型封装
+        HqlPack.getStringEqualPack(sysLocaleResource.getLanguageCode(),"languageCode",result);
+
+        return result.toString();
+    }
+
+    /**
+     * 语言
+     * @param lang
+     * @return
+     */
+    public static String packHqlSysLocaleLanguage(SysLocaleLanguage lang) {
+        StringBuffer result = new StringBuffer();
+
+        //查询日期
+        HqlPack.timeBuilder(lang.getCreateDateTimeStart(),lang.getCreateDateTimeEnd(),
+                "createDateTime", result, false);
+        //数字类型封装
+        HqlPack.getNumEqualPack(lang.getLanguageCode(),"languageCode",result);
+        //字符串类型封装
+        HqlPack.getStringEqualPack(lang.getLanguageName(),"languageName",result);
+
+        return result.toString();
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java

@@ -1,17 +1,12 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
-import cn.estsh.i3plus.pojo.model.base.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.Table;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.UUID;
 
 /**
  * @Description : 工厂仓库

pom.xml

@@ -22,7 +22,6 @@
         <module>modules/i3plus-pojo-wms</module>
         <module>modules/i3plus-pojo-platform</module>
         <module>modules/i3plus-pojo-model</module>
-        <module>modules/i3plus-pojo-factory</module>
         <module>modules/i3plus-pojo-base</module>
     </modules>
 
@@ -92,6 +91,13 @@
                 <version>2.9.6</version>
                 <scope>compile</scope>
             </dependency>
+
+            <!-- shiro -->
+            <dependency>
+                <groupId>org.apache.shiro</groupId>
+                <artifactId>shiro-core</artifactId>
+                <version>1.4.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

readme.txt

@@ -1,7 +1,6 @@
 模型工程
 主要用于各类对象木星
 
-i3plus-pojo-factory:工厂相关的对象模型
 i3plus-pojo-mes:生产相关的对象模型
 i3plus-pojo-wms:仓库相关的对象模型
 i3plus-pojo-platform:平台相关的对象模型，如操作人、权限等