I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

Browse Source
yun-zuoyi
amy 7 years ago
parent 88429e342e 3a34cfbd6b
commit c82ba74e9e
8 changed files with 213 additions and 34 deletions
Show Stats Download Patch File Download Diff File

96
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java
Unescape Escape View File

@ -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<Obj> {
@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<Obj> resultList;
@ApiParam("单个结果")
public Obj resultObject;
@ApiParam("翻页和结果集")
public ListPager<Obj> listPager;
@ApiParam("Map结果集")
public Map<String, Object> 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<Obj> getResultList() {
return resultList;
}
public Obj getResultObject() {
return resultObject;
}
public ListPager<Obj> getListPager() {
return listPager;
}
public Map<String, Object> getResultMap() {
return resultMap;
}
public Pager getPager() {
return pager;
}
public int getTotalCount() {
return totalCount;
}
}

15
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
Unescape Escape View File

@ -16,12 +16,15 @@ 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","注册服务中心");
private int value;
private String code;
private String description;
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;
public String description;
private SOFT_TYPE(int value, String code, String description) {
this.value = value;

6
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
Unescape Escape View File

@ -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;

53
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefExpressionTrigger.java
Unescape Escape View File

@ -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;
}

47
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java
Unescape Escape View File

@ -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;
@ -99,5 +103,4 @@ public class TaskTime extends BaseBean {
@Column(name="LAST_RUN_DATE_TIME")
@ApiParam(value ="最后运行时间" , access ="最后运行时间")
private String lastRunDateTime;
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefExpressionTriggerRepository.java
Unescape Escape View File

@ -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<RefExpressionTrigger, Long> {
}

2
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -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();
}

14
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -169,7 +169,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);
@ -194,6 +193,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();
}
@ -212,6 +213,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();
}
@ -232,6 +235,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();
}
@ -316,7 +321,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();
}
@ -333,6 +340,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();
}

Write Preview
Loading…
Cancel
Save