From 9189ca1bbdb18b0a42ed493e9a33b066dd195ebb Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 14 Nov 2018 19:47:51 +0800 Subject: [PATCH 1/2] =?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 f07489d04d1145ff1d8217495e45fa01e7a1b42a Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Thu, 15 Nov 2018 11:33:33 +0800 Subject: [PATCH 2/2] =?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; + } }