diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 3897219..cd9a311 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -547,4 +547,41 @@ public class PtlEnumUtil { return tmp; } } + + /** + * ptl-pcn定时任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_PCN_TASK_STATUS { + + OPEN(1, "开启"), + CLOSE(2, "关闭"); + + private int value; + private String description; + + PTL_PCN_TASK_STATUS(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/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 42becd3..921cbf3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1236,4 +1236,95 @@ public class PtlPcnEnumUtil { } } + /** + * PCN同步PTL主数据同步类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYNC_TYPE { + + GET_PTL_DATA(1, "pcn获取Ptl数据"), + DATA_TO_PTL(2, "pcn推送数据至ptl"); + + private int value; + private String description; + + SYNC_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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * PCN同步PTL主数据同步方式枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYNC_PATTERN { + + UPDATE(1, "修改"), + INSERT(2, "新增"); + + private int value; + private String description; + + SYNC_PATTERN(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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java index fd3a0d9..1c842e1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java @@ -45,14 +45,6 @@ public class PtlNode extends BaseBean implements Serializable { @ApiParam("区域名称") private String areaName; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; @@ -74,7 +66,7 @@ public class PtlNode extends BaseBean implements Serializable { private String connectTime; @Column(name = "CODE_SPECIFIC") - @ApiParam("PCN特殊字段") + @ApiParam("编码规则特殊符") private String codeSpecific; public int getConnectCountVal() { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java index 060404d..6fd597a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java @@ -77,26 +77,6 @@ public class PtlPcnSyncCfg extends BaseBean implements Serializable { @ApiParam(value = "从数据库抽取的条件限制") private String extractCondition; - @Column(name = "IS_IGNORE_ORG") - @ApiParam(value = "同步的时候是否区分工厂") - private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); - - @Transient - @ApiParam("同步方式") - private String syncPatternName; - - @Transient - @ApiParam("同步类型名称") - private String syncTypeName; - - @Transient - @ApiParam(value = "同步的时候是否区分工厂") - private String isIgnoreOrgName; - - public int getIsIgnoreOrgVal() { - return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg; - } - public int getSyncFrequencyVal() { return this.syncFrequency == null ? 0 : this.syncFrequency; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java new file mode 100644 index 0000000..916a9ce --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @Description :ptl-pcn定时任务工作清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_TASK") +@Api("ptl-pcn定时任务工作清单") +public class PtlPcnTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 4129714382965409395L; + + @Column(name = "TASK_CODE") + @ApiParam("任务代码") + private String taskCode; + + @Column(name = "TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name = "TASK_GROUP_NAME") + @ApiParam("任务组名称") + private String taskGroupName; + + @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 = "PCN_CODE") + @ApiParam("PCN节点名称代码") + private String pcnCode; + + @Column(name = "TASK_CYCLE_EXPS") + @ApiParam("任务周期表达式") + private String taskCycleExps; + + @Column(name = "TASK_CYCLE_DESCRIPTION") + @ApiParam("任务周期描述") + private String taskCycleDescription; + + @Column(name = "TASK_PARAM") + @ApiParam("任务参数") + private String taskParam; + + public int getTaskTypeVal() { + return this.taskType == null ? 0 : this.taskType; + } + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java new file mode 100644 index 0000000..f10f0e0 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @Description :ptl-pcn定时任务工作清单同步记录 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_TASK_LOG") +@Api("ptl-pcn定时任务工作清单同步记录") +public class PtlPcnTaskLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -784806174962540310L; + + @Column(name = "SYNC_TIME_START") + @ApiParam("同步数据开始时间") + private String syncTimeStart; + + @Column(name = "SYNC_TIME_END") + @ApiParam("同步数据截止时间") + private String syncTimeEnd; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_CONTENT") + @ApiParam("异常内容") + private Long errorContent; + + public int getSyncStatusVal() { + return this.syncStatus == null ? 0 : this.syncStatus; + } +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskRepository.java new file mode 100644 index 0000000..7db5d90 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnTask; +import org.springframework.stereotype.Repository; + +/** + * @Description :ptl-pcn定时任务清单 + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-03-03 + * @Modify: + **/ +@Repository +public interface PtlPcnTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 5efbb4d..9e9cfcc 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -124,6 +124,22 @@ public class PtlHqlPack { return packBean; } + /** + * PTL PCN系统配置信息条件查询 + * + * @param ptlConfig + * @return + */ + public static DdlPackBean getPtlSyncConfig(PtlConfig ptlConfig, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + DdlPreparedPack.getStringLikerPack(ptlConfig.getCfgCode(), "cfgCode", packBean); + DdlPreparedPack.getStringLikerPack(ptlConfig.getCfgName(), "cfgName", packBean); + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgKey(), "cfgKey", packBean); + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgType(), "cfgType", packBean); + DdlPreparedPack.getNumEqualPack(ptlConfig.getIsValid(), "isValid", packBean); + return packBean; + } + /** * PTL-PCN节点查询条件封装 @@ -183,4 +199,22 @@ public class PtlHqlPack { return packBean; } + + /** + * ptl-pcn定时任务清单 + * + * @param ptlPcnTask + * @param organizeCode + * @return + */ + public static DdlPackBean getPtlPcnTask(PtlPcnTask ptlPcnTask, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(ptlPcnTask, organizeCode); + if (!StringUtils.isEmpty(ptlPcnTask.getTaskCode())) { + DdlPreparedPack.getStringLikerPack(ptlPcnTask.getTaskCode(), "taskCode", packBean); + } + if (!StringUtils.isEmpty(ptlPcnTask.getTaskName())) { + DdlPreparedPack.getStringLikerPack(ptlPcnTask.getTaskName(), "taskName", packBean); + } + return packBean; + } }