diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BspEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BspEnumUtil.java new file mode 100644 index 0000000..90cffeb --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BspEnumUtil.java @@ -0,0 +1,203 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/18 16:10 + * @Modify: + **/ +public class BspEnumUtil { + + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PARAM_TYPE { + METHOD_PARAM_TYPE(10, "method", "方法参数"), + SCRIPT_PARAM_TYPE(20, "script", "脚本参数"); + private Integer value; + private String code; + private String description; + + PARAM_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public static PARAM_TYPE getByValue(String value) { + for (PARAM_TYPE actionType : values()) { + if (actionType.getValue().equals(value)) { + return actionType; + } + } + return null; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + + /** + * 语言类型（Groovy、Python、JavaScript、Scala、Ruby） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRIPT_LANGUAGE { + GROOVY(10, "Groovy"), + PYTHON(20, "Python"), + JAVA_SCRIPT(30, "JavaScript"), + SCALA(40, "Scala"), + RUBY(50, "Ruby"); + + private int value; + private String description; + + SCRIPT_LANGUAGE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** + * 脚本类型（Groovy、Python、JavaScript、Scala、Ruby） + * 用于策略模式，脚本执行 + * 要和language_type一对一 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRIPT_TYPE { + GROOVY(10, "groovyScript"), + PYTHON(20, "pythonScript"), + JAVA_SCRIPT(30, "javaScript"), + SCALA(40, "scalaScript"), + RUBY(50, "rubyScript"); + + private int value; + private String beanName; + + SCRIPT_TYPE(int value, String beanName) { + this.value = value; + this.beanName = beanName; + } + + public int getValue() { + return value; + } + + public String getBeanName() { + return beanName; + } + + public static String valueOfBeanName(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].beanName; + } + } + return tmp; + } + } + + /** + * 方法组类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum METHOD_GROUP_TYPE { + BSP(10, "BSP"), + WMS(20, "WMS"), + MES(30, "MES"), + APS(40, "APS"), + MES_PCN(50, "MES_PCN"); + + private int value; + private String description; + + METHOD_GROUP_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + + /** + * 执行器区分执行的是方法还是脚本 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum METHOD_OR_SCRIPT { + METHOD(10, "METHOD"), + SCRIPT(20, "SCRIPT"); + + private int value; + private String description; + + METHOD_OR_SCRIPT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } +} 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 d7dbfd9..c8fc9d1 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 @@ -90,8 +90,11 @@ public class CommonEnumUtil { /** * 调试服务 */ - DEV(9999, 0000, 0, 120000000L, "Development", "系统调试"); - + DEV(9999, 0000, 0, 120000000L, "Development", "系统调试"), + /** + * 智能调度系统 + */ + LEO(50, 8234, 0, 106000000L, "impp-leo", "智能调度系统"); /** * 产品ID diff --git a/modules/i3plus-pojo-bsp/pom.xml b/modules/i3plus-pojo-bsp/pom.xml index 16b7645..95ce841 100644 --- a/modules/i3plus-pojo-bsp/pom.xml +++ b/modules/i3plus-pojo-bsp/pom.xml @@ -13,6 +13,22 @@ i3plus-pojo-bsp + + + org.codehaus.groovy + groovy + 2.5.6 + + + org.codehaus.groovy + groovy-jsr223 + 2.5.6 + + + org.python + jython-standalone + 2.7.1 + i3plus.pojo i3plus-pojo-base 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 deleted file mode 100644 index ad98d80..0000000 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GroovyCommonUtil.java +++ /dev/null @@ -1,11 +0,0 @@ -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/GsonTool.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GsonTool.java deleted file mode 100644 index 63e2956..0000000 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GsonTool.java +++ /dev/null @@ -1,98 +0,0 @@ -package cn.estsh.i3plus.pojo.bsp.common; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.reflect.TypeToken; - -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.List; - -/** - * @Description : - * @Reference : - * @Author : Castle - * @CreateDate : 2021/6/17 13:40 - * @Modify: - **/ -public class GsonTool { - private static Gson gson = null; - - static { - gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create(); - } - - /** - * Object 转成 json - * - * @param src - * @return String - */ - public static String toJson(Object src) { - return gson.toJson(src); - } - - /** - * json 转成 特定的cls的Object - * - * @param json - * @param classOfT - * @return - */ - public static T fromJson(String json, Class classOfT) { - return gson.fromJson(json, classOfT); - } - - /** - * json 转成 特定的 rawClass 的Object - * - * @param json - * @param classOfT - * @param argClassOfT - * @return - */ - public static T fromJson(String json, Class classOfT, Class argClassOfT) { - Type type = new ParameterizedType4ReturnT(classOfT, new Class[]{argClassOfT}); - return gson.fromJson(json, type); - } - - public static class ParameterizedType4ReturnT implements ParameterizedType { - private final Class raw; - private final Type[] args; - - public ParameterizedType4ReturnT(Class raw, Type[] args) { - this.raw = raw; - this.args = args != null ? args : new Type[0]; - } - - @Override - public Type[] getActualTypeArguments() { - return args; - } - - @Override - public Type getRawType() { - return raw; - } - - @Override - public Type getOwnerType() { - return null; - } - } - - /** - * json 转成 特定的cls的list - * - * @param json - * @param classOfT - * @return - */ - public static List fromJsonList(String json, Class classOfT) { - return gson.fromJson( - json, - new TypeToken>() { - }.getType() - ); - } -} 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 deleted file mode 100644 index d5be5c1..0000000 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java +++ /dev/null @@ -1,149 +0,0 @@ -//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 deleted file mode 100644 index 350078d..0000000 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/ReturnT.java +++ /dev/null @@ -1,56 +0,0 @@ -//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/MethodGroupModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java index dab4701..520fc98 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 @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.List; @@ -16,9 +17,13 @@ import java.util.List; **/ @Data @AllArgsConstructor +@NoArgsConstructor @ApiModel("添加方法组") public class MethodGroupModel { + @ApiModelProperty("方法组id") + private Long id; + @ApiModelProperty("方法组的名称") private String methodGroupName; @@ -29,6 +34,9 @@ public class MethodGroupModel { private List methodLevel; @ApiModelProperty("方法组分类") - private String classify; + private Integer classification; + + @ApiModelProperty("链接关系") + private String connections; } 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 a3febb7..798caae 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 @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.List; @@ -16,6 +17,7 @@ import java.util.List; **/ @Data @AllArgsConstructor +@NoArgsConstructor @ApiModel("添加方法组层级") public class MethodLevelModel { 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 6137bc2..a9dca64 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 @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * @Description : @@ -14,6 +15,7 @@ import lombok.Data; **/ @Data @AllArgsConstructor +@NoArgsConstructor @ApiModel("添加方法组层级参数") public class MethodLevelParamModel { @ApiModelProperty("根据出参生成，入参key = 层级 + methodId + 出参Name") diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java index 6366ff6..1fdae76 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java @@ -27,4 +27,12 @@ public class RequestModel { private Map jsonParamMap; @ApiModelProperty("日志id") private Long logId; + @ApiModelProperty("方法类型-脚本-方法") + private Integer type; + @ApiModelProperty("脚本类型") + private Integer scriptType; + @ApiModelProperty("脚本内容") + private String scriptContent; +// @ApiModelProperty("脚本执行位置") +// private Integer scriptExecutor; } 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 edb524e..73de817 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 @@ -19,7 +19,7 @@ import java.util.Date; * @Modify: **/ @Entity -@Table(name = "EXECUTOR_GROUP_REGISTRY_INFO") +@Table(name = "BSP_EXECUTOR_GROUP_REGISTRY_INFO") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor 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 cc55180..34839d3 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 @@ -19,7 +19,7 @@ import java.util.Date; * @Modify: **/ @Entity -@Table(name = "EXECUTOR_REGISTRY_INFO") +@Table(name = "BSP_EXECUTOR_REGISTRY_INFO") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @@ -48,4 +48,8 @@ public class ExecutorRegistryInfo extends BaseBean implements Serializable { @Column(name = "HEART_BEAT") @ApiModelProperty("心跳，存活1，2死掉") private Integer heartBeat; + + @Column(name = "EXECUTOR_TYPE") + @ApiModelProperty("执行器的类型，同枚举Method_group_Type") + private Integer executorType; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java index d798c1e..1f4d82a 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java @@ -7,6 +7,7 @@ import lombok.*; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -18,7 +19,7 @@ import java.io.Serializable; * @Modify: **/ @Entity -@Table(name = "EXECUTOR_REGISTRY_METHOD_DOC_INFO") +@Table(name = "BSP_REGISTRY_METHOD_DOC_INFO") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @@ -28,30 +29,44 @@ import java.io.Serializable; public class ExecutorRegistryMethodDocInfo extends BaseBean implements Serializable { private static final long serialVersionUID = 2770821289940006535L; - @Column(name = "BEAN_NAME") - @ApiModelProperty("beanName") - private String beanName; - - @Column(name = "VERSION") - @ApiModelProperty("方法版本") - private String version; - - @Column(name = "AFFECT_TABLE_STR") - @ApiModelProperty("受影响的表名,逗号分割，原来为数组") - private String affectTableClassNameStr; - - @Column(name = "SYSTEM_PROCESS_STR") - @ApiModelProperty("系统要执行的逻辑 逗号分割，原来为数组") - private String systemProcessStr; - /** - * 参数验证 逗号分割，原来为数组 - */ - @Column(name = "VALIDATION") - @ApiModelProperty("参数验证 逗号分割，原来为数组") - private String validation; - - @Column(name = "METHOD_ID") - @ApiModelProperty("方法ID") - private Long methodId; - //todo 缺少参数信息 + @ApiModelProperty(value = "应用名称") + @Column(name = "APP_NAME") + private String appName; + + @ApiModelProperty(value = "markdown文本，前端渲染") + @Column(name = "MARKDOWN") + private String markdown; + + @ApiModelProperty(value = "方法名,方法名和应用名做唯一键") + @Lob + @Column(name = "METHOD_NAME") + private String methodName; + + @ApiModelProperty(value = "分类") + @Lob + @Column(name = "CLASSIFICATION") + private String classification; +// @Column(name = "BEAN_NAME") +// @ApiModelProperty("beanName") +// private String beanName; +// +// @Column(name = "VERSION") +// @ApiModelProperty("方法版本") +// private String version; +// +// @Column(name = "AFFECT_TABLE_STR") +// @ApiModelProperty("受影响的表名,逗号分割，原来为数组") +// private String affectTableClassNameStr; +// +// @Column(name = "SYSTEM_PROCESS_STR") +// @ApiModelProperty("系统要执行的逻辑 逗号分割，原来为数组") +// private String systemProcessStr; + +// @Column(name = "VALIDATION") +// @ApiModelProperty("参数验证 逗号分割，原来为数组") +// private String validation; + +// @Column(name = "METHOD_ID") +// @ApiModelProperty("方法ID") +// private Long methodId; } 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 e8c05c3..89e43de 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 @@ -19,7 +19,7 @@ import java.util.List; * @CreateDate : 2021/6/16 13:39 * @Modify: **/ -@Table(name = "EXECUTOR_REGISTRY_METHOD_INFO") +@Table(name = "BSP_REGISTRY_METHOD_INFO") @Entity @Data @EqualsAndHashCode(callSuper = true) @@ -50,6 +50,10 @@ public class ExecutorRegistryMethodInfo extends BaseBean implements Serializable @ApiModelProperty("所属执行器的appName") private String appName; + @Column(name = "METHOD_TYPE") + @ApiModelProperty("方法类型，属于那个执行器类型,同枚举类method_group_type") + private Integer methodType; + @Column(name = "description") @ApiModelProperty("方法描述") private String description; diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryParamInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryParamInfo.java index 4c9ada9..e60c436 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryParamInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryParamInfo.java @@ -18,7 +18,7 @@ import java.io.Serializable; * @Modify: **/ @Entity -@Table(name = "EXECUTOR_REGISTRY_PARAM_INFO") +@Table(name = "BSP_REGISTRY_PARAM_INFO") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @@ -42,7 +42,11 @@ public class ExecutorRegistryParamInfo extends BaseBean implements Serializable private String typeName; @Column(name = "METHOD_ID") - @ApiModelProperty("所属方法的ID") + @ApiModelProperty("所属方法/脚本的ID") private Long methodId; +// @Column(name = "PARAM_TYPE") +// @ApiModelProperty("区分方法还是脚本的参数,方法参数10,脚本参数20") +// private Integer paramType; + } 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 d5ec62c..9d18301 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 @@ -7,6 +7,7 @@ import lombok.*; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -18,7 +19,7 @@ import java.io.Serializable; * @Modify: **/ @Entity -@Table(name = "METHOD_GROUP_INFO") +@Table(name = "BSP_METHOD_GROUP_INFO") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @@ -32,15 +33,18 @@ public class MethodGroupInfo extends BaseBean implements Serializable { @Column(name = "NAME") @ApiModelProperty("方法组名称") - private String name; + private String methodGroupName; @Column(name = "DESCRIPTION") @ApiModelProperty("方法组描述") private String description; - @Column(name = "CLASSIFY") - @ApiModelProperty("方法组分类(唯一)") - private String classify; - + @Column(name = "CLASSIFICATION") + @ApiModelProperty("方法组分类,挂载到的wms,mes等,枚举类") + private Integer classification; + @Lob + @Column(name = "CONNECTIONS") + @ApiModelProperty("方法组内的连线关系") + private String connections; } 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 798b564..89d2a61 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 @@ -20,7 +20,7 @@ import java.util.List; * @Modify: **/ @Entity -@Table(name = "METHOD_LEVEL_INFO") +@Table(name = "BSP_METHOD_LEVEL_INFO") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor 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 d96c81b..e1f1a1e 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 @@ -19,7 +19,7 @@ import java.io.Serializable; * @Modify: **/ @Entity -@Table(name = "METHOD_LEVEL_PARAM_INFO") +@Table(name = "BSP_METHOD_LEVEL_PARAM_INFO") @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java index 67d6f4d..f85f4b3 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java @@ -18,7 +18,7 @@ import java.io.Serializable; * @CreateDate : 2021/9/8 17:01 * @Modify: **/ -@Table(name = "METHOD_LOG") +@Table(name = "BSP_METHOD_LOG") @Entity @Data @EqualsAndHashCode(callSuper = true) @@ -51,4 +51,8 @@ public class MethodLog extends BaseBean implements Serializable { @ApiModelProperty("方法所属应用冗余") @Column(name = "APP_NAME_RDD") private String appNameRdd; + + @ApiModelProperty("区分方法或者脚本,BSP枚举") + @Column(name = "TYPE") + private Integer type; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ScriptPersistence.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ScriptPersistence.java new file mode 100644 index 0000000..1584ce0 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ScriptPersistence.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.po; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/19 11:49 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "BSP_SCRIPT_PERSISTENCE", uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SCRIPT_NO"}) +}) +@Api("系统动态脚本") +public class ScriptPersistence extends BaseBean { + @Column(name = "SCRIPT_NO", length = 50) + @ApiModelProperty(value = "脚本调用的唯一编号，例如：WMS_PDA_0001") + private String scriptNo; + + @ApiModelProperty(value = "脚本的中文名称") + @Column(name = "SCRIPT_NAME", length = 50) + private String scriptName; + + @ApiModelProperty(value = "目标执行器") + @Column(name = "TARGET_EXECUTOR") + private Integer targetExecutor; + + @ApiModelProperty(value = "脚本编写的语言 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby") + @Column(name = "LANGUAGE_TYPE") + private Integer languageType; + + @Lob + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + @ApiModelProperty(value = "脚本的具体内容") + private String scriptContent; + + @ApiModelProperty(value = "脚本的描述，包含脚本的用法，参数说明等") + @Column(name = "SCRIPT_REMARK", length = 2000) + private String scriptRemark; + + @ApiModelProperty(value = "编译后的脚本内容，通过预编译加快脚本的运行速度") + @Transient + private Object compiledScript; +//暂时不提供历史版本号功能 +// @Column(name = "SCRIPT_VERSION") +// @ApiModelProperty(value = "脚本版本号") +// private String scriptVersion; +// +// @ApiModelProperty(value = "脚本编号列表") +// @Transient +// private List versionList; + + @ApiModelProperty(value = "脚本参数列表") + @Transient + private List paramInfoList; + +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodGroupCommonVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodGroupCommonVo.java new file mode 100644 index 0000000..99cf12d --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodGroupCommonVo.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/24 16:27 + * @Modify: + **/ +@Data +@ApiModel(value = "methodGroup通用vo") +public class MethodGroupCommonVo { + + @ApiModelProperty(value = "方法组的id") + private List ids; + + @ApiModelProperty(value = "方法组启用禁用") + private Integer isValid; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodGroupVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodGroupVo.java index d5ed9b5..aa0242a 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodGroupVo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodGroupVo.java @@ -15,7 +15,9 @@ import lombok.Data; @Data public class MethodGroupVo { @ApiParam(value = "方法组名称") - private String groupName; + private String methodGroupName; @ApiParam(value = "是否启用") - private Integer valid; + private Integer isValid; + @ApiParam(value = "方法组分类") + private Integer classification; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/ScriptDeleteVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/ScriptDeleteVo.java new file mode 100644 index 0000000..e77b847 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/ScriptDeleteVo.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/22 19:23 + * @Modify: + **/ +@Data +@ApiModel("deletedVO") +public class ScriptDeleteVo { + private List ids; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/ScriptTestVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/ScriptTestVo.java new file mode 100644 index 0000000..5e307d3 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/ScriptTestVo.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/22 14:27 + * @Modify: + **/ +@Data +@ApiModel(value = "脚本测试") +public class ScriptTestVo { + + @ApiModelProperty(value = "脚本内容") + private String scriptContent; + + @ApiModelProperty(value = "方法名，默认为execute") + private String methodName; + + @ApiModelProperty(value = "参数列表") + private Map arguments; + + @ApiModelProperty(value = "执行器") + private Integer targetExecutor; + + @ApiModelProperty(value = "脚本语言") + private Integer languageType; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/ScriptVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/ScriptVo.java new file mode 100644 index 0000000..e0e5572 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/ScriptVo.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/19 11:39 + * @Modify: + **/ +@ApiModel(value = "查询脚本vo") +@Data +public class ScriptVo { + + @ApiModelProperty(value = "脚本名称") + private String scriptName; + + @ApiModelProperty(value = "脚本状态") + private Integer isValid; + + @ApiModelProperty(value = "脚本语言") + private Integer scriptLanguage; + + @ApiModelProperty(value = "脚本No,唯一") + private String scriptNo; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/dao/IEngineScriptDao.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/dao/IEngineScriptDao.java new file mode 100644 index 0000000..26d93dd --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/dao/IEngineScriptDao.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.bsp.server.dao; + +import cn.estsh.i3plus.pojo.bsp.client.bean.po.EngineScriptPersistence; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/18 11:23 + * @Modify: + **/ +public interface IEngineScriptDao { + /** + * 根据脚本名称获取所有的版本号 + * @param name + * @return + */ + List findAllVersionByScriptName(String name); +} 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 index 52a88d2..67a2342 100644 --- 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 @@ -1,7 +1,7 @@ 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; +import cn.estsh.i3plus.pojo.bsp.server.bean.po.ScriptPersistence; /** * @Description : @@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.bsp.client.bean.po.EngineScriptPersistence; * @CreateDate : 2021/7/22 13:51 * @Modify: **/ -public interface ScriptRepository extends BaseRepository { +public interface ScriptRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java index d163189..6e5cbe7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java @@ -66,7 +66,8 @@ public class WmsHealthIndicator extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String indicatorColor; - @Transient +// @Transient + @Column(name = "INDICATOR_VALUE") @ApiParam(value = "指标测算值") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double indicatorCalcValue; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java index 348b704..2ddd7d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java @@ -46,10 +46,10 @@ public class WmsHealthVariable extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String variableName; - @Column(name = "CYCLE_RANGE") - @ApiParam(value = "周期") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String cycleRange; +// @Column(name = "CYCLE_RANGE") +// @ApiParam(value = "周期") +// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) +// private String cycleRange; @Column(name = "CALC_FREQUENCY") @ApiParam(value = "计算频次") @@ -107,4 +107,10 @@ public class WmsHealthVariable extends BaseBean { @ApiParam(value = "测算方式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String calcWays; + + @Column(name = "VARIABLE_VALUE") + @ApiParam(value = "上次计算的值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double varibleValue; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java index aba0dee..d5ebb85 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java @@ -49,7 +49,7 @@ public class WmsHealthVariableResult extends BaseBean { @Column(name = "VARIABLE_VALUE") @ApiParam(value = "变量测算值") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) - private Integer variableValue; + private Double variableValue; @Lob @Column(name = "VARIABLE_DETAILS") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/IWmsHealthIndexCron.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/IWmsHealthIndexCron.java index daed272..40d1e4d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/IWmsHealthIndexCron.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/IWmsHealthIndexCron.java @@ -26,4 +26,11 @@ public interface IWmsHealthIndexCron { * 获取下一个计算周期 */ Date getNextDate(); + + + /** + * 获取周期间隔，即两个连续的计算时间的差值 + * 根据CRON表达式，计算出每个执行周期的毫秒数，如每5分钟执行一次，就是300000毫秒 + */ + public long getDifference(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexCalcWay.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexCalcWay.java index ab2507e..f00453d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexCalcWay.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexCalcWay.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean.health; +import lombok.Getter; + /** * 测算方式 * @author link @@ -18,9 +20,20 @@ public enum WmsHealthIndexCalcWay { */ SCRIPT("30"); + @Getter private String value; private WmsHealthIndexCalcWay(String value){ this.value = value; } + + public static WmsHealthIndexCalcWay value(String value) { + WmsHealthIndexCalcWay[] values = WmsHealthIndexCalcWay.values(); + for(WmsHealthIndexCalcWay target:values) { + if(target.getValue().equals(value)) { + return target; + } + } + return null; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexEntity.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexEntity.java index 30c691c..7148932 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexEntity.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexEntity.java @@ -1,13 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean.health; -import cn.estsh.i3plus.pojo.wms.bean.WmsHealthVariableResult; import lombok.Getter; import lombok.Setter; -import org.springframework.expression.ExpressionParser; -import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.expression.spel.support.StandardEvaluationContext; - -import java.util.Set; /** * 指标代码业务对象 @@ -36,12 +30,15 @@ public class WmsHealthIndexEntity { */ private WmsHealthIndexValue value; /** - * 是否刷新数据 + * 是否刷新数据(更新数据) */ private Boolean refresh; public WmsHealthIndexEntity(final WmsHealthIndexId id, final WmsHealthIndexFormula formula){ + if(null==id){ + throw new IllegalArgumentException("WmsHealthIndexId can't be null"); + } this.id = id; this.formula = formula; }; @@ -50,7 +47,7 @@ public class WmsHealthIndexEntity { final String indicatorCode, final String calcFormula){ return new WmsHealthIndexEntity(WmsHealthIndexId.of(organizeCode,indicatorCode), - WmsHealthIndexFormula.of(organizeCode,indicatorCode)); + WmsHealthIndexFormula.of(organizeCode,calcFormula)); } @@ -67,13 +64,17 @@ public class WmsHealthIndexEntity { } } + public boolean hashValue(){ + return null != this.value; + } private WmsHealthIndexValue generateWmsHealthIndexValue(){ - if(!formula.isEmpty()){ + if(!formula.isResultEmpty()){ String result = null; int size = formula.getResults().size(); if(size==1){ WmsHealthIndexVariableValue varValue = formula.getSingleValue(); + if(null!=varValue) result = String.valueOf(varValue.getDetail()); }else{ result = String.valueOf(formula.getSpelResult()); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexFormula.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexFormula.java index 4c2ecb9..6e49fb1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexFormula.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexFormula.java @@ -9,6 +9,7 @@ import java.util.*; /** * 健康度测算公式 + * (#VAR202201070002/#VAR456)/(#VAR123/#VAR456)*100 */ @Getter public class WmsHealthIndexFormula { @@ -17,7 +18,7 @@ public class WmsHealthIndexFormula { */ private final String organizeCode; /** - * 健康度指标测算代码 (#VAR202201070002/#VAR456)/(#VAR123/#VAR456)*100% + * 健康度指标测算代码 (#VAR202201070002/#VAR456)/(#VAR123/#VAR456) * 100 */ private final String calcFormula; /** @@ -32,6 +33,12 @@ public class WmsHealthIndexFormula { public WmsHealthIndexFormula(final String organizeCode,final String calcFormula){ + if(null==organizeCode){ + throw new IllegalArgumentException("organizeCode can't be null"); + } + if(null==calcFormula){ + throw new IllegalArgumentException("calcFormula can't be null"); + } this.calcFormula = calcFormula; this.organizeCode = organizeCode; checkCode(); @@ -62,12 +69,15 @@ public class WmsHealthIndexFormula { } public void addResult(WmsHealthIndexVariable key, WmsHealthIndexVariableValue result){ - if(null!=result) { - this.results.put(key, result); + if(null!=result && null!=key) { + if(key.isRefresh()) { + key.changeValue(result); + } + results.put(key, result); } } - public boolean isEmpty(){ + public boolean isResultEmpty(){ return results.isEmpty(); } @@ -83,7 +93,7 @@ public class WmsHealthIndexFormula { * 获取单个值对象 */ public WmsHealthIndexVariableValue getSingleValue(){ - if(!isEmpty()) { + if(!isResultEmpty()) { WmsHealthIndexVariableValue variableValue = com.google.common.collect.Lists .newArrayList(results.values()).get(0); return variableValue; @@ -95,11 +105,11 @@ public class WmsHealthIndexFormula { * 根据健康度指标calcFormula，计算SPEL表达式的值 * @return */ - public Integer getSpelResult(){ + public Double getSpelResult(){ if(results.isEmpty()) { - return -1; + return -1.0; } - Integer calcResult = 0; + Double calcResult = 0.0; int resultSize = results.size(); StandardEvaluationContext ctx = new StandardEvaluationContext(); ExpressionParser parser = new SpelExpressionParser(); @@ -111,15 +121,15 @@ public class WmsHealthIndexFormula { for (WmsHealthIndexVariable varKey : varKeys) { // 取出该变量名称对应的计算结果 WmsHealthIndexVariableValue variableValue = results.get(varKey); - Integer value = variableValue.getValue(); + Double value = variableValue.getValue(); ctx.setVariable(varKey.getId().getVariable(), value); } // 存在多个变量，则按照SPEL进行运算最后取值 try { - calcResult = (Integer) parser.parseExpression(calcFormula) + calcResult = (Double) parser.parseExpression(calcFormula) .getValue(ctx); } catch (Exception e) { - calcResult = -1; + calcResult = -1.0; } } return calcResult; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexId.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexId.java index a47a5b4..4e327dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexId.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexId.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean.health; import lombok.Getter; +import lombok.Setter; /** * 健康度指标标识 @@ -16,6 +17,11 @@ public class WmsHealthIndexId{ * 指标代码 */ private final String indicatorCode; + /** + * 持久化层的标识ID(OPTION)可无 + */ + @Setter + private Long pk; public WmsHealthIndexId(final String organizeCode,final String indicatorCode){ if(null==indicatorCode){ @@ -25,7 +31,7 @@ public class WmsHealthIndexId{ throw new IllegalArgumentException("organizeCode can't be null"); } this.indicatorCode = indicatorCode; - this.organizeCode = indicatorCode; + this.organizeCode = organizeCode; } public static WmsHealthIndexId of(String organizeCode,String indicatorCode){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexQuery.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexQuery.java index 4cbfe39..7a8e1db 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexQuery.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexQuery.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean.health; +import io.swagger.annotations.ApiModel; import lombok.Builder; import lombok.Getter; import lombok.Setter; @@ -16,4 +17,5 @@ public class WmsHealthIndexQuery{ private Long endTime; private Integer pageIndex; private Integer pageSize; + private Integer maxSize; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexValue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexValue.java index 735de28..ba36cd3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexValue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexValue.java @@ -13,6 +13,9 @@ public class WmsHealthIndexValue{ * 测算结果 */ private final String result; + /** + * 测算时间 + */ @Setter private Long time; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexVariable.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexVariable.java index cf1fe1a..9fd974b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexVariable.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexVariable.java @@ -2,6 +2,11 @@ package cn.estsh.i3plus.pojo.wms.bean.health; import lombok.Getter; import lombok.Setter; +import org.apache.commons.lang3.time.DateUtils; + +import java.text.SimpleDateFormat; +import java.time.Instant; +import java.util.Date; /** @@ -9,23 +14,20 @@ import lombok.Setter; */ @Getter public class WmsHealthIndexVariable { - /** * 指标变量代码 */ private final WmsHealthIndexVariableId id; - /** * 指标变量名称 */ @Setter private String name; - /** - * 计算周期 - */ - @Setter - private IWmsHealthIndexCron cycleRange; - +// /** +// * 计算周期 +// */ +// @Setter +// private IWmsHealthIndexCron cycleRange; /** * 计算频次 */ @@ -50,34 +52,59 @@ public class WmsHealthIndexVariable { @Setter private String applyPartGroup; + /** + * 数据库脚本语句 + */ @Setter private String sqlStatement; + /** + * 本地对象名（类名称，spring管理的对象别名） + */ @Setter private String className; + /** + * 函数名称 + */ @Setter private String functionName; + /** + * 脚本编号 + */ @Setter private String scriptNo; /** * 计算值 */ @Setter - private Object value; - + private WmsHealthIndexVariableValue value; /** * 修改CRON，计算周期、频次需要刷新数据 */ @Setter private boolean refresh; + /** + * 上次计算时间 + */ + @Setter + private Instant lastCalcTime; + /** + * 下一次计算时间 + */ + @Setter + private Instant nextCalcTime; - public WmsHealthIndexVariable(String organizeCode,String variable){ - this(new WmsHealthIndexVariableId(organizeCode,variable)); + + public WmsHealthIndexVariable(final String organizeCode,final String variable){ + this(new WmsHealthIndexVariableId(organizeCode, variable)); } public WmsHealthIndexVariable(WmsHealthIndexVariableId id){ + if(null==id){ + throw new IllegalArgumentException("WmsHealthIndexVariableId can't be null"); + } this.id = id; } @@ -92,17 +119,75 @@ public class WmsHealthIndexVariable { return flag; } - public boolean checked(){ + + /** + * 是否有值 + * @return + */ + public boolean hasValue(){ return null!=value; } + /** + * 修改CRON表达式 + * @param cron + */ public void changeCalcFrequency(IWmsHealthIndexCron cron){ setCalcFrequency(cron); setRefresh(true); } - public void changeCycleRange(IWmsHealthIndexCron cron){ - setCycleRange(cron); - setRefresh(true); + + /** + *设置上次执行时间 + * @param formartTime 格式化日期 yyyy-MM-dd HH:mm:ss 入参如 2022-01-13 10:45:43 + */ + public boolean setLastCalcTimeFormat(String formartTime){ + if(null==formartTime||formartTime.trim().isEmpty()){ + return false; + } + try{ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + long time = sdf.parse(formartTime).getTime(); + this.lastCalcTime = (Instant.ofEpochMilli(time)); + }catch (Exception e){ + return false; + } + return null!=lastCalcTime; + } + + + public String formatToDateTime(Long time) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + return sdf.format(new Date(time)); + } + + /** + * 获取上次计算时间，并且格式化输出 + * @return + */ + public String getLastCalcTimeFormat() { + return null!=this.lastCalcTime ? formatToDateTime(this.lastCalcTime.toEpochMilli()):""; + } + + /** + * 获取下一次计算时间，并且格式化输出 + * @return + */ + public String getNextCalcTimeFormat() { + return formatToDateTime(calcFrequency.getNextDate().getTime()); + } + + + /** + * + * @param value + */ + public void changeValue(WmsHealthIndexVariableValue value){ + if(null!=value) { + this.setValue(value); + this.setRefresh(true); + this.setLastCalcTime(Instant.now()); + } } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexVariableId.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexVariableId.java index d238caa..04971c5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexVariableId.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexVariableId.java @@ -1,15 +1,20 @@ package cn.estsh.i3plus.pojo.wms.bean.health; import lombok.Getter; -import lombok.Value; +import lombok.Setter; /** * 健康度指标变量 */ @Getter -@Value public class WmsHealthIndexVariableId { + /** + * 持久层标识ID + */ + @Getter + @Setter + private Long pk; /** * 工厂代码 */ @@ -20,4 +25,16 @@ public class WmsHealthIndexVariableId { private final String variable; + public WmsHealthIndexVariableId(final String organizeCode,final String variable){ + if(null == organizeCode){ + throw new IllegalArgumentException("organizeCode can't be null"); + } + if(null == variable){ + throw new IllegalArgumentException("variable can't be null"); + } + this.organizeCode = organizeCode; + this.variable = variable; + } + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexVariableValue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexVariableValue.java index 52290e8..953e1b6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexVariableValue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/health/WmsHealthIndexVariableValue.java @@ -7,13 +7,12 @@ import lombok.Value; * 健康度变量计算结果 */ @Getter -@Value public class WmsHealthIndexVariableValue { /** * 指标变量代码值 */ - private final Integer value; + private final Double value; /** * 详细信息 @@ -21,7 +20,19 @@ public class WmsHealthIndexVariableValue { private final Object detail; + public WmsHealthIndexVariableValue(final Double value,final Object detail){ + if(null==value){ + throw new IllegalArgumentException("value can't be null"); + } + if(null==detail){ + throw new IllegalArgumentException("detail can't be null"); + } + this.value = value; + this.detail = detail; + } + + public static WmsHealthIndexVariableValue empty(){ - return new WmsHealthIndexVariableValue(-1,""); + return new WmsHealthIndexVariableValue(-1.0,""); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsHealthIndexRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsHealthIndexRepository.java index ffeae04..ab5290e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsHealthIndexRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsHealthIndexRepository.java @@ -17,7 +17,7 @@ public interface IWmsHealthIndexRepository { * @param id * @return */ - WmsHealthIndexEntity findAndInit(WmsHealthIndexId id); + WmsHealthIndexEntity findAndInit(final WmsHealthIndexId id); /** * 获取上一次记录的健康度指标值 @@ -31,7 +31,7 @@ public interface IWmsHealthIndexRepository { * @param wmsHealthIndexEntity * @param source 统计渠道 */ - void save(final WmsHealthIndexEntity wmsHealthIndexEntity,String source); + void save(final WmsHealthIndexEntity wmsHealthIndexEntity,final String source); /**