From daf65deb325a21748f582c2cf57e379475d0f17c Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 23 Oct 2018 19:34:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=8C=96=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 5 + .../cn/estsh/i3plus/pojo/base/bean}/BaseBean.java | 2 +- .../i3plus/pojo/base/bean}/BaseModelBean.java | 27 +-- .../cn/estsh/i3plus/pojo/base}/common/Pager.java | 2 +- .../i3plus/pojo/base}/common/PagerHelper.java | 2 +- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 3 +- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 5 +- modules/i3plus-pojo-factory/pom.xml | 31 ---- .../src/main/resources/init.sql | 10 -- modules/i3plus-pojo-mes/pom.xml | 7 + .../cn/estsh/i3plus/pojo/mes}/MachineFactory.java | 4 +- .../estsh/i3plus/pojo/mes}/WorkPlan.java | 2 +- .../estsh/i3plus/pojo/model/busi/OperateUser.java | 88 ---------- .../estsh/i3plus/pojo/model/busi/ResultBean.java | 189 --------------------- .../i3plus/pojo/model/common/ValidatorBean.java | 11 -- .../i3plus/pojo/platform/bean/SysEmployee.java | 2 +- .../pojo/platform/bean/SysLocaleLanguage.java | 4 +- .../pojo/platform/bean/SysLocaleResource.java | 9 +- .../estsh/i3plus/pojo/platform/bean/SysMethod.java | 2 +- .../i3plus/pojo/platform/bean/SysMethodRole.java | 2 +- .../estsh/i3plus/pojo/platform/bean/SysRole.java | 2 +- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 2 +- .../i3plus/pojo/platform/bean/SysUserRole.java | 2 +- .../estsh/i3plus/pojo/wms/bean/FactoryStore.java | 7 +- pom.xml | 8 +- readme.txt | 1 - 26 files changed, 42 insertions(+), 387 deletions(-) rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/base => i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean}/BaseBean.java (98%) rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/base => i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean}/BaseModelBean.java (56%) rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model => i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base}/common/Pager.java (99%) rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model => i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base}/common/PagerHelper.java (98%) delete mode 100644 modules/i3plus-pojo-factory/pom.xml delete mode 100644 modules/i3plus-pojo-factory/src/main/resources/init.sql rename modules/{i3plus-pojo-factory/src/main/java/cn/estsh/i3plus/pojo/factory/bean => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes}/MachineFactory.java (94%) rename modules/i3plus-pojo-mes/src/main/java/{pojo => cn/estsh/i3plus/pojo/mes}/WorkPlan.java (89%) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/busi/OperateUser.java delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/busi/ResultBean.java delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ValidatorBean.java diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index f687451..1351011 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -20,6 +20,11 @@ i3plus.pojo i3plus-pojo-model + + + org.apache.shiro + shiro-core + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/base/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java similarity index 98% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/base/BaseBean.java rename to modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index e97af96..f61d6b5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/base/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.base; +package cn.estsh.i3plus.pojo.base.bean; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/base/BaseModelBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java similarity index 56% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/base/BaseModelBean.java rename to modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java index 2ccd59a..3937b15 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/base/BaseModelBean.java +++ b/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 { 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 { 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 { public void setOrdersString(String ordersString) { OrdersString = ordersString; } - - public OperateUser getOperateUser() { - return operateUser; - } - - public void setOperateUser(OperateUser operateUser) { - this.operateUser = operateUser; - } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java similarity index 99% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/Pager.java rename to modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index d0e9bf0..d96ecd7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/Pager.java +++ b/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; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java similarity index 98% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/PagerHelper.java rename to modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 4afa4af..1d34abb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/PagerHelper.java +++ b/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: 分页辅助工具 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index ddcb40b..49b866a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/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; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index f964f87..e2bfdfe 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/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; diff --git a/modules/i3plus-pojo-factory/pom.xml b/modules/i3plus-pojo-factory/pom.xml deleted file mode 100644 index 413eb77..0000000 --- a/modules/i3plus-pojo-factory/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - i3plus-pojo - i3plus.pojo - 1.0-SNAPSHOT - ../../pom.xml - - 4.0.0 - - i3plus-pojo-factory - jar - - - - i3plus.pojo - i3plus-pojo-model - ${project.version} - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-factory/src/main/resources/init.sql b/modules/i3plus-pojo-factory/src/main/resources/init.sql deleted file mode 100644 index a8b1a4c..0000000 --- a/modules/i3plus-pojo-factory/src/main/resources/init.sql +++ /dev/null @@ -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'); \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 254e852..3ee81da 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -13,5 +13,12 @@ i3plus-pojo-mes jar + + + i3plus.pojo + i3plus-pojo-base + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-factory/src/main/java/cn/estsh/i3plus/pojo/factory/bean/MachineFactory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java similarity index 94% rename from modules/i3plus-pojo-factory/src/main/java/cn/estsh/i3plus/pojo/factory/bean/MachineFactory.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java index 3ef1c6d..884e6d9 100644 --- a/modules/i3plus-pojo-factory/src/main/java/cn/estsh/i3plus/pojo/factory/bean/MachineFactory.java +++ b/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; diff --git a/modules/i3plus-pojo-mes/src/main/java/pojo/WorkPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/pojo/WorkPlan.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java index 77999b3..a2e02f2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/pojo/WorkPlan.java +++ b/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 : diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/busi/OperateUser.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/busi/OperateUser.java deleted file mode 100644 index dc33b07..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/busi/OperateUser.java +++ /dev/null @@ -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; - } -} - diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/busi/ResultBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/busi/ResultBean.java deleted file mode 100644 index a99f895..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/busi/ResultBean.java +++ /dev/null @@ -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{ - @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 resultList; - - @ApiParam("单个结果") - private Obj resultObject; - - @ApiParam("Map结果集") - private Map 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 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 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 resultList, Pager pager) { - this.success = success; - this.resultList = resultList; - this.pager = pager; - } - - public ResultBean(boolean success, String message, List 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 getResultList() { - return resultList; - } - - public void setResultList(List 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 getResultMap() { - return resultMap; - } - - public void setResultMap(Map 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; - } -} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ValidatorBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ValidatorBean.java deleted file mode 100644 index dcb741d..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ValidatorBean.java +++ /dev/null @@ -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 { -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEmployee.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEmployee.java index 0d75a97..f1af7ed 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEmployee.java +++ b/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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java index 8167a89..648d70c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java +++ b/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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 45357f2..b66168e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/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; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethod.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethod.java index 55534c3..d421792 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethod.java +++ b/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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.java index 7e05d52..63ba545 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.java +++ b/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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 7cff976..4c6d984 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index a663956..df72a03 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.java index 1345c1d..976aa35 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.java +++ b/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; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java index 6f3e526..e816d20 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java +++ b/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 : 工厂仓库 diff --git a/pom.xml b/pom.xml index 7304809..2cc4894 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,6 @@ modules/i3plus-pojo-wms modules/i3plus-pojo-platform modules/i3plus-pojo-model - modules/i3plus-pojo-factory modules/i3plus-pojo-base @@ -92,6 +91,13 @@ 2.9.6 compile + + + + org.apache.shiro + shiro-core + 1.4.0 + diff --git a/readme.txt b/readme.txt index 00b1e14..13041ee 100644 --- a/readme.txt +++ b/readme.txt @@ -1,7 +1,6 @@ 模型工程 主要用于各类对象木星 -i3plus-pojo-factory:工厂相关的对象模型 i3plus-pojo-mes:生产相关的对象模型 i3plus-pojo-wms:仓库相关的对象模型 i3plus-pojo-platform:平台相关的对象模型，如操作人、权限等