From 7479104bb9ee7d119dde645ef45da76f6a2da71e Mon Sep 17 00:00:00 2001 From: Administrator <962239776@qq.com> Date: Fri, 2 Nov 2018 09:30:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=A9=B1=E5=8A=A8=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/InterfaceDevice.java | 12 ++--- .../estsh/i3plus/pojo/wms/bean/InterfaceType.java | 52 +++++++++++++++------- .../wms/repository/InterfaceDeviceRepository.java | 16 +++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 ++++++ 4 files changed, 71 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java index 3ee748c..d3dc77f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java @@ -26,16 +26,16 @@ import javax.persistence.Table; @Api("接口驱动类信息") public class InterfaceDevice extends BaseBean { - @Column(name="DEVICE_NAME") + @Column(name="device_name") @ApiParam("驱动名称") private String deviceName; - @Column(name="DEVICE_CLASSNAME") + @Column(name="device_classname") @ApiParam("驱动类名称") - private String deviceClassname; + private String deviceClassName; - @Column(name="STATUS") - @ApiParam("状态") - private String status; + @Column(name="status") + @ApiParam("状态 【0-禁用 1-正常】") + private Integer status; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java index eecb4f2..39d7dd6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.wms.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; @@ -23,58 +26,75 @@ import javax.persistence.Table; @DynamicUpdate @Table(name="T_INTERFACE_TYPE") @Api("接口类型信息") -public class InterfaceType { +public class InterfaceType extends BaseBean { - @Column(name="TP_ID") + @Column(name="tp_id") @ApiParam("接口编号") - private String tpId; + @JsonSerialize(using = ToStringSerializer.class) + private Long tpId; - @Column(name="TP_TYP") + @Column(name="tp_typ") @ApiParam("接口类型") private String tpTyp; - @Column(name="PB_NO") + @Column(name="pb_no") @ApiParam("发布方编码") private String pbNo; - @Column(name="TP_NO") + @Column(name="tp_no") @ApiParam("接口编码") private String tpNo; - @Column(name="TP_DESC") + @Column(name="tp_desc") @ApiParam("接口主题描述") private String tpDesc; - @Column(name="MES_TAB") + @Column(name="mes_tab") @ApiParam("接口业务表") private String mesTab; - @Column(name="MES_GROUP") + @Column(name="mes_group") @ApiParam("业务表的分组条件") private String mesGroup; - @Column(name="MES_PK") + @Column(name="mes_pk") @ApiParam("业务表主键") private String mesPk; - @Column(name="ACT_TYPE") + @Column(name="act_type") @ApiParam("业务类型") private Integer actType; - @Column(name="ACT_DESC") + @Column(name="act_desc") @ApiParam("业务描述") private String actDesc; - @Column(name="DEVICE_ID") + @Column(name="device_id") @ApiParam("驱动类编号") - private String deviceId; + @JsonSerialize(using = ToStringSerializer.class) + private Long deviceId; - @Column(name="REQUEST_URL") + @Column(name="request_url") @ApiParam("服务器请求路径") private String requestUrl; - @Column(name="CFILE_PATH") + @Column(name="cfile_path") @ApiParam("客户文件路径") private String cfilePath; + public Long getTpId() { + if(tpId != null) { + return tpId.longValue(); + }else{ + return tpId; + } + } + + public Long getDeviceId() { + if(deviceId != null) { + return deviceId.longValue(); + }else{ + return deviceId; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java new file mode 100644 index 0000000..62a206c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-01 15:13 + * @Modify: + **/ +@Repository +public interface InterfaceDeviceRepository extends BaseRepository { +} 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 863f641..3bc083a 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,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; import cn.estsh.i3plus.pojo.wms.bean.WareHouse; /** @@ -27,4 +28,16 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 接口驱动类信息 分页查询 + * @return + */ + public static String packHqlInterfaceDevice(InterfaceDevice interfaceDevice){ + StringBuffer sb = new StringBuffer(); + //驱动类名称 + HqlPack.getStringEqualPack(interfaceDevice.getDeviceClassName(),"deviceClassName",sb); + + return null; + } }