diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index a3ab756..f286942 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -86,6 +86,9 @@ public class AndonBoardModel implements Serializable { @ApiParam(value = "事件原因描述") public String ecNameRdd; + @ApiParam(value = "具体事件原因描述") + public String ecDesc; + @ApiParam(value = "小时") public String hour; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index a8f259c..989b6c0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -2159,6 +2159,16 @@ public class CommonEnumUtil { 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 int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java index 8fb4674..9b51dbe 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil; import java.math.BigDecimal; import java.net.URL; import java.sql.*; +import java.util.List; +import java.util.Map; /** * @author Wynne.Lu @@ -68,15 +70,15 @@ public class ScreenEnumUtil { } } - public enum SCREEN_TYPE { + public enum DEVICE_TYPE { PC(10, "PC", "PC端"), - PDA(20, "PDA", "PDA手持端"); + APP(20, "APP", "移动端"); private Integer value; private String code; private String description; - SCREEN_TYPE(Integer value, String code, String description) { + DEVICE_TYPE(Integer value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -268,46 +270,10 @@ public class ScreenEnumUtil { } - public enum LAYOUT_TYPE { - SCREEN(10, "SCREEN", "Screen布局"), - PANEL(20, "PANEL", "Panel布局"); - - private Integer value; - private String code; - private String description; - - LAYOUT_TYPE(Integer value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public Integer getValue() { - return value; - } - - 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 DATASOURCE_CONNECTION_STATUS { - SUCCESS(10, "success", "连接成功"), - FAILED(20, "failed", "连接失败"); + TEST(10, "test", "待连接测试"), + SUCCESS(20, "success", "连接成功"), + FAILED(30, "failed", "连接失败"); private Integer value; private String code; @@ -450,7 +416,7 @@ public class ScreenEnumUtil { } public enum DATA_RESOURCE_TYPE { - ENUM(10, "enum", "枚举"), + ENUM(10, "ENUM", "枚举"), WEBSOCKET(20, "WEBSOCKET", "WebSocket"); private Integer value; @@ -489,7 +455,7 @@ public class ScreenEnumUtil { public enum MODEL_TYPE { DATA_OBJECT(10, "DATA_OBJECT", "数据库对应类型"), INNER_MODEL(20, "INNER_MODEL", "程序内部对应类型"), - CUSTOMIZE(30, "CUSTOMIZE", "程序内部对应类型"); + CUSTOMIZE(30, "CUSTOMIZE", "用户自定义类型"); private Integer value; private String code; @@ -564,21 +530,20 @@ public class ScreenEnumUtil { } } - public enum MODEL_FIELD_DATASOURCE { - FROM_TEXT(10, "TEXT", "文本"), - FROM_NUMBER(20, "NUMBER", "数字"), - FROM_PASSWORD(30, "PASSWORD", "密码"), - FROM_DATETIME(40, "DATETIME", "时间"), - FROM_PICK_UP(50, "PICK_UP", "拾取"), - FROM_ENUM(60, "ENUM", "枚举"), - FROM_DICTIONARY(70, "DICTIONARY", "字典"), - FROM_API(80, "API", "API调用"); + public enum MODEL_FIELD_SOURCE { + FORM_TEXT(10, "TEXT", "文本"), + FORM_NUMBER(20, "NUMBER", "数字"), + FORM_PASSWORD(30, "PASSWORD", "密码"), + FORM_DATETIME(40, "DATETIME", "时间"), + FORM_PICK_UP(50, "PICK_UP", "拾取"), + FORM_ENUM(60, "ENUM", "枚举"), + FORM_DICTIONARY(70, "DICTIONARY", "字典"); private Integer value; private String code; private String description; - MODEL_FIELD_DATASOURCE(Integer value, String code, String description) { + MODEL_FIELD_SOURCE(Integer value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -741,11 +706,14 @@ public class ScreenEnumUtil { DOUBLE(70, "Double", Double.class), FLOAT(80, "Float", Float.class), BIG_DECIMAL(90, "BigDecimal", BigDecimal.class), - STRING(100, "String", BigDecimal.class), + STRING(100, "String", String.class), DATE(110, "Date", Date.class), TIME(120, "Time", Time.class), TIMESTAMP(130, "Timestamp", Timestamp.class), - ARRAY(140, "Array", Array.class); + ARRAY(140, "Array", Array.class), + LIST(150, "List", List.class), + MAP(160, "Map", Map.class), + OBJECT(170, "Object", Object.class); private Integer value; private String code; @@ -788,6 +756,19 @@ public class ScreenEnumUtil { } return tmp; } + + public static JAVA_TYPES clazzOfEnum(Class clazz) { + JAVA_TYPES tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].clazz.equals(clazz)) { + tmp = values()[i]; + } + } + if (tmp == null) { + return OBJECT; + } + return tmp; + } } public enum AUTH_ACCESS_TYPE { @@ -864,4 +845,258 @@ public class ScreenEnumUtil { } } + public enum INNER_MESSAGE_TYPE { + DATASOURCE_BEAN_REFRESH(10, "DATASOURCE_BEAN_REFRESH", "刷新Spring容器中的数据源Bean"); + + private Integer value; + private String code; + private String description; + + INNER_MESSAGE_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + 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 static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum OPERATION_TYPE { + CREATE(10, "create", "新增"), + UPDATE(20, "update", "修改"), + DELETE(30, "delete", "删除"), + WEAKLY_DELETE(40, "invalid", "弱删"), + VALID(50, "valid", "启用"), + INVALID(60, "invalid", "禁用"); + + private Integer value; + private String code; + private String description; + + OPERATION_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static OPERATION_TYPE valueOfEnum(Integer value) { + OPERATION_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i]; + } + } + 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 TEMPLATE_TYPE { + EMPTY(10, "empty", "空白模板"), + SPA(20, "spa", "单页应用模板"); + + private Integer value; + private String code; + private String description; + + TEMPLATE_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static TEMPLATE_TYPE valueOfEnum(Integer value) { + TEMPLATE_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i]; + } + } + 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 LAYOUT_REF_TYPE { + PANEL(10, "Panel", "容器"), + SCREEN(20, "Screen", "页面"); + + private Integer value; + private String code; + private String description; + + LAYOUT_REF_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static LAYOUT_REF_TYPE valueOfEnum(Integer value) { + LAYOUT_REF_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i]; + } + } + 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; + } + } + + /** + * 等待平台枚举抽入数据库或redis + */ + public enum ENUM_SOFT_TYPE { + COMMON(10, "CommonEnumUtil", "通用枚举"), + IMPP(10, "ImppEnumUtil", "平台枚举"), + WMS(10, "WmsEnumUtil", "WMS枚举"), + SWEB(10, "SwebEnumUtil", "Sweb枚举"), + MES(10, "MesEnumUtil", "Mes枚举"), + MES_PCN(10, "MesPcnEnumUtil", "MesPcn枚举"), + ANDON(10, "AndonEnumUtil", "Andon枚举"), + APS(20, "ApsEnumUtil", "Aps枚举"), + BLOCK_FORM(20, "BlockFormEnumUtil", "动态表单枚举"), + BLOCK_REPORT(20, "BlockReportEnumUtil", "动态报表枚举"), + BLOCK_SOFT_SWITCH(20, "BlockSoftSwitchEnumUtil", "软适配枚举"), + LAC(20, "LacEnumUtil", "Lac枚举"), + MDM(20, "MdmEnumUtil", "主数据中心枚举"), + PTL(20, "PtlEnumUtil", "Ptl枚举"), + PTL_PCN(20, "PtlPcnEnumUtil", "PtlPcn枚举"), + SCREEN(20, "ScreenEnumUtil", "通用界面枚举"); + + private Integer value; + private String code; + private String description; + + ENUM_SOFT_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static ENUM_SOFT_TYPE valueOfEnum(Integer value) { + ENUM_SOFT_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i]; + } + } + 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; + } + } } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/EngineScriptPersistence.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/EngineScriptPersistence.java new file mode 100644 index 0000000..b0666b5 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/EngineScriptPersistence.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.bsp.client.bean.po; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * 脚本持久化实体类 + * + * @author Rock.Yu + * @since 2019-03-18 14:22 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "SCRIPT_PERSISTENCE", uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SCRIPT_NO"}) +}) +@Api("系统动态脚本") +public class EngineScriptPersistence extends BaseBean { + private static final long serialVersionUID = 7893111140559759490L; + // 脚本调用的唯一编号，例如：WMS_PDA_0001 + @Column(name = "SCRIPT_NO", length = 50) + private String scriptNo; + + // 脚本的中文名称 + @Column(name = "SCRIPT_NAME", length = 50) + private String scriptName; + + // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 + @Column(name = "SCRIPT_TYPE") + private Integer scriptType; + + // 脚本编写的语言 + // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + @Column(name = "LANGUAGE_TYPE") + private Integer languageType; + + // 脚本的具体内容 + @Lob + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + private String scriptContent; + + // 脚本的描述，包含脚本的用法，参数说明等 + @Column(name = "SCRIPT_REMARK", length = 2000) + private String scriptRemark; + + // 编译后的脚本内容，通过预编译加快脚本的运行速度 + @Transient + private Object compiledScript; + + // 构造方法，便于批量创建数据 + public EngineScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType, + String scriptContent, String scriptRemark) { + this.id = id; + this.scriptNo = scriptNo; + this.scriptName = scriptName; + this.scriptType = scriptType; + this.languageType = languageType; + this.scriptContent = scriptContent; + this.scriptRemark = scriptRemark; + } +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GroovyCommonUtil.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GroovyCommonUtil.java new file mode 100644 index 0000000..ad98d80 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GroovyCommonUtil.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.bsp.common; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/7/22 15:38 + * @Modify: + **/ +public class GroovyCommonUtil { +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java index f1032b0..d5be5c1 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java @@ -1,147 +1,149 @@ -package cn.estsh.i3plus.pojo.bsp.common; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.net.ssl.*; -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; - -/** - * @Description : - * @Reference : - * @Author : Castle - * @CreateDate : 2021/6/17 13:37 - * @Modify: - **/ -public class HttpUtils { - private static Logger logger = LoggerFactory.getLogger(HttpUtils.class); - - // trust-https start - private static void trustAllHosts(HttpsURLConnection connection) { - try { - SSLContext sc = SSLContext.getInstance("TLS"); - sc.init(null, trustAllCerts, new java.security.SecureRandom()); - SSLSocketFactory newFactory = sc.getSocketFactory(); - - connection.setSSLSocketFactory(newFactory); - } catch (Exception e) { - logger.error(e.getMessage(), e); - } - connection.setHostnameVerifier(new HostnameVerifier() { - @Override - public boolean verify(String hostname, SSLSession session) { - return true; - } - }); - } - - private static final TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() { - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[]{}; - } - - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { - } - }}; - // trust-https end - - - /** - * post - * - * @param url - * @param timeout - * @param requestObj - * @return - */ - public static ReturnT postBody(String url, int timeout, Object requestObj) { - HttpURLConnection connection = null; - BufferedReader bufferedReader = null; - try { - // connection - URL realUrl = new URL(url); - connection = (HttpURLConnection) realUrl.openConnection(); - - // trust-https - boolean useHttps = url.startsWith("https"); - if (useHttps) { - HttpsURLConnection https = (HttpsURLConnection) connection; - trustAllHosts(https); - } - - // connection setting - connection.setRequestMethod("POST"); - connection.setDoOutput(true); - connection.setDoInput(true); - connection.setUseCaches(false); - connection.setReadTimeout(timeout * 1000); - connection.setConnectTimeout(3 * 1000); - connection.setRequestProperty("connection", "Keep-Alive"); - connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8"); - connection.setRequestProperty("Accept-Charset", "application/json;charset=UTF-8"); - - // do connection - connection.connect(); - - // write requestBody - if (requestObj != null) { - String requestBody = GsonTool.toJson(requestObj); - - DataOutputStream dataOutputStream = new DataOutputStream(connection.getOutputStream()); - dataOutputStream.write(requestBody.getBytes("UTF-8")); - dataOutputStream.flush(); - dataOutputStream.close(); - } - - // valid StatusCode - int statusCode = connection.getResponseCode(); - if (statusCode != 200) { - - return new ReturnT(ReturnT.FAIL_CODE, "rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url); - } - - // result - bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); - StringBuilder result = new StringBuilder(); - String line; - while ((line = bufferedReader.readLine()) != null) { - result.append(line); - } - String resultJson = result.toString(); - // parse returnT - try { - return GsonTool.fromJson(resultJson, ReturnT.class); - } catch (Exception e) { - logger.error("rpc remoting (url=" + url + ") response content invalid(" + resultJson + ").", e); - return new ReturnT(ReturnT.FAIL_CODE, "rpc remoting (url=" + url + ") response content invalid(" + resultJson + ")."); - } - } catch (Exception e) { - logger.error(e.getMessage(), e); - return new ReturnT(ReturnT.FAIL_CODE, "rpc remoting error(" + e.getMessage() + "), for url : " + url); - } finally { - try { - if (bufferedReader != null) { - bufferedReader.close(); - } - if (connection != null) { - connection.disconnect(); - } - } catch (Exception e2) { - logger.error(e2.getMessage(), e2); - } - } - } - -} \ No newline at end of file +//package cn.estsh.i3plus.pojo.bsp.common; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +// +//import javax.net.ssl.*; +//import java.io.BufferedReader; +//import java.io.DataOutputStream; +//import java.io.InputStreamReader; +//import java.net.HttpURLConnection; +//import java.net.URL; +//import java.security.cert.CertificateException; +//import java.security.cert.X509Certificate; +// +///** +// * @Description : +// * @Reference : +// * @Author : Castle +// * @CreateDate : 2021/6/17 13:37 +// * @Modify: +// **/ +//public class HttpUtils { +// private static Logger logger = LoggerFactory.getLogger(HttpUtils.class); +// +// // trust-https start +// private static void trustAllHosts(HttpsURLConnection connection) { +// try { +// SSLContext sc = SSLContext.getInstance("TLS"); +// sc.init(null, trustAllCerts, new java.security.SecureRandom()); +// SSLSocketFactory newFactory = sc.getSocketFactory(); +// +// connection.setSSLSocketFactory(newFactory); +// } catch (Exception e) { +// logger.error(e.getMessage(), e); +// } +// connection.setHostnameVerifier(new HostnameVerifier() { +// @Override +// public boolean verify(String hostname, SSLSession session) { +// return true; +// } +// }); +// } +// +// private static final TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() { +// @Override +// public X509Certificate[] getAcceptedIssuers() { +// return new X509Certificate[]{}; +// } +// +// @Override +// public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException { +// } +// +// @Override +// public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { +// } +// }}; +// // trust-https end +// +// +// /** +// * post +// * +// * @param url +// * @param timeout +// * @param requestObj +// * @return +// */ +// public static ResultBean postBody(String url, int timeout, Object requestObj) { +// HttpURLConnection connection = null; +// BufferedReader bufferedReader = null; +// try { +// // connection +// URL realUrl = new URL(url); +// connection = (HttpURLConnection) realUrl.openConnection(); +// +// // trust-https +// boolean useHttps = url.startsWith("https"); +// if (useHttps) { +// HttpsURLConnection https = (HttpsURLConnection) connection; +// trustAllHosts(https); +// } +// +// // connection setting +// connection.setRequestMethod("POST"); +// connection.setDoOutput(true); +// connection.setDoInput(true); +// connection.setUseCaches(false); +// connection.setReadTimeout(timeout * 1000); +// connection.setConnectTimeout(3 * 1000); +// connection.setRequestProperty("connection", "Keep-Alive"); +// connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8"); +// connection.setRequestProperty("Accept-Charset", "application/json;charset=UTF-8"); +// +// // do connection +// connection.connect(); +// +// // write requestBody +// if (requestObj != null) { +// String requestBody = GsonTool.toJson(requestObj); +// +// DataOutputStream dataOutputStream = new DataOutputStream(connection.getOutputStream()); +// dataOutputStream.write(requestBody.getBytes("UTF-8")); +// dataOutputStream.flush(); +// dataOutputStream.close(); +// } +// +// // valid StatusCode +// int statusCode = connection.getResponseCode(); +// if (statusCode != 200) { +// return ResultBean.fail("rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url); +//// return new BaseResultBean().errorMsg("rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url); +//// return new ReturnT(ReturnT.FAIL_CODE, "rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url); +// } +// +// // result +// bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); +// StringBuilder result = new StringBuilder(); +// String line; +// while ((line = bufferedReader.readLine()) != null) { +// result.append(line); +// } +// String resultJson = result.toString(); +// // parse returnT +// try { +// return GsonTool.fromJson(resultJson, BaseResultBean.class); +// } catch (Exception e) { +// logger.error("rpc remoting (url=" + url + ") response content invalid(" + resultJson + ").", e); +// return ResultBean.fail("rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url); +// } +// } catch (Exception e) { +// logger.error(e.getMessage(), e); +// return ResultBean.fail("rpc remoting fail, error message(" + e.getMessage() + ") invalid. for url : " + url); +// } finally { +// try { +// if (bufferedReader != null) { +// bufferedReader.close(); +// } +// if (connection != null) { +// connection.disconnect(); +// } +// } catch (Exception e2) { +// logger.error(e2.getMessage(), e2); +// } +// } +// } +// +//} \ No newline at end of file diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/ReturnT.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/ReturnT.java index 81d6e63..350078d 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/ReturnT.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/ReturnT.java @@ -1,56 +1,56 @@ -package cn.estsh.i3plus.pojo.bsp.common; - -import java.io.Serializable; - -/** - * @author Castle - */ -public class ReturnT implements Serializable { - public static final long serialVersionUID = 42L; - - public static final int SUCCESS_CODE = 200; - public static final int FAIL_CODE = 500; - - public static final ReturnT SUCCESS = new ReturnT(null); - public static final ReturnT FAIL = new ReturnT(FAIL_CODE, null); - - private int code; - private String msg; - private T content; - - public ReturnT(){} - public ReturnT(int code, String msg) { - this.code = code; - this.msg = msg; - } - - public ReturnT(T content) { - this.code = SUCCESS_CODE; - this.content = content; - } - - public int getCode() { - return code; - } - public void setCode(int code) { - this.code = code; - } - public String getMsg() { - return msg; - } - public void setMsg(String msg) { - this.msg = msg; - } - public T getContent() { - return content; - } - public void setContent(T content) { - this.content = content; - } - - @Override - public String toString() { - return "ReturnT [code=" + code + ", msg=" + msg + ", content=" + content + "]"; - } - -} +//package cn.estsh.i3plus.pojo.bsp.common; +// +//import java.io.Serializable; +// +///** +// * @author Castle +// */ +//public class ReturnT implements Serializable { +// public static final long serialVersionUID = 42L; +// +// public static final int SUCCESS_CODE = 200; +// public static final int FAIL_CODE = 500; +// +// public static final ReturnT SUCCESS = new ReturnT(null); +// public static final ReturnT FAIL = new ReturnT(FAIL_CODE, null); +// +// private int code; +// private String msg; +// private T content; +// +// public ReturnT(){} +// public ReturnT(int code, String msg) { +// this.code = code; +// this.msg = msg; +// } +// +// public ReturnT(T content) { +// this.code = SUCCESS_CODE; +// this.content = content; +// } +// +// public int getCode() { +// return code; +// } +// public void setCode(int code) { +// this.code = code; +// } +// public String getMsg() { +// return msg; +// } +// public void setMsg(String msg) { +// this.msg = msg; +// } +// public T getContent() { +// return content; +// } +// public void setContent(T content) { +// this.content = content; +// } +// +// @Override +// public String toString() { +// return "ReturnT [code=" + code + ", msg=" + msg + ", content=" + content + "]"; +// } +// +//} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java new file mode 100644 index 0000000..a9f2148 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description :路由参数 + * @Reference : + * @Author : Castle + * @CreateDate : 2021/7/5 14:02 + * @Modify: + **/ +@Data +@ApiModel("路由参数") +public class RouteParam { + + @ApiModelProperty(value = "执行方法Id") + private Long methodId; + @ApiModelProperty(value = "路由的权重配置") + private HashMap weightConfig; + @ApiModelProperty(value = "执行器地址列表") + private List addressList; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ScriptRepository.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ScriptRepository.java new file mode 100644 index 0000000..52a88d2 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ScriptRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.bsp.server.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.bsp.client.bean.po.EngineScriptPersistence; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/7/22 13:51 + * @Modify: + **/ +public interface ScriptRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java index 9555a82..01e3cda 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java @@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -54,6 +49,10 @@ public class MesBoardShiftSection extends BaseBean implements Serializable { @ApiParam("是否跨天") private Integer isSpanday; + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; + @Transient @ApiParam("班次名称") private String shiftName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index c334517..aa811fc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -29,8 +29,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DEFECT_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "CREATE_DATE_TIME") + @Index(columnList = "SERIAL_NUMBER") }) @Api("不良信息记录表") public class MesDefectRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java index 80bf60d..59937ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java @@ -27,7 +27,6 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_JIT_LOCK_CACHE", indexes = { @Index(columnList = "JIT_ACTUAL_NO"), - @Index(columnList = "WO_TYPE"), @Index(columnList = "STATUS") }) @Api("MES_JIT队列锁定池") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java index 834816f..842037c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java @@ -27,7 +27,6 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_JIT_ORDER_CACHE", indexes = { @Index(columnList = "JIT_ACTUAL_NO"), - @Index(columnList = "WO_TYPE"), @Index(columnList = "STATUS") }) @Api("MES_JIT队列订单池") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java index 06a43c3..cf5140a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java @@ -70,4 +70,8 @@ public class MesProduceErrorRecord extends BaseBean { @ApiParam("异常内容") private String errorMessage; + @Column(name = "NOTICE_SIGN") + @ApiParam("通知标识") + private Integer noticeSign = 10; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index f946878..857ba08 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -4,8 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -13,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.math.BigDecimal; /** * @Description: @@ -33,7 +30,6 @@ import java.math.BigDecimal; @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "MODIFY_DATE_TIME"), - @Index(columnList = "PART_NO"), @Index(columnList = "WORK_ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 60ff8fd..73f6281 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -27,13 +27,10 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "PART_NO"), - @Index(columnList = "MODIFY_DATE_TIME"), @Index(columnList = "WORK_CENTER_CODE"), - @Index(columnList = "WORK_CELL_CODE"), - @Index(columnList = "WORK_ORDER_NO") + @Index(columnList = "WORK_CELL_CODE") }) @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index 0f467f2..1001690 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -29,9 +29,7 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIT_ACTUAL_BOM", indexes = { @Index(columnList = "JIS_ACTUAL_NO"), - @Index(columnList = "ORGANIZE_CODE"), - @Index(columnList = "PRODUCE_CTGY_CODE"), - @Index(columnList = "PART_NO") + @Index(columnList = "PRODUCE_CTGY_CODE") }) @Api("客户JIT生产队列散件清单") public class MesQueueJitActualBom extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index ac002dd..43c1799 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -27,7 +27,6 @@ import java.io.Serializable; @Builder @Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL", indexes = { @Index(columnList = "JIS_ACTUAL_NO"), - @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "PART_NO"), @Index(columnList = "PRODUCE_CTGY_CODE") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java index ad8be6a..164d56f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -32,9 +32,7 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIT_PLAN_BOM", indexes = { @Index(columnList = "JIS_PLAN_NO"), - @Index(columnList = "ORGANIZE_CODE"), - @Index(columnList = "PRODUCE_CTGY_CODE"), - @Index(columnList = "PART_NO") + @Index(columnList = "PRODUCE_CTGY_CODE") }) @Api("MES_客户JIT预装队列BOM") public class MesQueueJitPlanBom extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java index ca66e1a..b56f6e1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -27,10 +27,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIT_PLAN_DETAIL", indexes = { - @Index(columnList = "JIS_PLAN_NO"), - @Index(columnList = "ORGANIZE_CODE"), - @Index(columnList = "PRODUCE_CTGY_CODE"), - @Index(columnList = "PART_NO") + @Index(columnList = "JIS_PLAN_NO") }) @Api("MES_客户JIT预装队列明细") public class MesQueueJitPlanDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index aecb239..bcc8308 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -28,8 +28,6 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_ORDER", indexes = { - @Index(columnList = "CUST_FLAG_NO"), - @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java index ebf2f29..9bf9ff4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java @@ -28,9 +28,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_ORDER_BOM", indexes = { - @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "ORDER_NO"), - @Index(columnList = "PART_NO"), @Index(columnList = "PRODUCE_CTGY_CODE") }) @Api("MES_生产队列散件清单") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 3816fc1..8f57b8f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -30,8 +30,7 @@ import java.io.Serializable; @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "QUEUE_GROUP_NO"), - @Index(columnList = "PRODUCE_CATEGORY_CODE") + @Index(columnList = "QUEUE_GROUP_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO", "PRODUCE_CATEGORY_CODE"}) }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java index 01a4829..d426b22 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java @@ -26,9 +26,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_ORDER_DETAIL_RECORD", indexes = { - @Index(columnList = "ORDER_NO"), @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "QUEUE_GROUP_NO"), @Index(columnList = "PRODUCE_CATEGORY_CODE") }) @Api("生产队列明细记录表") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index dd254da..fffb2db 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -33,9 +33,7 @@ import java.util.List; @Table(name = "MES_WORK_CELL_POINT", indexes = { @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "WORK_CENTER_CODE"), - @Index(columnList = "WORK_CELL_CODE"), - @Index(columnList = "QUEUE_SEQ"), - @Index(columnList = "QUEUE_DETAIL_SEQ") + @Index(columnList = "WORK_CELL_CODE") }) @Api("工站队列") public class MesWorkCellPoint extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index 1f8e24f..873cd2d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -28,11 +28,9 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_POINT_GROUP", indexes = { - @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "WORK_CENTER_CODE"), @Index(columnList = "WORK_CELL_CODE"), - @Index(columnList = "QUEUE_GROUP_NO"), - @Index(columnList = "ORDER_NO") + @Index(columnList = "QUEUE_GROUP_NO") }) @Api("工站分组队列") public class MesWorkCellPointGroup extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java new file mode 100644 index 0000000..8a27541 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 零件消耗数量模型 + * @Reference : + * @Author : dominic + * @CreateDate : 2021/7/1 14:40 + * @Modify: + **/ +@Data +public class PartConsumeCountModel { + + @ApiParam("零件号") + private String partNo; + + @ApiParam("消耗数量") + private Integer consumeQty; + + @ApiParam("需求数量") + private Integer demandQty; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java index 740c511..f5a4e92 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.model.platform; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiParam; @@ -39,12 +41,13 @@ public class AccountExportModel implements Serializable { @ApiModelProperty(value ="部门名称" , access ="部门名称") private String departmentNameRdd; - @ApiParam(value = "登录次数", example = "0") + @ApiModelProperty(value = "登录次数", example = "0") private Integer userLoginNum; - @ApiParam(value = "账号最后登录时间") + @ApiModelProperty(value = "账号最后登录时间") private String userLoginLastDateTime; - @ApiParam(value = "账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)", example = "-1") + @ApiModelProperty(value ="账号状态" , example ="-1") + @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) private Integer userStatus; } diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 92947f2..6bef2bc 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -34,7 +34,7 @@ test - DEV + TEST diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java index 676ea57..876771d 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("动作") public class ScrAction extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParam.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParam.java deleted file mode 100644 index c9de45f..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParam.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/5/20 17:51 - * @desc - */ -@Entity -@Table(name = "SCR_COMPONENT_PARAM") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@ApiModel("组件参数") -public class ScrComponentParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -3232417792617757722L; - - @Column(name = "COMPONENT_TYPE") - @ApiModelProperty(value = "组件类型") - private String componentType; - - @Column(name = "PARAM_NAME") - @ApiModelProperty(value = "参数名") - private String paramName; - - @Column(name = "SEARCH_NAME") - @ApiModelProperty(value = "搜索名称") - private String searchName; - - @Lob - @Column(name = "SEARCH_WHERE") - @ApiModelProperty(value = "搜索条件") - private String searchWhere; - - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParamDetail.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParamDetail.java deleted file mode 100644 index 9425a4c..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParamDetail.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/5/20 17:51 - * @desc - */ -@Entity -@Table(name = "SCR_COMPONENT_PARAM_DETAIL") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@ApiModel("组件参数配置") -public class ScrComponentParamDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 4771034700299839870L; - - @Column(name = "COMPONENT_CODE") - @ApiModelProperty(value = "组件代码") - private String componentCode; - - @Column(name = "COMPONENT_TYPE") - @ApiModelProperty(value = "组件类型") - private String componentType; - - @Lob - @Column(name = "COMPONENT_PARAM_DETAIL") - @ApiModelProperty(value = "组件参数信息") - private String componentParamDetail; - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java index 49f1dba..a9ab9e6 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("数据权限") public class ScrDataAuth extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java index b542882..248b351 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java @@ -10,6 +10,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -28,6 +30,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("数据对象管理") public class ScrDataObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java index 3062320..19d64b9 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("数据对象约束管理") public class ScrDataObjectIndex extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java index 03bc465..1bf31e7 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -10,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -27,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("数据对象管理") public class ScrDataObjectProperty extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java index 6d28b02..cf17203 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,6 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("数据源管理") public class ScrDatasource extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java index bb7c145..0166c10 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -27,6 +28,8 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Builder +@DynamicUpdate +@DynamicInsert @ApiModel("事件") public class ScrEvent extends BaseBean implements Serializable { private static final long serialVersionUID = -6217007706865821613L; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java index 469c22b..683f2d8 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("事件动作") public class ScrEventAction extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java index 762d5f3..9d366c2 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("文件") public class ScrFile extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java deleted file mode 100644 index d226159..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午5:01 - * @desc - */ -@Entity -@Table(name = "SCR_LAYOUT_COLUMN") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@ApiModel("布局-父类-列") -public class ScrLayoutColumn extends BaseBean implements Serializable { - private static final long serialVersionUID = 5001564292608042287L; - - @Column(name = "LAYOUT_CODE") - @ApiModelProperty("布局代码") - private String layoutCode; - - @Column(name = "ROW_CODE") - @ApiModelProperty("列代码") - private String rowCode; - - @Column(name = "COLUMN_CODE") - @ApiModelProperty("列代码") - private String columnCode; - - @Column(name = "COLUMN_SEQ") - @ApiModelProperty("列顺序") - private Integer columnSeq; - - @Column(name = "COLUMN_SPAN") - @ApiModelProperty("列占位") - private Integer columnSpan; - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java deleted file mode 100644 index 8a90a8b..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java +++ /dev/null @@ -1,51 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/3/11 下午5:01 - * @desc - */ -@Entity -@Table(name = "SCR_LAYOUT_ROW") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@ApiModel("布局-行") -public class ScrLayoutRow extends BaseBean implements Serializable { - private static final long serialVersionUID = 6042010183759804616L; - - @Column(name = "LAYOUT_CODE") - @ApiModelProperty("布局代码") - private String layoutCode; - - @Column(name = "ROW_CODE") - @ApiModelProperty("行代码") - private String rowCode; - - @Column(name = "ROW_HEIGHT") - @ApiModelProperty("行高") - private Double rowHeight; - - @Column(name = "ROW_SEQ") - @ApiModelProperty("行顺序") - private Integer rowSeq; - - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrMenu.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrMenu.java index c7c2c4b..782c864 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrMenu.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrMenu.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -17,7 +16,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Lob; import javax.persistence.Table; import javax.persistence.Transient; @@ -35,6 +33,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicInsert +@DynamicUpdate @Builder @ApiModel("通用界面-功能目录") public class ScrMenu extends BaseBean implements Serializable { @@ -98,10 +98,6 @@ public class ScrMenu extends BaseBean implements Serializable { @ApiParam(value = "所属模块") private Integer softType; - @Column(name = "MENU_STATUS") - @ApiParam(value = "菜单状态") - private Integer menuStatus; - @Transient @ApiParam(value = "菜单子集") private List menuList; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java index bde977a..4832182 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("model") public class ScrModel extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java index 954be8f..2822d43 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,6 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("model字段") public class ScrModelField extends BaseBean implements Serializable { @@ -39,39 +43,43 @@ public class ScrModelField extends BaseBean implements Serializable { @ApiModelProperty("字段代码") private String fieldCode; - @Column(name = "DISPLAY_NAME") - @ApiModelProperty("显示名称") - private String displayName; - @Column(name = "FIELD_NAME") @ApiModelProperty("字段名称") private String fieldName; + @Column(name = "DISPLAY_NAME") + @ApiModelProperty("显示名称") + private String displayName; + @Column(name = "FIELD_TYPE") @ApiModelProperty(value = "字段类型") - private String fieldType; + private Integer fieldType; @Column(name = "IS_FUZZY_SEARCH") @ApiModelProperty("是否支持模糊查询") - private Boolean isFuzzySearch = false; + private Integer isFuzzySearch; @Column(name = "IS_SHOW_IN_NEW") @ApiModelProperty("是否在新增时展示") - private Boolean isShowInNew = true; + private Integer isShowInNew; @Column(name = "IS_SHOW_IN_EDIT") @ApiModelProperty("是否在编辑时展示") - private Boolean isShowInEdit = true; + private Integer isShowInEdit; @Column(name = "IS_ALLOW_SORT") @ApiModelProperty("是否支持排序") - private Boolean isAllowSort = false; + private Integer isAllowSort; + + @Column(name = "IS_ALLOW_MODIFY") + @ApiModelProperty("是否支持修改") + private Integer isAllowModify; @Column(name = "IS_REQUIRED") @ApiModelProperty("是否必填") - private Boolean isRequired = false; + private Integer isRequired; - @Column(name = "SEQ",columnDefinition = "int(11) default 0") + @Column(name = "SEQ", columnDefinition = "int(11) default 0") @ApiModelProperty("表单顺序") private Integer seq; @@ -81,19 +89,15 @@ public class ScrModelField extends BaseBean implements Serializable { @Column(name = "IS_VIRTUAL") @ApiModelProperty("是否是虚拟的") - private Boolean isVirtual; + private Integer isVirtual; - @Column(name = "MODEL_FIELD_DATASOURCE") + @Column(name = "MODEL_FIELD_SOURCE") @ApiModelProperty("字段数据来源") - private Integer modelFieldDatasource; + private Integer modelFieldSource; - @Column(name = "MODEL_FIELD_DATASOURCE_PROPS") + @Column(name = "MODEL_FIELD_SOURCE_PROPS") @ApiModelProperty("model字段来源属性") - private String modelFieldDatasourceProps; - - @Column(name = "DATA_ROW_AUTH") - @ApiModelProperty("数据列权限") - private String dataRowAuth; + private String modelFieldSourceProps; @Transient private Object fieldValue; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java index 645802f..bb5738a 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,11 +8,11 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.Table; import java.io.Serializable; @@ -28,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("model字段约束") public class ScrModelFieldIndex extends BaseBean implements Serializable { @@ -51,8 +52,7 @@ public class ScrModelFieldIndex extends BaseBean implements Serializable { @Column(name = "IS_USER_CREATED") @ApiModelProperty("是否是用户创建的") - @Enumerated(EnumType.STRING) - private CommonEnumUtil.TRUE_OR_FALSE isUserCreated; + private Integer isUserCreated; @Column(name = "PRIMARY_KEY_SWITCH") @ApiModelProperty("model主键唯一检查开关") diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldVirtual.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldVirtual.java index aa5817a..b37a5d5 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldVirtual.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldVirtual.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("model虚拟字段") public class ScrModelFieldVirtual extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenHistory.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenHistory.java index 35639e4..8291676 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenHistory.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenHistory.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -10,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -28,6 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("数据对象管理") public class ScrScreenHistory extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrComponent.java similarity index 68% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrComponent.java index 0c711f3..bbfcb5f 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrComponent.java @@ -1,7 +1,6 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.diagram; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -18,7 +19,7 @@ import java.io.Serializable; /** * @author Wynne.Lu - * @date 2021/3/22 上午10:43 + * @date 2021/3/22 下午7:47 * @desc */ @Entity @@ -27,27 +28,24 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("组件") public class ScrComponent extends BaseBean implements Serializable { - private static final long serialVersionUID = 3832856363595940018L; + private static final long serialVersionUID = 989032210658930856L; @Column(name = "COMPONENT_CODE") - @ApiModelProperty(value = "组件代码") + @ApiModelProperty("组件代码") private String componentCode; @Column(name = "COMPONENT_TYPE") - @ApiModelProperty(value = "组件类型") + @ApiModelProperty("组件类型") private String componentType; - @Column(name = "MODEL_CODE") - @ApiModelProperty(value = "model代码") - private String modelCode; - @Lob @Column(name = "COMPONENT_PROPERTY") - @ApiModelProperty(value = "组件描述") + @ApiModelProperty("组件属性") private String componentProperty; - -} \ No newline at end of file +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayout.java similarity index 78% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayout.java index 6c1d0da..c966298 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayout.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.diagram; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiModel; @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,6 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("布局") public class ScrLayout extends BaseBean implements Serializable { @@ -42,4 +46,9 @@ public class ScrLayout extends BaseBean implements Serializable { @ApiModelProperty("布局类型") private Integer layoutType; + @Column(name = "IS_CUSTOMIZE") + @ApiModelProperty("是否为自定义布局") + private Integer isCustomize; + + } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayoutItem.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayoutItem.java new file mode 100644 index 0000000..1041279 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayoutItem.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.screen.bean.diagram; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/7/2 14:05 + * @desc + */ +@Entity +@Table(name = "SCR_LAYOUT_ITEM") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@DynamicUpdate +@DynamicInsert +@Builder +@ApiModel("布局信息") +public class ScrLayoutItem extends BaseBean implements Serializable { + private static final long serialVersionUID = -4379591189797358245L; + + @Column(name = "LAYOUT_CODE") + @ApiModelProperty("布局代码") + private String layoutCode; + + @Column(name = "LAYOUT_ITEM_CODE") + @ApiModelProperty("布局单块代码") + private String layoutItemCode; + + @Column(name = "HORIZONTAL_COORDINATE") + @ApiModelProperty("x轴") + private Integer horizontalCoordinate; + + @Column(name = "VERTICAL_COORDINATE") + @ApiModelProperty("y轴") + private Integer verticalCoordinate; + + @Column(name = "WIDTH") + @ApiModelProperty("宽度") + private Integer width; + + @Column(name = "HEIGHT") + @ApiModelProperty("高度") + private Integer height; + + @Column(name = "IS_STATIC") + @ApiModelProperty("是否静态固定") + private Integer isStatic; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanel.java similarity index 63% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanel.java index 416af7c..a0fb566 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanel.java @@ -1,7 +1,6 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.diagram; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,9 +8,12 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -26,9 +28,12 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("Panel") public class ScrPanel extends BaseBean implements Serializable { + private static final long serialVersionUID = -5363041058961623658L; @Column(name = "PANEL_CODE") @ApiModelProperty("Panel代码") @@ -38,11 +43,13 @@ public class ScrPanel extends BaseBean implements Serializable { @ApiModelProperty("Panel名称") private String panelName; - @Column(name = "PANEL_LAYOUT_CODE") - @ApiModelProperty("布局代码") - private String layoutCode; + @Column(name = "IS_TEMPLATE") + @ApiModelProperty("是否为模板") + private Integer isTemplate; + + @Lob + @Column(name = "PANEL_PROPERTY") + @ApiModelProperty("Panel属性") + private String panelProperty; - @Column(name = "USAGE_AMOUNT") - @ApiModelProperty("使用数量") - private Integer usageAmount; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanelComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanelComponent.java new file mode 100644 index 0000000..7e7299f --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanelComponent.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.screen.bean.diagram; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 下午7:50 + * @desc + */ +@Entity +@Table(name = "SCR_PANEL_COMPONENT") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@DynamicUpdate +@DynamicInsert +@Builder +@ApiModel("panel与组件的关系") +public class ScrPanelComponent extends BaseBean implements Serializable { + private static final long serialVersionUID = -9070313428476817410L; + + @Column(name = "PANEL_CODE") + @ApiModelProperty("Panel代码") + private String panelCode; + + @Column(name = "LAYOUT_CODE") + @ApiModelProperty("布局代码") + private String layoutCode; + + @Column(name = "LAYOUT_ITEM_CODE") + @ApiModelProperty("布局单元代码") + private String layoutItemCode; + + @Column(name = "COMPONENT_CODE") + @ApiModelProperty("组件代码") + private String componentCode; + + @Column(name = "SEQ") + @ApiModelProperty("组件顺序") + private Integer seq; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrScreen.java similarity index 71% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrScreen.java index daa60a5..be072a5 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrScreen.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.screen.bean; +package cn.estsh.i3plus.pojo.screen.bean.diagram; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiModel; @@ -8,9 +8,12 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -25,6 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder @ApiModel("页面") public class ScrScreen extends BaseBean implements Serializable { @@ -42,16 +47,21 @@ public class ScrScreen extends BaseBean implements Serializable { @ApiModelProperty("页面版本") private String screenVersion; - @Column(name = "SCREEN_LAYOUT_CODE") - @ApiModelProperty("布局代码") - private String layoutCode; + @Column(name = "DEVICE_TYPE") + @ApiModelProperty("设备类型") + private Integer deviceType; - @Column(name = "SCREEN_TYPE") - @ApiModelProperty("页面类型") - private Integer screenType; + @Column(name = "TEMPLATE_TYPE") + @ApiModelProperty("模板类型") + private Integer templateType; @Column(name = "SCREEN_OWNING_SYSTEM") @ApiModelProperty("界面所属系统") private Integer screenOwningSystem; + @Lob + @Column(name = "SCREEN_PROPERTY") + @ApiModelProperty("布局代码") + private String screenProperty; + } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrScreenPanel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrScreenPanel.java similarity index 53% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrScreenPanel.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrScreenPanel.java index 70da97c..1b902a7 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrScreenPanel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrScreenPanel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.screen.bean.relation; +package cn.estsh.i3plus.pojo.screen.bean.diagram; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiModel; @@ -8,31 +8,31 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import java.io.Serializable; /** * @author Wynne.Lu - * @date 2021/3/25 下午4:33 + * @date 2021/3/22 下午7:50 * @desc */ @Entity -@Table(name = "SCR_SCREEN_PANEL", - uniqueConstraints = { - @UniqueConstraint(columnNames = {"SCREEN_CODE", "LAYOUT_CODE"}) - } -) +@Table(name = "SCR_SCREEN_PANEL") @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor +@DynamicUpdate +@DynamicInsert @Builder -@EqualsAndHashCode(callSuper = true) -@ApiModel("Screen与Panel的关系") -public class ScrScreenPanel extends BaseBean { - private static final long serialVersionUID = 3459027655126916483L; +@ApiModel("screen与panel的关系") +public class ScrScreenPanel extends BaseBean implements Serializable { + private static final long serialVersionUID = 2586321557100106523L; @Column(name = "SCREEN_CODE") @ApiModelProperty("Screen代码") @@ -42,15 +42,11 @@ public class ScrScreenPanel extends BaseBean { @ApiModelProperty("布局代码") private String layoutCode; - @Column(name = "ROW_CODE") - @ApiModelProperty("行代码") - private String rowCode; - - @Column(name = "COLUMN_CODE") - @ApiModelProperty("列代码") - private String columnCode; + @Column(name = "LAYOUT_ITEM_CODE") + @ApiModelProperty("布局单元代码") + private String layoutItemCode; @Column(name = "PANEL_CODE") - @ApiModelProperty(value = "panel代码") + @ApiModelProperty("panel代码") private String panelCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java deleted file mode 100644 index 8f19dbc..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean.relation; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @author Wynne.Lu - * @date 2021/3/25 上午9:56 - * @desc - */ -@Entity -@Table(name = "SCR_COMPONENT_EVENT_ACTION") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@ApiModel("组件事件动作") -public class ScrComponentEventAction extends BaseBean { - private static final long serialVersionUID = 7600064730551351570L; - - @Column(name = "COMPONENT_CODE") - @ApiModelProperty("组件代码") - private String componentCode; - - @Column(name = "EVENT_ACTION_CODE") - @ApiModelProperty("事件动作代码") - private String eventActionCode; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java deleted file mode 100644 index 9e79e14..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java +++ /dev/null @@ -1,98 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean.relation; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/3/22 下午8:42 - * @desc - */ -@Entity -@Table(name = "SCR_COMPONENT_MODEL_FIELD") -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Builder -@ApiModel("Panel与Model字段的关系") -public class ScrComponentModelField extends BaseBean implements Serializable { - private static final long serialVersionUID = -3441031841089357196L; - - @Column(name = "PANEL_CODE") - @ApiModelProperty("Panel代码") - private String panelCode; - - @Column(name = "COMPONENT_CODE") - @ApiModelProperty("组件代码") - private String componentCode; - - @Column(name = "MODEL_CODE") - @ApiModelProperty("model代码") - private String modelCode; - - @Column(name = "FIELD_CODE") - @ApiModelProperty("字段代码") - private String fieldCode; - - @Column(name = "DISPLAY_NAME") - @ApiModelProperty("字段名称") - private String displayName; - - @Column(name = "IS_FUZZY_SEARCH") - @ApiModelProperty("是否支持模糊查询") - private Boolean isFuzzySearch; - - @Column(name = "IS_SHOW_IN_NEW") - @ApiModelProperty("是否在新增时展示") - private Boolean isShowInNew; - - @Column(name = "IS_SHOW_IN_EDIT") - @ApiModelProperty("是否在编辑时展示") - private Boolean isShowInEdit; - - @Column(name = "IS_ALLOW_SORT") - @ApiModelProperty("是否支持排序") - private Boolean isAllowSort; - - @Column(name = "FORM_SEQ") - @ApiModelProperty("表单顺序") - private Integer formSeq; - - @Column(name = "TABLE_SEQ") - @ApiModelProperty("表格顺序") - private Integer tableSeq; - - @Column(name = "VALIDATION") - @ApiModelProperty("校验") - private String validation; - - @Column(name = "DICTIONARY") - @ApiModelProperty("字典") - private String dictionary; - - @Column(name = "IS_VIRTUAL") - @ApiModelProperty("是否是虚拟的") - private boolean isVirtual; - - @Column(name = "FIELD_NAME") - @ApiModelProperty("字段名称") - private String fieldName; - - @Column(name = "SPEL_VIRTUAL_VALUE") - @ApiModelProperty("SPEL表达式虚拟属性") - private String spelVirtualValue; - - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java deleted file mode 100644 index 899086f..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.bean.relation; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -/** - * @author Wynne.Lu - * @date 2021/3/25 下午4:33 - * @desc - */ -@Entity -@Table(name = "SCR_PANEL_COMPONENT", -// indexes = { -// @Index(columnList = "PANEL_CODE")}, - uniqueConstraints = { - @UniqueConstraint(columnNames = {"PANEL_CODE", "LAYOUT_CODE"}) - } -) -@Data -@EqualsAndHashCode(callSuper = true) -@ApiModel("Panel与组件的关系") -public class ScrPanelComponent extends BaseBean { - private static final long serialVersionUID = 3459027655126916483L; - - @Column(name = "PANEL_CODE") - @ApiModelProperty("panel代码") - private String panelCode; - - @Column(name = "LAYOUT_CODE") - @ApiModelProperty("布局代码") - private String layoutCode; - - @Column(name = "ROW_CODE") - @ApiModelProperty("行代码") - private String rowCode; - - @Column(name = "COLUMN_CODE") - @ApiModelProperty("列代码") - private String columnCode; - - @Column(name = "COMPONENT_CODE") - @ApiModelProperty(value = "组件代码") - private String componentCode; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrClassInfoModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrClassInfoModel.java new file mode 100644 index 0000000..89d6465 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrClassInfoModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2021/6/29 21:54 + * @desc + */ +@Data +@NoArgsConstructor +@ApiModel("类信息") +public class ScrClassInfoModel { + + private String classSimpleName; + + private String classDescription; + + private Class clazz; + + public ScrClassInfoModel(Class clazz) { + this.clazz = clazz; + + this.classSimpleName = clazz.getSimpleName(); + + ApiModel apiModel = clazz.getAnnotation(ApiModel.class); + if (apiModel != null) { + this.classDescription = apiModel.value(); + } + } +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDisplayModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDisplayModel.java new file mode 100644 index 0000000..c3e8a6a --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDisplayModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/7/7 16:15 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("通用界面回显model") +public class ScrDisplayModel implements Serializable { + private static final long serialVersionUID = 5679787673783301941L; + + @ApiModelProperty("页面与容器的关系") + private ScrScreenPanelModel screenPanelModel; + + @ApiModelProperty("容器与组件的关系") + private List panelComponentModels; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrInnerMessageModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrInnerMessageModel.java new file mode 100644 index 0000000..dfb3f35 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrInnerMessageModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/6/29 17:18 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("通用界面内部消息队列处理消息") +public class ScrInnerMessageModel implements Serializable { + private static final long serialVersionUID = -6049477827975249515L; + + @ApiModelProperty("消息类型") + private Integer messageType; + + @ApiModelProperty("信息") + private String payload; + + @ApiModelProperty + private Integer operation; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java index b34cf2a..b401ee4 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.screen.model; -import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -21,7 +22,7 @@ public class ScrLayoutModel implements Serializable { @ApiModelProperty("布局") private ScrLayout layout; - @ApiModelProperty("布局中的行列关系") - private List rowColumnModels; + @ApiModelProperty("布局中的单元关系") + private List layoutItems; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java deleted file mode 100644 index 6fb3ee3..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model; - -import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @author Wynne.Lu - * @date 2021/3/28 上午12:42 - * @desc - */ -@Data -@ApiModel("Panel与组件关系的创建model") -public class ScrPanelComponentCreateModel implements Serializable { - private static final long serialVersionUID = -5832175256726333348L; - - @ApiModelProperty("panel代码") - private String panelCode; - - @ApiModelProperty("布局代码") - private String layoutCode; - - @ApiModelProperty("行序号") - private Integer rowSeq; - - @ApiModelProperty("列序号") - private Integer columnSeq; - - @ApiModelProperty("组件参数信息") - private Map baseComponent; - - @ApiModelProperty("model代码") - private String modelCode; - - @ApiModelProperty("该组件的事件动作集合") - private List eventActions; - - @ApiModelProperty("组件使用到的model字段集合") - private List modelFields; - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentModel.java new file mode 100644 index 0000000..a439f10 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrComponent; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; + +import java.io.Serializable; +import java.util.LinkedHashMap; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/28 上午12:42 + * @desc + */ +@Data +@Builder +@ApiModel("Panel与组件关系的创建model") +public class ScrPanelComponentModel implements Serializable { + private static final long serialVersionUID = -5832175256726333348L; + + @ApiModelProperty("panel") + private ScrPanel panel; + + @ApiModelProperty("布局") + private ScrLayout layout; + + @ApiModelProperty("布局单元") + private List layoutItems; + + @ApiModelProperty("布局单元与组件集合的对应map") + private LinkedHashMap> componentsMap; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java deleted file mode 100644 index 2a10b3c..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model; - -import cn.estsh.i3plus.pojo.screen.bean.ScrComponent; -import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction; -import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentModelField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @author Wynne.Lu - * @date 2021/3/28 上午12:42 - * @desc - */ -@Data -@ApiModel("Panel和组件的查询model") -public class ScrPanelComponentQueryModel implements Serializable { - private static final long serialVersionUID = 4133777603151273736L; - - @ApiModelProperty("行代码") - private String rowCode; - - @ApiModelProperty("列代码") - private String columnCode; - - @ApiModelProperty("组件") - private ScrComponent component; - - @ApiModelProperty("动作事件") - private ScrEventAction eventAction; - - @ApiModelProperty("组件与model字段的关系") - private List modelFields; - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java new file mode 100644 index 0000000..89ec5b0 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/27 下午6:10 + * @desc + */ +@Data +@ApiModel("容器布局model") +public class ScrPanelLayoutModel implements Serializable { + private static final long serialVersionUID = 3311398396212346985L; + + @ApiModelProperty("panel") + private ScrPanel panel; + + @ApiModelProperty("布局") + private ScrLayout layout; + + @ApiModelProperty("布局中的单元关系") + private List layoutItems; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java index ee78596..55207a2 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java @@ -6,8 +6,8 @@ import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.io.Serializable; import java.util.List; import java.util.Map; @@ -65,11 +65,14 @@ public class ScrRequestModel implements Serializable { private String methodName; @ApiModelProperty("上传文件") - private MultipartFile file; + private transient File file; @ApiModelProperty("模型字段") private List modelFields; + @ApiModelProperty("模型字段代码") + private Map modelFieldMap; + @ApiModelProperty("父代码") private String parentCode; @@ -80,7 +83,7 @@ public class ScrRequestModel implements Serializable { private String whereAppender; @ApiModelProperty("调用接口参数") - private Map param; + private Map param; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrResponseModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrResponseModel.java index a6a6cae..eb30f5a 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrResponseModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrResponseModel.java @@ -1,13 +1,11 @@ package cn.estsh.i3plus.pojo.screen.model; import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; import lombok.Data; -import org.springframework.web.multipart.MultipartFile; import java.io.Serializable; import java.util.List; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java deleted file mode 100644 index 12f782b..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model; - -import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn; -import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @author Wynne.Lu - * @date 2021/3/27 下午8:35 - * @desc - */ -@Data -@ApiModel("行列Model") -public class ScrRowColumnModel implements Serializable { - private static final long serialVersionUID = 7450630220924238356L; - - @ApiModelProperty("行") - private ScrLayoutRow row; - - @ApiModelProperty("行中的列") - private List columns; -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java deleted file mode 100644 index ead4f1e..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.model; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2021/3/28 上午12:42 - * @desc - */ -@Data -@ApiModel("Screen与Panel的创建Model") -public class ScrScreenPanelCreateModel implements Serializable { - private static final long serialVersionUID = -5832175256726333348L; - - @ApiModelProperty("screen代码") - private String screenCode; - - @ApiModelProperty("布局代码") - private String layoutCode; - - @ApiModelProperty("行代码") - private String rowCode; - - @ApiModelProperty("列代码") - private String columnCode; - - @ApiModelProperty("panel代码") - private String panelCode; - -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelModel.java new file mode 100644 index 0000000..d8f37cb --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanel; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrScreen; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.LinkedHashMap; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/28 上午12:42 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("Screen与Panel的创建Model") +public class ScrScreenPanelModel implements Serializable { + private static final long serialVersionUID = -5832175256726333348L; + + @ApiModelProperty("页面") + private ScrScreen screen; + + @ApiModelProperty("布局") + private ScrLayout layout; + + @ApiModelProperty("布局单元") + private List layoutItems; + + @ApiModelProperty("布局单元与容器") + private LinkedHashMap panelsMap; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java deleted file mode 100644 index 3255b32..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; -import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 20-5-28 下午3:39 - * @Modify: - **/ -public interface ScrLayoutColumnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java deleted file mode 100644 index 32a5636..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; -import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 20-5-28 下午3:39 - * @Modify: - **/ -public interface ScrLayoutRowRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java index 6effc84..104ba82 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow; import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; /** diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrComponentRepository.java similarity index 68% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrComponentRepository.java index 562d104..b40b7b0 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrComponentRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.repository; +package cn.estsh.i3plus.pojo.screen.repository.diagram; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrComponent; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrComponent; /** * @Description : diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutItemRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutItemRepository.java new file mode 100644 index 0000000..1f8ac81 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutItemRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository.diagram; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrLayoutItemRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutRepository.java similarity index 68% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutRepository.java index 78a4c00..2c40d3f 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.repository; +package cn.estsh.i3plus.pojo.screen.repository.diagram; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout; /** * @Description : diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrPanelComponentRepository.java similarity index 68% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrPanelComponentRepository.java index 4512ece..fdcf313 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRepository.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrPanelComponentRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.repository.rel; +package cn.estsh.i3plus.pojo.screen.repository.diagram; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.relation.ScrPanelComponent; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanelComponent; /** * @Description : diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrPanelRepository.java similarity index 62% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrPanelRepository.java index 0d4ee36..deb3115 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrPanelRepository.java @@ -1,8 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.repository; +package cn.estsh.i3plus.pojo.screen.repository.diagram; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrAction; -import cn.estsh.i3plus.pojo.screen.bean.ScrPanel; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanel; /** * @Description : diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrScreenPanelRepository.java similarity index 68% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrScreenPanelRepository.java index cfe08b3..7e6d6a7 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRepository.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrScreenPanelRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.repository.rel; +package cn.estsh.i3plus.pojo.screen.repository.diagram; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.relation.ScrScreenPanel; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrScreenPanel; /** * @Description : diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrScreenRepository.java similarity index 68% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrScreenRepository.java index b1a72a7..f696f48 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrScreenRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.screen.repository; +package cn.estsh.i3plus.pojo.screen.repository.diagram; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.ScrScreen; +import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrScreen; /** * @Description : diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRepository.java deleted file mode 100644 index 985642d..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.repository.rel; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentEventAction; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 20-5-28 下午3:39 - * @Modify: - **/ -public interface ScrComponentEventActionRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRepository.java deleted file mode 100644 index e441be7..0000000 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.screen.repository.rel; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentModelField; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 20-5-28 下午3:39 - * @Modify: - **/ -public interface ScrComponentModelFieldRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index 1acf77d..e2fd57e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -100,6 +100,14 @@ public class WmsBomTotal extends BaseBean { @ApiParam(value = "是否虚阶物料") private String category; + @Column(name = "PURCHASE_TYPE") + @ApiParam(value = "采购类型") + private String purchaseType; + + @Column(name = "SPECIAL_PURCHASE_TYPE") + @ApiParam(value = "特殊采购类型") + private String specialPurchaseType; + /** * 是否包含子阶 * @return diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index f17dccb..a65a085 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -517,6 +517,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("完成时间") public String complateDateTime; + @Transient + @ApiParam("供应商名称") + public String vendorName; + + @Transient + @ApiParam(value = "供应商编号") + private String vendorNo; + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java new file mode 100644 index 0000000..cd58ed5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description : WmsECartOrderNoBuild + * @Author :gsz + * @Date 2021/7/5 19:06 + * @Modify + **/ +@Data +@Entity +@Table(name="WMS_ECARD_ORDERNO_BUILD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Api(value="南非看板订单号",description = "南非看板订单号") +@NoArgsConstructor +public class WmsECartOrderNoBuild extends BaseBean { + + private static final long serialVersionUID = 7332606009041273554L; + @Column(name = "PART_NO") + @ApiParam(value = "物料代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "CREATE_DATE") + @ApiParam(value = "创建日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String createDate; + + @Column(name = "SERIAL_NO") + @ApiParam(value = "序列号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer serialNo; + + @Column(name = "DEST_LOCATE_NO") + @ApiParam(value = "目标库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String destLocateNo; + + @Column(name = "SRC_ZONE_NO") + @ApiParam(value = "源存储区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String srcZoneNo; + + public WmsECartOrderNoBuild(String partNo, String createDate, Integer serialNo, String destLocateNo, String srcZoneNo) { + this.partNo = partNo; + this.createDate = createDate; + this.serialNo = serialNo; + this.destLocateNo = destLocateNo; + this.srcZoneNo = srcZoneNo; + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 0a500ac..c493171 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -67,6 +67,11 @@ public class WmsLocatePart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double max; + @Column(name = "WARN", columnDefinition = "decimal(18,8)") + @ApiParam(value = "预警值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Double warn; + @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最小值", example = "0") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) @@ -127,6 +132,10 @@ public class WmsLocatePart extends BaseBean { return this.max ==null?0:this.max.doubleValue(); } + public double getWarnValue() { + return this.warn ==null?0:this.warn.doubleValue(); + } + public double getMinValue(){ return this.min ==null?0:this.min.doubleValue(); } @@ -153,4 +162,21 @@ public class WmsLocatePart extends BaseBean { this.whNo = whNo; this.stockUnit = stockUnit; } + + public WmsLocatePart(String locateNo, String partNo, String partNameRdd, Double pullQty, Double max, Double warn, Double min, + Integer isGeneratePicklist, Double safetyStock, Double moq, String zoneNo, String whNo, String stockUnit) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.pullQty = pullQty; + this.max = max; + this.warn = warn; + this.min = min; + this.isGeneratePicklist = isGeneratePicklist; + this.safetyStock = safetyStock; + this.moq = moq; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.stockUnit = stockUnit; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index b194f43..157e3ca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -38,8 +38,8 @@ import javax.persistence.Version; @Index(columnList = "ORDER_NO"), @Index(columnList = "ITEM_STATUS"), @Index(columnList = "SN"), - @Index(columnList = "VENDOR_NO"), - @Index(columnList = "PACKAGE_NO"), + //@Index(columnList = "VENDOR_NO"), + //@Index(columnList = "PACKAGE_NO"), @Index(columnList = "ORGANIZE_CODE") }) @Api("库存移动单条码信息") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 6ee40bf..6060bdd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -36,17 +36,17 @@ import java.util.List; @Table(name = "WMS_STOCK_SN", indexes = { @Index(columnList = "PACKAGE_NO"), @Index(columnList = "PART_NO"), - @Index(columnList = "REF_SRC"), + //@Index(columnList = "REF_SRC"), @Index(columnList = "SN"), - @Index(columnList = "SN_2D"), - @Index(columnList = "WH_NO"), + //@Index(columnList = "SN_2D"), + //@Index(columnList = "WH_NO"), @Index(columnList = "ZONE_NO"), @Index(columnList = "LOCATE_NO"), - @Index(columnList = "LOT_NO"), - @Index(columnList = "FIX_LOT_NO"), - @Index(columnList = "DATE_CODE"), - @Index(columnList = "VENDOR_NO"), - @Index(columnList = "ORGANIZE_CODE") + //@Index(columnList = "LOT_NO"), + //@Index(columnList = "FIX_LOT_NO"), + //@Index(columnList = "DATE_CODE"), + //@Index(columnList = "VENDOR_NO"), + //@Index(columnList = "ORGANIZE_CODE") }) @DynamicInsert @DynamicUpdate diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java new file mode 100644 index 0000000..14eeefb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +/** + * @Description : ERP fgDetail表 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2021/7/5 9:31 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "WMS_ERP_FG_DETAILS_SNAPSHOT", indexes = {@Index(columnList = "PART_NO"), @Index(columnList = "AREA_NO"), @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "SNAPSHOT_TIME")}) +public class WmsErpFgDetailsSnapshot extends BaseBean { + private static final long serialVersionUID = -4095444692227226944L; + + @Column(name = "SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子零件号") + private String itemPartNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin号") + private String vinCode; + + @Column(name = "ITEM_PART_QTY") + @ApiParam("子零件数量") + private Double itemPartQty; + + @ApiParam("存储区") + private String zoneNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java index 4b5934f..6385abe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java @@ -4,14 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -72,6 +72,10 @@ public class BasImportTemplate extends BaseBean{ @ApiParam(value = "起始行", example = "0") private Integer startRow; + @Column(name = "REMARK") + @ApiParam(value = "备注") + private String remark; + @Transient @ApiParam("模板明细列表") private List templateDetailsList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java index 21c1237..a7da14f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java @@ -122,4 +122,8 @@ public class BasImportTemplateDetails extends BaseBean{ @Column(name = "IS_EXPORT_TITLE") @ApiParam("是否导出表头") private Integer isExportTitle; + + @Column(name = "ANNOTATE_COMMENT") + @ApiParam("批注") + private String annotateComment; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java new file mode 100644 index 0000000..a4f7dfb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : WmsFinePunchWarehouseWarningDto + * @Author :gsz + * @Date 2021/7/5 11:03 + * @Modify + **/ +@Data +@Api("中航WMS看板－精冲库存预警看板(出参)") +public class WmsFinePunchWarehouseWarningDto { + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件号名称") + private String partNameRdd; + + @ApiParam(value = "库存地") + private String areaNo; + + @ApiParam(value = "库存数") + private Double qty; + + @ApiParam(value = "最大库存值") + private Double maxqty; + + @ApiParam(value = "预警值") + private Double warnValue; + + @ApiParam(value = "最小库存值") + private Double minqty; + + @ApiParam(value = "库存状态") + private String stockStatus; + + @ApiParam(value = "颜色") + private String color; + + public WmsFinePunchWarehouseWarningDto(String partNo, String partNameRdd, String areaNo, Double qty, Double maxqty, Double warnValue, Double minqty, String stockStatus, String color) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.areaNo = areaNo; + this.qty = qty; + this.maxqty = maxqty; + this.warnValue = warnValue; + this.minqty = minqty; + this.stockStatus = stockStatus; + this.color = color; + } + + public WmsFinePunchWarehouseWarningDto() { + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java index ba061d6..5e1a1cd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java @@ -44,6 +44,9 @@ public class WmsStockSnDto { @ApiParam(value = "存储区") private String zoneNo; + @ApiParam(value = "库存地代码") + private String areaNo; + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode) { this.locateNo = locateNo; this.partNo = partNo; @@ -71,6 +74,17 @@ public class WmsStockSnDto { this.zoneNo = zoneNo; } + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec, String zoneNo, String areaNo) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + this.partSpec = partSpec; + this.zoneNo = zoneNo; + this.areaNo = areaNo; + } + public WmsStockSnDto() { } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsErpFgDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsErpFgDetailsRepository.java new file mode 100644 index 0000000..f3d4a4e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsErpFgDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpFgDetailsSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 库存信息快照 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsErpFgDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java new file mode 100644 index 0000000..bc11275 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsECartOrderNoBuild; + +/** + * @Description : WmsECartOrderNoBuildRepository + * @Author :gsz + * @Date 2021/7/6 9:56 + * @Modify + **/ +public interface WmsECartOrderNoBuildRepository extends BaseRepository { +}