diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java new file mode 100644 index 0000000..0ccb531 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +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; + +/** + * @Description :mes-pcn定时任务工作清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_TASK") +@Api("mes-pcn定时任务工作清单") +public class MesPcnTask extends BaseBean { + + @Column(name="TASK_CODE") + @ApiParam("任务代码") + private String taskCode; + + @Column(name="TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name="TASK_DESCRIPTION") + @ApiParam("任务描述") + private String taskDescription; + + @Column(name="TASK_TYPE") + @ApiParam("任务类型") + private Integer taskType; + + @Column(name="TASK_MODULE") + @ApiParam("任务模块") + private String taskModule; + + @Column(name="TASK_CLASS") + @ApiParam("任务类名") + private String taskClass; + + @Column(name="TASK_PACKAGE") + @ApiParam("任务包名") + private String taskPackage; + + @Column(name="PCN_NAME") + @ApiParam("PCN节点名称") + private String pcnName; + + @Column(name="TASK_CYCLE_EXPS") + @ApiParam("任务周期表达式") + private String taskCycleExps; + + @Column(name="TASK_CYCLE_DESCRIPTION") + @ApiParam("任务周期描述") + private String taskCycleDescription; + + public int getTaskTypeVal() { + return this.taskType == null ? 0 : this.taskType; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java new file mode 100644 index 0000000..27daf23 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +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; + +/** + * @Description :mes-pcn定时任务工作清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_TASK") +@Api("mes-pcn定时任务工作清单") +public class MesPcnTask extends BaseBean { + + @Column(name="TASK_CODE") + @ApiParam("任务代码") + private String taskCode; + + @Column(name="TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name="TASK_DESCRIPTION") + @ApiParam("任务描述") + private String taskDescription; + + @Column(name="TASK_TYPE") + @ApiParam("任务类型") + private Integer taskType; + + @Column(name="TASK_MODULE") + @ApiParam("任务模块") + private String taskModule; + + @Column(name="TASK_CLASS") + @ApiParam("任务类名") + private String taskClass; + + @Column(name="TASK_PACKAGE") + @ApiParam("任务包名") + private String taskPackage; + + @Column(name="PCN_NAME") + @ApiParam("PCN节点名称") + private String pcnName; + + @Column(name="TASK_CYCLE_EXPS") + @ApiParam("任务周期表达式") + private String taskCycleExps; + + @Column(name="TASK_CYCLE_DESCRIPTION") + @ApiParam("任务周期描述") + private String taskCycleDescription; + + public int getTaskTypeVal() { + return this.taskType == null ? 0 : this.taskType; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskRepository.java new file mode 100644 index 0000000..cd51761 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnTask; +import org.springframework.stereotype.Repository; + +/** + * @Description :mes-pcn定时任务清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Repository +public interface MesPcnTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index b509989..511125e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1103,4 +1103,23 @@ public class MesHqlPack { packBean.setOrderByStr(numberRule.orderBy()); return packBean; } + + /** + * mes-pcn定时任务清单 + * @param mesPcnTask + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode); + if (StringUtils.isNotEmpty(mesPcnTask.getTaskCode())) { + DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); + } + if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) { + DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); + } + + packBean.setOrderByStr(mesPcnTask.orderBy()); + return packBean; + } }