From 7eed51791f6073ca32cd9d8d3be170fdd50dc50a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 20 Aug 2019 21:40:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E9=80=82=E9=85=8D=E5=99=A8-?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E9=80=82=E9=85=8D=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/SysTask.java | 8 +++ .../pojo/softswitch/bean/BsSuitSchedule.java | 29 ++++++++- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 69 ++++++++++++++++++++-- 3 files changed, 99 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java index 2b54d99..366a100 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java @@ -34,6 +34,10 @@ public class SysTask extends BaseBean { @ApiParam(value ="名称") private String name; + @Column(name="TASK_CODE") + @ApiParam(value ="任务代码") + private String taskCode; + // 软件类型 CommonEnumUtil.SOFT_TYPE @Column(name="TASK_SOFT_TYPE") @ApiParam(value = "软件类型") @@ -47,6 +51,10 @@ public class SysTask extends BaseBean { @ApiParam(value ="任务类名") private String taskClass; + @Column(name="IS_SYSTEM") + @ApiParam(value ="是否是系统job") + private String isSystem; + @Column(name="TASK_DESCRIPTION") @ApiParam(value ="任务描述" , access ="任务描述") private String taskDescription; 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 f938368..c5b13a1 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 @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -38,9 +39,31 @@ public class BsSuitSchedule extends BaseBean { @ApiParam(value = "适配套件名称") private String suitCaseNameRdd; - @Column(name = "EXECUTE_CRON") - @ApiParam(value = "执行时间表达式") - private String executeCron; + @Column(name = "SCHEDULE_NAME") + @ApiParam(value = "任务名称") + private String scheduleName; + + @Column(name = "SCHEDULE_GROUP_NAME") + @ApiParam(value = "任务组名称") + private String scheduleGroupName; + + @Column(name = "TASK_PLAN_ID") + @ApiParam(value = "任务计划id") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskPlanId; + + @Column(name = "TASK_CYCLE_ID") + @ApiParam(value = "任务周期id") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskCycleId; + + @Column(name = "TASK_CYCLE_NAME_RDD") + @ApiParam(value = "任务周期名称") + private String taskCycleName; + + @Column(name = "TASK_CYCLE_EXECUTE_RDD") + @ApiParam(value = "任务周期表达式表达式") + private String taskCycleExecuteRdd; @Column(name = "LAST_EXECUTE_DATE_TIME") @ApiParam(value = "最后一次执行时间") 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 96b25e9..e10ea61 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 @@ -3,10 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.sqlpack; 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.BsParamAdapter; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; -import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; +import cn.estsh.i3plus.pojo.softswitch.bean.*; import org.apache.commons.lang3.StringUtils; /** @@ -145,4 +142,68 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + /** + * 定时适配任务查询条件封装 + * @param bsSuitSchedule 查询条件 + * @return + */ + public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){ + 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); + + ddlPackBean.setOrderByStr(bsSuitSchedule.orderBy()); + + return ddlPackBean; + } + + /** + * 定时适配任务唯一校验 + * @param bsSuitSchedule + * @return + */ + public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean); + + return ddlPackBean; + } + + /** + * 安全证书查询条件分页 + * @param bsSslKey 查询条件 + * @return + */ + public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyType(),"keyType",ddlPackBean); + + ddlPackBean.setOrderByStr(bsSslKey.orderBy()); + + return ddlPackBean; + } + + /** + * 安全证书唯一校验 + * @param bsSslKey + * @return + */ + public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean); + + return ddlPackBean; + } + }