From fb3b8a033db666195c5c80b575f00994df9b304d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 2 Sep 2019 10:24:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?excel=E9=80=9A=E7=94=A8=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 090477f..79ce1a2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -83,7 +83,6 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") - @AnnoOutputColumn(hidden = true) public String createDatetime; @Column(name="MODIFY_USER") @@ -93,7 +92,6 @@ public abstract class BaseBean implements Serializable { @Column(name="MODIFY_DATE_TIME") @ApiParam(value = "修改日期") - @AnnoOutputColumn(hidden = true) public String modifyDatetime; @Transient From eadb86ce60e48a94eb5510942312c352fe2b8799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 2 Sep 2019 18:53:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?excel=E9=80=9A=E7=94=A8=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/annotation/AnnoOutputColumn.java | 3 + .../pojo/base/enumutil/SoftSwitchEnumUtil.java | 296 ++++++++++++++++++++- .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 10 + .../i3plus/pojo/platform/bean/SysTaskPlan.java | 6 +- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 1 + .../i3plus/pojo/softswitch/bean/BsDataSource.java | 8 +- .../softswitch/bean/BsDataSourceSuitCaseTable.java | 31 +-- .../pojo/softswitch/bean/BsSocketSuitCase.java | 3 - .../i3plus/pojo/softswitch/bean/BsSslKeyParam.java | 8 + .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 4 + .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 2 +- .../pojo/softswitch/bean/BsSuitSchedule.java | 4 + .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 14 +- 13 files changed, 356 insertions(+), 34 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java index eee532e..f913d0f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java @@ -34,6 +34,9 @@ public @interface AnnoOutputColumn { public boolean hidden() default false; + // 是否必需 + boolean required() default true; + // 敬请发挥 public enum FORMAT{ STRING("STRING","全部显示"), // String 类型 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java index fb98a2a..787d5c0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.StringUtils; /** * @Description : 软适配 枚举接口 @@ -18,7 +19,10 @@ public class SoftSwitchEnumUtil { public enum CASE_TYPE{ SOCKET(1,"SOCKET"), RESTFUL(2,"RESTFUL"), - DATASOURCE(3,"数据源"); + DATASOURCE(3,"数据源"), + WEBSERVICE(4,"WebService"), + MQ(5,"消息队列"), + WebSocket(6,"WebSocket"); private int value; private String description; @@ -150,5 +154,293 @@ public class SoftSwitchEnumUtil { } } - //keyTypeId + /** + * 数据库连接方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_SOURCE_TYPE { + SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), + SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"), + SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null), + SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"); + + private int value; + private String code; + private String description; + private String driverClassName; + private int defaultPort; + private String defaultSchemaPattern; + + private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) { + this.value = value; + this.code = code; + this.description = description; + this.driverClassName = driverClassName; + this.defaultPort = port; + this.defaultSchemaPattern = defaultSchemaPattern; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public String getDriverClassName() { + return driverClassName; + } + + public int getDefaultPort() { + return defaultPort; + } + + public String getDefaultSchemaPattern() { + return defaultSchemaPattern; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public String getJDBCUrl(String database,String host,Integer port){ + if(this.getValue() == SOURCE_MARIA_DB.getValue()){ + return getJDBCUrlMySQL(database,host,port); + }else if(this.getValue() == SOURCE_ORACLE.getValue()){ + return getJDBCUrlOracle(database,host,port); + }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ + return getJDBCUrlPostgreSQL(database,host,port); + }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ + return getJDBCUrlSQLServer(database,host,port); + } + return null; + } + + public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ + if(StringUtils.isNotBlank(databaseProductName)){ + if(databaseProductName.indexOf(":mysql:") != -1){ + return SOURCE_MARIA_DB; + }else if(databaseProductName.indexOf(":oracle:") != -1){ + return SOURCE_ORACLE; + }else if(databaseProductName.indexOf(":postgresql:") != -1){ + return SOURCE_POSTGRE_SQL; + }else if(databaseProductName.indexOf(":sqlserver:") != -1){ + return SOURCE_SQL_SERVER; + } + } + return null; + } + + private String getJDBCUrlMySQL(String database,String host,Integer port){ + return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; + } + + private String getJDBCUrlOracle(String database,String host,Integer port){ + return "jdbc:oracle:thin:@"+host+":"+port+":"+database; + } + + private String getJDBCUrlPostgreSQL(String database,String host,Integer port){ + return "jdbc:postgresql://"+host+":"+port+"/"+database; + } + + private String getJDBCUrlSQLServer(String database,String host,Integer port){ + return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database; + } + } + + /** + * 参数值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PARAM_VALUE_TYPE{ + NUM(1,"数字"), + STRING(2,"字符串"), + BOOLEAN(3,"布尔"), + MAP(4,"字典"), + LIST(5,"列表"); + + private int value; + private String description; + + PARAM_VALUE_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 PARAM_TYPE{ + OUT_PARAM(1,"出参"), + IN_PARAM(2,"入参"), + REQUEST_HEADER(3,"请求头"); + + private int value; + private String description; + + PARAM_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 SUIT_MODE{ + ACTIVE(1,"主动"), + PASSIVE(2,"被动"); + + private int value; + private String description; + + SUIT_MODE(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 SUIT_METHOD{ + ACTIVE(1,"主动适配"), + SCHEDULE(2,"定时调度"); + + private int value; + private String description; + + SUIT_METHOD(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-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 0e0cbab..a839741 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -57,38 +58,47 @@ public class SysMenu extends BaseBean { @Column(name="PARENT_NAME_RDD") @ApiParam(value ="父级功能名称" , access ="父级功能名称") + @AnnoOutputColumn(required = false) private String parentNameRdd; @Column(name="MENU_CLASS_PATH") @ApiParam(value ="资源class path" , access ="资源class path") + @AnnoOutputColumn(required = false) private String menuClassPath; @Column(name="MENU_GRADE") @ApiParam(value ="资源等级", example = "1") + @AnnoOutputColumn(required = false) private String menuGrade; @Column(name="MENU_SORT") @ApiParam(value ="资源排序", example = "0") + @AnnoOutputColumn(required = false) private Integer menuSort; @Column(name="MENU_URL") @ApiParam(value ="资源 url" , access ="资源 url") + @AnnoOutputColumn(required = false) private String menuUrl; @Column(name="MENU_CSS") @ApiParam(value ="资源css" , access ="资源css") + @AnnoOutputColumn(required = false) private String menuCss; @Column(name="MENU_ICON") @ApiParam(value ="资源icon" , access ="资源icon") + @AnnoOutputColumn(required = false) private String menuIcon; @Column(name="MENU_DESCRIPTION") @ApiParam(value ="资源描述" , access ="配置描述") + @AnnoOutputColumn(required = false) private String menuDescription; @Column(name="MENU_STATUS") @ApiParam(value ="功能状态" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1") + @AnnoOutputColumn(required = false) private Integer menuStatus; @Transient diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index eac48cd..5f54d24 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -134,9 +134,9 @@ public class SysTaskPlan extends BaseBean { private String noticeChannel; public int getTaskPlanStatusVal() { - if(taskPlanStatus != null){ - return taskPlanStatus.intValue(); + if(taskPlanStatus == null){ + return -1; } - return taskPlanStatus; + return taskPlanStatus.intValue(); } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 7e544a4..0c99c73 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -453,6 +453,7 @@ public class CoreHqlPack { // hql拼接 HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result); + HqlPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result); HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result); HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result); HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result); diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java index ac58030..eeca022 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -44,7 +44,7 @@ public class BsDataSource extends BaseBean { private Integer dataSourceTypeId; @Column(name = "DATA_SOURCE_HOST") - @ApiParam(value = "数据源主机") + @ApiParam(value = "数据源ip地址") private String dataSourceHost; @Column(name = "DATA_SOURCE_PORT") @@ -59,8 +59,12 @@ public class BsDataSource extends BaseBean { @ApiParam(value = "密码") private String dataSourcePassword; + @Column(name = "DATA_SOURCE_STATUS") + @ApiParam(value = "数据源状态") + private String dataSourceStatus; + @Column(name = "DATA_SOURCE_DESCRIPTION") - @ApiParam(value = "数据源用户描述") + @ApiParam(value = "数据源描述") private String dataSourceDescription; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java index d7876d2..5e86604 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java @@ -34,25 +34,26 @@ public class BsDataSourceSuitCaseTable extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitCaseId; - @Column(name = "TABLE_NAME") - @ApiParam(value = "数据库表名") - private String tableName; + @Column(name = "OPERATE_NAME") + @ApiParam(value = "操作名称") + private String operateName; - @Column(name = "QUERY_SQL") - @ApiParam(value = "查询sql") - private String querySql; + @Column(name = "OPERATE_TYPE_ID") + @ApiParam(value = "操作类型") + private Integer operateTypeId; - @Column(name = "AFTER_QUERY_SQL") - @ApiParam(value = "查询后操作sql") - private String afterQuerySql; + @Column(name = "EXECUTE_SQL") + @ApiParam(value = "执行sql") + private String executeSql; - @Column(name = "INSERT_SQL") - @ApiParam(value = "插入sql") - private String insertSql; + @Column(name = "OPERATE_SORT") + @ApiParam(value = "操作顺序") + private Integer operateSort; + + @Column(name = "IS_RETURN") + @ApiParam(value = "是否有返回") + private String isReturn; - @Column(name = "AFTER_INSERT_SQL") - @ApiParam(value = "插入后执行sql") - private String afterInsertSql; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java index e480cbd..5b9e496 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java @@ -33,8 +33,5 @@ public class BsSocketSuitCase extends BaseBean { @ApiParam(value = "socket类型（枚举）") private Integer socketTypeId; - @Column(name = "SOCKET_MODE_ID") - @ApiParam(value = "socket模式(枚举,服务端，客户端)") - private Integer socketModeId; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java index f9837ca..a4c52be 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java @@ -41,6 +41,14 @@ public class BsSslKeyParam extends BaseBean { @ApiParam(value = "参数名称") private String paramName; + @Column(name = "PARENT_PARAM_NAME") + @ApiParam(value = "上级参数名称") + private String parentParamName; + + @Column(name = "PARAM_VALUE_TYPE_ID") + @ApiParam(value = "参数值类型(枚举)") + private String paramValueTypeId; + @Column(name = "PARAM_VALUE") @ApiParam(value = "参数值") private String paramValue; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index 47d1e44..f5d8f9e 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -57,6 +57,10 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "适配器代码") private String suitCaseCode; + @Column(name = "SUIT_MODE_ID") + @ApiParam(value = "适配模式(枚举,主动，被动)") + private Integer suitModeId; + @Column(name = "SUIT_CASE_HOST") @ApiParam(value = "适配主机") private String suitCaseHost; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 2563cbf..18f5afa 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -56,7 +56,7 @@ public class BsSuitRecord extends BaseBean { private Long suitCaseDetailId; @Column(name = "SUIT_METHOD_ID") - @ApiParam(value = "适配方式id枚举") + @ApiParam(value = "适配方式id枚举（定时适配，主动适配）") private Integer suitMethodId; @Column(name = "SUIT_METHOD_NAME_RDD") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java index c5b13a1..378a7cd 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java @@ -69,5 +69,9 @@ public class BsSuitSchedule extends BaseBean { @ApiParam(value = "最后一次执行时间") private String lastExecuteDateTime; + @Column(name = "status") + @ApiParam(value = "定时适配任务状态") + private Integer status; + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 09901b1..0190f85 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.softswitch.bean.*; -import org.apache.commons.lang3.StringUtils; /** * @Description : @@ -83,11 +82,11 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){ DdlPackBean ddlPackBean = new DdlPackBean(); -// DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean); -// DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean); -// DdlPreparedPack.getNumEqualPack(bsSuitCase.getParamTypeId(), "paramTypeId", ddlPackBean); -// DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseId(), "suitCaseId", ddlPackBean); -// DdlPreparedPack.getStringEqualPack(bsSuitCase.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitTypeId(), "suitTypeId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitCase.getCaseTypeId(), "caseTypeId", ddlPackBean); ddlPackBean.setOrderByStr(bsSuitCase.orderBy()); @@ -151,7 +150,6 @@ public class SoftSwitchHqlPack { DdlPackBean ddlPackBean = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getTaskCycleId(),"taskCycleId",ddlPackBean); @@ -247,7 +245,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsDataSource.getDataSourceTypeId(), "dataSourceTypeId", ddlPackBean); - DdlPreparedPack.getNumEqualPack(bsDataSource.getIsValid(), "isValid", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsDataSource.getDataSourceStatus(), "dataSourceStatus", ddlPackBean); ddlPackBean.setOrderByStr(bsDataSource.orderBy());