国家化封装

yun-zuoyi
alwaysfrin 7 years ago
parent 336f808d58
commit daf65deb32

@ -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>

@ -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;

@ -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;
}
}

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

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

@ -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;

@ -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;

@ -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>

@ -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');

@ -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>

@ -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;

@ -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;
}
}

@ -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;
}
}

@ -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 {
}

@ -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;

@ -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;

@ -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;
}

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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 :

@ -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>

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

Loading…
Cancel
Save