diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 60a7aab..a5b5ece 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -13,6 +13,44 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + + /** + * MesIf 交互方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IF_CONNECT_TYPE { + + DB("10", "DB"), + WEBSERVICE("20", "webservice "), + RESTFUL("30", "restful"); + + private String value; + private String description; + + IF_CONNECT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * Mes 工厂初始化数据 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java new file mode 100644 index 0000000..bbd7782 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java @@ -0,0 +1,38 @@ +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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION_IF") +@Api("动作接口配置") +public class MesActionIf extends BaseBean { + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java new file mode 100644 index 0000000..1845202 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java @@ -0,0 +1,46 @@ +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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:43 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_IF") +@Api("接口清单") +public class MesIf extends BaseBean { + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Column(name = "IF_NAME") + @ApiParam("接口名称") + private String ifName; + + @Column(name = "IF_CONNECT_TYPE") + @ApiParam("交互方式") + private String ifConnectType; + + @Column(name = "IF_CLASS") + @ApiParam("接口实现类") + private String ifClass; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java new file mode 100644 index 0000000..d140412 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java @@ -0,0 +1,46 @@ +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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:40 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_KEY_ACTION") +@Api("关键动作") +public class MesKeyAction extends BaseBean { + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "ACTION_NAME") + @ApiParam("动作名称") + private String actionName; + + @Column(name = "ACTION_DESC") + @ApiParam("动作描述") + private String actionDesc; + + @Column(name = "ACTION_CLASS") + @ApiParam("动作关联类") + private String actionClass; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionIfRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionIfRepository.java new file mode 100644 index 0000000..a12d42e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionIfRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesActionIf; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesActionIfRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesIfRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesIfRepository.java new file mode 100644 index 0000000..89b9220 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesIfRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesIf; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:51 + * @Modify: + **/ +public interface MesIfRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyActionRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyActionRepository.java new file mode 100644 index 0000000..ee0a07e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyActionRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesKeyAction; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:50 + * @Modify: + **/ +public interface MesKeyActionRepository 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 5be1786..d3489e6 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 @@ -1743,4 +1743,84 @@ public class MesHqlPack { "createDatetime", packBean, true); return packBean; } + + /** + * 模板配置 + * @param mesLabelTemplate + * @param organizeCode + * @return + */ + public static DdlPackBean getMesLabelTemplate(MesLabelTemplate mesLabelTemplate, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesLabelTemplate, organizeCode); + if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateCode())) { + DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); + } + if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) { + DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "codeType", packBean); + } + return packBean; + } + + /** + * 关键动作 + * @param mesKeyAction + * @param organizeCode + * @return + */ + public static DdlPackBean getMesKeyAction(MesKeyAction mesKeyAction, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesKeyAction, organizeCode); + if (!StringUtils.isEmpty(mesKeyAction.getActionCode())) { + DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionCode(), "actionCode", packBean); + } + if (!StringUtils.isEmpty(mesKeyAction.getActionName())) { + DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionName(), "actionName", packBean); + } + if (!StringUtils.isEmpty(mesKeyAction.getActionDesc())) { + DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionDesc(), "actionDesc", packBean); + } + if (!StringUtils.isEmpty(mesKeyAction.getActionClass())) { + DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionClass(), "actionClass", packBean); + } + return packBean; + } + + /** + * 动作接口配置 + * @param mesActionIf + * @param organizeCode + * @return + */ + public static DdlPackBean getMesActionIf(MesActionIf mesActionIf, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesActionIf, organizeCode); + if (!StringUtils.isEmpty(mesActionIf.getActionCode())) { + DdlPreparedPack.getStringLikerPack(mesActionIf.getActionCode(), "actionCode", packBean); + } + if (!StringUtils.isEmpty(mesActionIf.getIfCode())) { + DdlPreparedPack.getStringLikerPack(mesActionIf.getIfCode(), "ifCode", packBean); + } + return packBean; + } + + /** + * 接口清单 + * @param mesIf + * @param organizeCode + * @return + */ + public static DdlPackBean getMesIf(MesIf mesIf, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesIf, organizeCode); + if (!StringUtils.isEmpty(mesIf.getIfCode())) { + DdlPreparedPack.getStringLikerPack(mesIf.getIfCode(), "ifCode", packBean); + } + if (!StringUtils.isEmpty(mesIf.getIfName())) { + DdlPreparedPack.getStringLikerPack(mesIf.getIfName(), "ifName", packBean); + } + if (!StringUtils.isEmpty(mesIf.getIfConnectType())) { + DdlPreparedPack.getStringLikerPack(mesIf.getIfConnectType(), "ifConnectType", packBean); + } + if (!StringUtils.isEmpty(mesIf.getIfClass())) { + DdlPreparedPack.getStringLikerPack(mesIf.getIfClass(), "ifClass", packBean); + } + return packBean; + } }