From 9189ca1bbdb18b0a42ed493e9a33b066dd195ebb Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 14 Nov 2018 19:47:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 185ee6b..0eba270 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -143,7 +143,6 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); - HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDatetime", result, true); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); From 611fb5b601eac26c69aabf9b2f8a422064e2a4a6 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 15 Nov 2018 09:46:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=80=A7=E7=AD=89=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index ca8a649..909efab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; @@ -29,7 +30,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result); HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsDeleted(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrganizeCode(), "organizeCode", result); return result.toString(); @@ -85,7 +86,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result); HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result); HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getStringEqualPack(wmsPOMaster.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -178,6 +180,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result); return result.toString(); } @@ -196,6 +200,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result); HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(),"organizeCode",result); return result.toString(); } @@ -216,6 +222,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(),"organizeCode",result); return result.toString(); } @@ -300,7 +308,9 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsTransType.getProgCode(), "progCode", result); HqlPack.getStringLikerPack(wmsTransType.getOrganizeCode(), "organizeCode", result); HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(wmsTransType.getIsDeleted(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(),"organizeCode",result); + return result.toString(); } @@ -317,6 +327,9 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result); HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result); HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true); + HqlPack.getNumEqualPack(wmsTrans.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result.toString(); } From 4fb5f548cfbbdf5060d8ca5b91da83fdb4534c27 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 15 Nov 2018 10:05:30 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E8=A1=A8=E8=BE=BE=E5=BC=8F=20=20=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E9=82=AE=E4=BB=B6=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 6 +-- .../pojo/platform/bean/RefExpressionTrigger.java | 53 ++++++++++++++++++++++ .../estsh/i3plus/pojo/platform/bean/TaskTime.java | 46 ++++++++++--------- .../repository/RefExpressionTriggerRepository.java | 14 ++++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 +- 5 files changed, 96 insertions(+), 25 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefExpressionTrigger.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefExpressionTriggerRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 174f829..941a2d4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -87,9 +87,9 @@ public class ImppEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TASK_METHOD_TYPE{ - TYPE_GROUP(1,"类方法","Java Class 方法"), - TYPE_COMPANY(2,"链接","Http URL"), - TYPE_FACTORY(3,"权限CODE","权限CODE"); + TYPE_GROUP(1,"类方法","Java Class 方法"); +// TYPE_COMPANY(2,"链接","Http URL"), +// TYPE_FACTORY(3,"权限CODE","权限CODE"); private int value; private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefExpressionTrigger.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefExpressionTrigger.java new file mode 100644 index 0000000..bf474b6 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefExpressionTrigger.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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 : 关系-表达式与触发器 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-14 13:28 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="REF_EXPRESSION_TRIGGER") +@Api(value="关系-表达式与触发器",description = "关系-表达式与触发器") +public class RefExpressionTrigger extends BaseBean { + + @Column(name="EXPRESSION_ID") + @ApiParam(value ="表达式_ID" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long expressionId; + + public Long getExpressionId() { + if(expressionId != null) { + return expressionId.longValue(); + }else{ + return expressionId; + } + } + + @Column(name="TRIGGER_NAME") + @ApiParam(value ="触发器名称") + private String triggerName; + + @Column(name="TRIGGER_GROUP_NAME") + @ApiParam(value ="触发器名称") + private String triggerGroupName; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java index 74e7961..2d8ac8c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java @@ -39,34 +39,26 @@ public class TaskTime extends BaseBean { @ApiParam(value ="名称") private String groupName; - @Column(name="TIME_ID") + @Column(name="TIME_EXPRESSION_ID") @ApiParam(value ="时间表达式ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long timeId; + private Long timeExpressionId; - public Long getTimeId() { - if(timeId != null) { - return timeId.longValue(); + public Long getTimeExpressionId() { + if(timeExpressionId != null) { + return timeExpressionId.longValue(); }else{ - return timeId; + return timeExpressionId; } } @Column(name="RED_TIME_NAME") @ApiParam(value ="时间表达式名称") - private String redTimeName; + private String timeExpressionNameRdd; - @Column(name="RED_TIME_EXPRESSION") + @Column(name="TIME_EXPRESSION_CONTENT_RDD") @ApiParam(value ="时间表达式") - private String redTimeExpression; - - @Column(name="TASK_START_DATE_TIME") - @ApiParam(value ="任务开始时间") - private String taskStartDateTime; - - @Column(name="TASK_END_DATE_TIME") - @ApiParam(value ="任务结束时间") - private String taskEndDateTime; + private String timeExpressionContentRdd; @Column(name="TASK_NUM_SUM") @ApiParam(value ="执行总次数" , example ="0") @@ -80,14 +72,26 @@ public class TaskTime extends BaseBean { @ApiParam(value ="任务类型（枚举：1.定时任务）" , example ="-1") private Integer taskTypeId; - @Column(name="TASK_METHOD") - @ApiParam(value ="执行方法") - private String taskMethod; - @Column(name="TASK_METHOD_TYPE_ID") @ApiParam(value ="任务执行类型" ,example = "-1") private Integer taskMethodTypeId; + @Column(name="TASK_PACKAGE") + @ApiParam(value ="任务包名") + private String taskPackage; + + @Column(name="TASK_CLASS") + @ApiParam(value ="任务类名") + private String taskClass; + + @Column(name="TASK_START_DATE_TIME_RDD") + @ApiParam(value ="任务开始时间") + private String taskStartDateTimeRdd; + + @Column(name="TASK_END_DATE_TIME_RDD") + @ApiParam(value ="任务结束时间") + private String taskEndDateTimeRdd; + @Column(name="TASK_DESCRIPTION") @ApiParam(value ="任务描述" , access ="任务描述") private String taskDescription; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefExpressionTriggerRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefExpressionTriggerRepository.java new file mode 100644 index 0000000..d16dac6 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefExpressionTriggerRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.RefExpressionTrigger; + +/** + * @Description : 关系-表达式与触发器 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-14 13:36 + * @Modify: + **/ +public interface RefExpressionTriggerRepository extends BaseRepository { +} 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 7b51eb8..94a70b7 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 @@ -280,7 +280,7 @@ public class CoreHqlPack { // hql拼接 HqlPack.getStringLikerPack(taskTime.getName(),"name",result); HqlPack.getNumEqualPack(taskTime.getTaskStatus(),"taskStatus",result); - HqlPack.getNumEqualPack(taskTime.getTimeId(),"timeId",result); + HqlPack.getNumEqualPack(taskTime.getTimeExpressionId(),"timeExpressionId",result); return result.toString(); } From f07489d04d1145ff1d8217495e45fa01e7a1b42a Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Thu, 15 Nov 2018 11:33:33 +0800 Subject: [PATCH 4/6] =?UTF-8?q?eureka=E3=80=81feign=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/bean/BaseResultBean.java | 96 ++++++++++++++++ .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 6 +- .../estsh/i3plus/pojo/platform/bean/TaskTime.java | 123 +++++++++++++++++++++ 3 files changed, 222 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java new file mode 100644 index 0000000..f829a0f --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java @@ -0,0 +1,96 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.ApiParam; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 基本返回结果 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-11-14 15:58 + * @Modify: + **/ +public class BaseResultBean { + + @ApiParam("是否成功") + public boolean success; + + @ApiParam("信息代码-国际化") + public String code; + + @ApiParam("操作消息") + public String msg; + + @ApiParam("错误消息") + public String errorMsg; + + @ApiParam("http路径") + public String url; + + @ApiParam("List结果集") + public List resultList; + + @ApiParam("单个结果") + public Obj resultObject; + + @ApiParam("翻页和结果集") + public ListPager listPager; + + @ApiParam("Map结果集") + public Map resultMap; + + @ApiParam("翻页操作") + public Pager pager; + + @ApiParam("总记录数") + public int totalCount; + + public boolean isSuccess() { + return success; + } + + public String getCode() { + return code; + } + + public String getMsg() { + return msg; + } + + public String getErrorMsg() { + return errorMsg; + } + + public String getUrl() { + return url; + } + + public List getResultList() { + return resultList; + } + + public Obj getResultObject() { + return resultObject; + } + + public ListPager getListPager() { + return listPager; + } + + public Map getResultMap() { + return resultMap; + } + + public Pager getPager() { + return pager; + } + + public int getTotalCount() { + return totalCount; + } +} 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 768dd80..b6cf555 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 @@ -19,9 +19,9 @@ public class CommonEnumUtil { IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件"), CENTER(99,"CENTER","注册服务中心"); - private int value; - private String code; - private String description; + public int value; + public String code; + public String description; private SOFT_TYPE(int value, String code, String description) { this.value = value; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java index 2d8ac8c..e5dbce2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java @@ -104,4 +104,127 @@ public class TaskTime extends BaseBean { @ApiParam(value ="最后运行时间" , access ="最后运行时间") private String lastRunDateTime; + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public void setTimeExpressionId(Long timeExpressionId) { + this.timeExpressionId = timeExpressionId; + } + + public String getTimeExpressionNameRdd() { + return timeExpressionNameRdd; + } + + public void setTimeExpressionNameRdd(String timeExpressionNameRdd) { + this.timeExpressionNameRdd = timeExpressionNameRdd; + } + + public String getTimeExpressionContentRdd() { + return timeExpressionContentRdd; + } + + public void setTimeExpressionContentRdd(String timeExpressionContentRdd) { + this.timeExpressionContentRdd = timeExpressionContentRdd; + } + + public Integer getTaskNumSum() { + return taskNumSum; + } + + public void setTaskNumSum(Integer taskNumSum) { + this.taskNumSum = taskNumSum; + } + + public Integer getTaskNumRun() { + return taskNumRun; + } + + public void setTaskNumRun(Integer taskNumRun) { + this.taskNumRun = taskNumRun; + } + + public Integer getTaskTypeId() { + return taskTypeId; + } + + public void setTaskTypeId(Integer taskTypeId) { + this.taskTypeId = taskTypeId; + } + + public Integer getTaskMethodTypeId() { + return taskMethodTypeId; + } + + public void setTaskMethodTypeId(Integer taskMethodTypeId) { + this.taskMethodTypeId = taskMethodTypeId; + } + + public String getTaskPackage() { + return taskPackage; + } + + public void setTaskPackage(String taskPackage) { + this.taskPackage = taskPackage; + } + + public String getTaskClass() { + return taskClass; + } + + public void setTaskClass(String taskClass) { + this.taskClass = taskClass; + } + + public String getTaskStartDateTimeRdd() { + return taskStartDateTimeRdd; + } + + public void setTaskStartDateTimeRdd(String taskStartDateTimeRdd) { + this.taskStartDateTimeRdd = taskStartDateTimeRdd; + } + + public String getTaskEndDateTimeRdd() { + return taskEndDateTimeRdd; + } + + public void setTaskEndDateTimeRdd(String taskEndDateTimeRdd) { + this.taskEndDateTimeRdd = taskEndDateTimeRdd; + } + + public String getTaskDescription() { + return taskDescription; + } + + public void setTaskDescription(String taskDescription) { + this.taskDescription = taskDescription; + } + + public Integer getTaskStatus() { + return taskStatus; + } + + public void setTaskStatus(Integer taskStatus) { + this.taskStatus = taskStatus; + } + + public String getLastRunDateTime() { + return lastRunDateTime; + } + + public void setLastRunDateTime(String lastRunDateTime) { + this.lastRunDateTime = lastRunDateTime; + } } From d4f6f639d5c5f6babbc4f2bf67492caa90ba1d7e Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Thu, 15 Nov 2018 11:57:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?eureka=E3=80=81feign=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/TaskTime.java | 124 --------------------- 1 file changed, 124 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java index e5dbce2..b771cdf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java @@ -103,128 +103,4 @@ public class TaskTime extends BaseBean { @Column(name="LAST_RUN_DATE_TIME") @ApiParam(value ="最后运行时间" , access ="最后运行时间") private String lastRunDateTime; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public void setTimeExpressionId(Long timeExpressionId) { - this.timeExpressionId = timeExpressionId; - } - - public String getTimeExpressionNameRdd() { - return timeExpressionNameRdd; - } - - public void setTimeExpressionNameRdd(String timeExpressionNameRdd) { - this.timeExpressionNameRdd = timeExpressionNameRdd; - } - - public String getTimeExpressionContentRdd() { - return timeExpressionContentRdd; - } - - public void setTimeExpressionContentRdd(String timeExpressionContentRdd) { - this.timeExpressionContentRdd = timeExpressionContentRdd; - } - - public Integer getTaskNumSum() { - return taskNumSum; - } - - public void setTaskNumSum(Integer taskNumSum) { - this.taskNumSum = taskNumSum; - } - - public Integer getTaskNumRun() { - return taskNumRun; - } - - public void setTaskNumRun(Integer taskNumRun) { - this.taskNumRun = taskNumRun; - } - - public Integer getTaskTypeId() { - return taskTypeId; - } - - public void setTaskTypeId(Integer taskTypeId) { - this.taskTypeId = taskTypeId; - } - - public Integer getTaskMethodTypeId() { - return taskMethodTypeId; - } - - public void setTaskMethodTypeId(Integer taskMethodTypeId) { - this.taskMethodTypeId = taskMethodTypeId; - } - - public String getTaskPackage() { - return taskPackage; - } - - public void setTaskPackage(String taskPackage) { - this.taskPackage = taskPackage; - } - - public String getTaskClass() { - return taskClass; - } - - public void setTaskClass(String taskClass) { - this.taskClass = taskClass; - } - - public String getTaskStartDateTimeRdd() { - return taskStartDateTimeRdd; - } - - public void setTaskStartDateTimeRdd(String taskStartDateTimeRdd) { - this.taskStartDateTimeRdd = taskStartDateTimeRdd; - } - - public String getTaskEndDateTimeRdd() { - return taskEndDateTimeRdd; - } - - public void setTaskEndDateTimeRdd(String taskEndDateTimeRdd) { - this.taskEndDateTimeRdd = taskEndDateTimeRdd; - } - - public String getTaskDescription() { - return taskDescription; - } - - public void setTaskDescription(String taskDescription) { - this.taskDescription = taskDescription; - } - - public Integer getTaskStatus() { - return taskStatus; - } - - public void setTaskStatus(Integer taskStatus) { - this.taskStatus = taskStatus; - } - - public String getLastRunDateTime() { - return lastRunDateTime; - } - - public void setLastRunDateTime(String lastRunDateTime) { - this.lastRunDateTime = lastRunDateTime; - } } From 3a34cfbd6b950ffec3770e23b5996d9c65a4e363 Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Thu, 15 Nov 2018 14:55:15 +0800 Subject: [PATCH 6/6] =?UTF-8?q?eureka=E3=80=81feign=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 b6cf555..dd86d12 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 @@ -16,8 +16,11 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SOFT_TYPE { - IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件"), - CENTER(99,"CENTER","注册服务中心"); + IMPP(1, "impp-platform", "IMPP平台"), + CORE(2, "i3core", "i3业务平台"), + WMS(3, "i3wms", "仓库管理软件"), + MES(4, "i3mes", "生产管理软件"), + CENTER(99,"regist-center","注册服务中心"); public int value; public String code;