diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 7fdc84c..2ab69b8 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 99a4195..b73ac3b 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 3411cbc..6a2a6dd 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
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 e02966c..4901a17 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
@@ -530,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;
@@ -1036,4 +1035,68 @@ public class ScreenEnumUtil {
return tmp;
}
}
+
+ /**
+ * 等待平台枚举抽入数据库或redis
+ */
+ public enum ENUM_SOFT_TYPE {
+ COMMON(10, "CommonEnumUtil", "通用枚举"),
+ IMPP(20, "ImppEnumUtil", "平台枚举"),
+ WMS(30, "WmsEnumUtil", "WMS枚举"),
+ SWEB(40, "SwebEnumUtil", "Sweb枚举"),
+ MES(50, "MesEnumUtil", "Mes枚举"),
+ MES_PCN(60, "MesPcnEnumUtil", "MesPcn枚举"),
+ ANDON(70, "AndonEnumUtil", "Andon枚举"),
+ APS(80, "ApsEnumUtil", "Aps枚举"),
+ BLOCK_FORM(90, "BlockFormEnumUtil", "动态表单枚举"),
+ BLOCK_REPORT(100, "BlockReportEnumUtil", "动态报表枚举"),
+ BLOCK_SOFT_SWITCH(110, "BlockSoftSwitchEnumUtil", "软适配枚举"),
+ LAC(120, "LacEnumUtil", "Lac枚举"),
+ MDM(130, "MdmEnumUtil", "主数据中心枚举"),
+ PTL(140, "PtlEnumUtil", "Ptl枚举"),
+ PTL_PCN(150, "PtlPcnEnumUtil", "PtlPcn枚举"),
+ SCREEN(160, "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/pom.xml b/modules/i3plus-pojo-bsp/pom.xml
index 254b452..2453f02 100644
--- a/modules/i3plus-pojo-bsp/pom.xml
+++ b/modules/i3plus-pojo-bsp/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
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/client/bean/po/MethodRegistryParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java
index 6d5bddf..8391c30 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java
@@ -30,11 +30,24 @@ public class MethodRegistryParam implements Serializable {
private List parameterList;
@ApiParam("方法的版本")
private String version;
- @ApiParam("方法影响了那些表")
- private String[] affectTableClassName;
- @ApiParam("方法的处理逻辑")
- private String[] systemProcess;
- @ApiParam("方法参数的验证逻辑")
- private String[] validation;
+ @ApiParam("方法描述")
+ private String description;
+// @ApiParam("方法影响了那些表")
+// private String[] affectTableClassName;
+// @ApiParam("方法的处理逻辑")
+// private String[] systemProcess;
+// @ApiParam("方法参数的验证逻辑")
+// private String[] validation;
+// @ApiParam("创建时间")
+// private String createdDatetime;
+// @ApiParam("更新时间")
+// private String updatedDatetime;
+// @ApiParam("更新日志")
+// private String[] changeLog;
+// @ApiParam("markdown 文件的路径")
+// private String markdownFilePath;
+
+ @ApiParam("markdown 的文字内容")
+ private String markdownContent;
}
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java
index faf16b6..1b11d0d 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java
@@ -22,6 +22,8 @@ public class RegistryParam implements Serializable {
private String appname;
@ApiParam("执行器的地址")
private String address;
+ @ApiParam(value = "注册类型 1:自动 2:手动", defaultValue = "1")
+ private Integer registryType;
@ApiParam("执行器注册的方法信息")
private List methodRegistryParamList;
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/MethodGroupListModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupListModel.java
new file mode 100644
index 0000000..01684c1
--- /dev/null
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupListModel.java
@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.bsp.server.bean.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description : 查询方法组使用的model
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/7/30 9:36
+ * @Modify:
+ **/
+@ApiModel("查询方法组")
+@Data
+public class MethodGroupListModel {
+
+ @ApiModelProperty("方法组名字")
+ private String methodGroupName;
+
+ @ApiModelProperty("方法组分类")
+ private String classify;
+}
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java
index 0614b68..dab4701 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java
@@ -1,12 +1,11 @@
package cn.estsh.i3plus.pojo.bsp.server.bean.model;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.util.List;
-import java.util.Map;
/**
* @Description :
@@ -17,13 +16,19 @@ import java.util.Map;
**/
@Data
@AllArgsConstructor
-@Api("添加方法组")
+@ApiModel("添加方法组")
public class MethodGroupModel {
- @ApiParam("方法组的名称")
+ @ApiModelProperty("方法组的名称")
private String methodGroupName;
- @ApiParam("方法组的描述")
+
+ @ApiModelProperty("方法组的描述")
private String description;
- @ApiParam("方法组层级列表")
+
+ @ApiModelProperty("方法组层级列表")
private List methodLevel;
+
+ @ApiModelProperty("方法组分类")
+ private String classify;
+
}
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java
index 13ca0b7..a3febb7 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java
@@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.bsp.server.bean.model;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -16,13 +16,15 @@ import java.util.List;
**/
@Data
@AllArgsConstructor
-@Api("添加方法组层级")
+@ApiModel("添加方法组层级")
public class MethodLevelModel {
- @ApiParam("方法Id")
+ @ApiModelProperty("方法Id")
private Long methodId;
- @ApiParam("方法层级")
+ @ApiModelProperty("方法名称")
+ private String methodName;
+ @ApiModelProperty("方法层级")
private String level;
- @ApiParam("参数列表")
+ @ApiModelProperty("参数列表")
List paramModels;
}
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java
index 5664d22..6137bc2 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java
@@ -1,12 +1,10 @@
package cn.estsh.i3plus.pojo.bsp.server.bean.model;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
-import java.util.Map;
-
/**
* @Description :
* @Reference :
@@ -16,12 +14,12 @@ import java.util.Map;
**/
@Data
@AllArgsConstructor
-@Api("添加方法组层级参数")
+@ApiModel("添加方法组层级参数")
public class MethodLevelParamModel {
- @ApiParam("根据出参生成,入参key = 层级 + methodId + 出参Name")
+ @ApiModelProperty("根据出参生成,入参key = 层级 + methodId + 出参Name")
private String paramKey;
- @ApiParam("对应本方法的入参名称")
- private String paramValue;
- @ApiParam("入参类型,用于校验数据类型")
+ @ApiModelProperty("对应本方法的入参名称")
+ private String methodParamName;
+ @ApiModelProperty("入参类型,用于校验数据类型")
private String type;
}
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodListModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodListModel.java
new file mode 100644
index 0000000..bcd60f7
--- /dev/null
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodListModel.java
@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.bsp.server.bean.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/7/29 10:14
+ * @Modify:
+ **/
+@Data
+@ApiModel("分页查询方法列表")
+public class MethodListModel {
+
+ @ApiModelProperty(name = "执行器名")
+ private String appName;
+ @ApiModelProperty(name = "方法的版本号")
+ private String version;
+
+
+}
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java
index 420f335..95e1f6a 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java
@@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.bsp.server.bean.model;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -16,16 +16,16 @@ import java.util.List;
**/
@Data
@AllArgsConstructor
-@Api("注册/心跳")
+@ApiModel("注册/心跳")
public class RegistryMessageInfo {
- @ApiParam("appName,根据appName分执行器组")
+ @ApiModelProperty("appName,根据appName分执行器组")
private String appName;
- @ApiParam("执行器地址")
+ @ApiModelProperty("执行器地址")
private String address;
- @ApiParam("方法列表")
+ @ApiModelProperty("方法列表")
private List methodRegistryParamList;
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java
index bac52b3..ce2f963 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java
@@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.bsp.server.bean.model;
-import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -16,16 +17,16 @@ import java.util.List;
**/
@Data
@AllArgsConstructor
-@Api("注册方法信息")
+@ApiModel("注册方法信息")
public class RegistryMethodInfo {
- @ApiParam("方法名")
+ @ApiModelProperty("方法名")
private String methodName;
- @ApiParam("调用方法时的key")
+ @ApiModelProperty("调用方法时的key")
private String methodHandlerKey;
- @ApiParam("参数列表")
+ @ApiModelProperty("参数列表")
private List methodParamList;
/*-----------------------------------文档------------------------------------------------*/
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java
index 06899f1..4ab8832 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java
@@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.bsp.server.bean.model;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -14,16 +14,16 @@ import lombok.Data;
**/
@Data
@AllArgsConstructor
-@Api("方法注册参数")
+@ApiModel("方法注册参数")
public class RegistryMethodParamInfo {
- @ApiParam("参数名")
+ @ApiModelProperty("参数名")
private String name;
- @ApiParam("参数类型,入参1,出参0")
+ @ApiModelProperty("参数类型,入参1,出参0")
private Integer type;
- @ApiParam("数据类型,基本数据类型")
+ @ApiModelProperty("数据类型,基本数据类型")
private String typeName;
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..971b152
--- /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.List;
+import java.util.Map;
+
+/**
+ * @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 Map weightConfig;
+ @ApiModelProperty(value = "执行器地址列表")
+ private List addressList;
+}
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java
index 8da6d03..82dbf4c 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java
@@ -40,7 +40,7 @@ public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable
@Column(name = "TYPE",columnDefinition = "int default 0")
@ApiModelProperty("自动注册 0,手动注册 1")
- private String type;
+ private Integer type;
@Column
@ApiModelProperty("执行器组路由策略,默认随机")
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java
index dc7a4f9..680ea4a 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java
@@ -40,4 +40,8 @@ public class ExecutorRegistryInfo extends BaseBean implements Serializable {
@Column(name = "UPDATE_TIME")
@ApiModelProperty("最近一次心跳时间")
private Date updateTime;
+
+ @Column(name = "WEIGHT")
+ @ApiModelProperty("执行器权重")
+ private Integer weight;
}
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java
index 38e7baa..e8c05c3 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java
@@ -50,6 +50,10 @@ public class ExecutorRegistryMethodInfo extends BaseBean implements Serializable
@ApiModelProperty("所属执行器的appName")
private String appName;
+ @Column(name = "description")
+ @ApiModelProperty("方法描述")
+ private String description;
+
@Transient
@ApiModelProperty("方法参数列表")
private List paramInfos;
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java
index f010070..d5ec62c 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java
@@ -38,5 +38,9 @@ public class MethodGroupInfo extends BaseBean implements Serializable {
@ApiModelProperty("方法组描述")
private String description;
+ @Column(name = "CLASSIFY")
+ @ApiModelProperty("方法组分类(唯一)")
+ private String classify;
+
}
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java
index c1b4f15..798b564 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java
@@ -43,6 +43,10 @@ public class MethodLevelInfo extends BaseBean implements Serializable {
@ApiModelProperty("当前层级的方法ID")
private Long methodId;
+ @Column(name = "METHOD_NAME")
+ @ApiModelProperty("方法名称")
+ private String methodName;
+
@Transient
@ApiModelProperty("方法的参数关系列表")
private List paramInfoList;
diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java
index 23c0d46..d96c81b 100644
--- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java
+++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.po;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
import lombok.*;
import javax.persistence.Column;
@@ -47,6 +48,12 @@ public class MethodLevelParamInfo extends BaseBean implements Serializable {
@Column(name = "METHOD_ID")
@ApiModelProperty("对应的当前层级的方法Id")
private Long methodId;
+ /**
+ * 对应方法的名字,todo 临时字段 2021/8/1
+ */
+ @Column(name = "METHOD_NAME")
+ @ApiModelProperty("对应的当前层级的方法的名字")
+ private String methodName;
@Column(name = "METHOD_GROUP_ID")
@ApiModelProperty("对应方法组的Id")
@@ -54,13 +61,20 @@ public class MethodLevelParamInfo extends BaseBean implements Serializable {
/**
* 原有方法的入参是否必须,做验证
*/
- @Column(name = "require")
+ @Column(name = "REQUIRE_TYPE",columnDefinition = "int")
@ApiModelProperty("原有方法的入参是否必须,做调用前验证")
- private Integer require;
+ private Integer requireType;
/**
* 参数类型,验证是否正确
*/
- @Column(name = "type")
+ @Column(name = "TYPE")
@ApiModelProperty("参数类型验证")
private String type;
+
+ /**
+ * 层级的入参
+ */
+ @Column(name = "LEVEL")
+ @ApiModelProperty("层级的入参")
+ private String level;
}
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-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 37bf889..ee93af0 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index 048d5cd..b6822e2 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index c338f71..2de88b5 100644
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 1ed6d53..d1f5529 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 93d4237..0c4fd62 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml
index d98b7d8..7f94617 100644
--- a/modules/i3plus-pojo-mdm/pom.xml
+++ b/modules/i3plus-pojo-mdm/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index 0ee0761..eaaf018 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 4519749..ab3d9f0 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 1c581bc..0fb3892 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index 657abba..2e2e59e 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 504b0e7..66b4907 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 26e173f..840238c 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml
index 48930f8..6bef2bc 100644
--- a/modules/i3plus-pojo-screen/pom.xml
+++ b/modules/i3plus-pojo-screen/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
4.0.0
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 64c0116..2bcd645 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
@@ -71,6 +71,10 @@ public class ScrModelField extends BaseBean implements Serializable {
@ApiModelProperty("是否支持排序")
private Integer isAllowSort;
+ @Column(name = "IS_ALLOW_MODIFY")
+ @ApiModelProperty("是否支持修改")
+ private Integer isAllowModify;
+
@Column(name = "IS_REQUIRED")
@ApiModelProperty("是否必填")
private Integer isRequired;
@@ -87,15 +91,16 @@ public class ScrModelField extends BaseBean implements Serializable {
@ApiModelProperty("是否是虚拟的")
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;
+ private String modelFieldSourceProps;
@Transient
+ @ApiModelProperty(value="模型字段值")
private Object fieldValue;
}
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..3d1381d 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;
@@ -61,15 +61,18 @@ public class ScrRequestModel implements Serializable {
@ApiModelProperty("类名")
private String className;
- @ApiModelProperty("方法名")
- private String methodName;
+ @ApiModelProperty("方法ID")
+ private Long methodGroupId;
@ApiModelProperty("上传文件")
- private MultipartFile file;
+ private transient File file;
@ApiModelProperty("模型字段")
private List modelFields;
+ @ApiModelProperty("模型字段代码")
+ private Map modelFieldMap;
+
@ApiModelProperty("父代码")
private String parentCode;
@@ -79,8 +82,8 @@ public class ScrRequestModel implements Serializable {
@ApiModelProperty("where条件补充")
private String whereAppender;
- @ApiModelProperty("调用接口参数")
- private Map param;
+ @ApiModelProperty("字段转换")
+ private Map fieldConverter;
}
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-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 9e00793..c5d4c40 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index f73c5b2..703ac5f 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 1bf205d..7095411 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index ca147a4..0a11dee 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index 478033a..b8fd5af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0-TEST-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
modules/i3plus-pojo-base