diff --git a/.gitignore b/.gitignore index 6614dc3..6b4d809 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,9 @@ target *.log *.properties .DS_Store -pom.xml \ No newline at end of file +target/ +.settings +.classpath +.project +.vscode +pom.xml diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index e7c518c..f14ae37 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -236,7 +236,8 @@ public class BlockSoftSwitchEnumUtil { REST(6,"REST调用"), WEB_SERVICE(7,"WebService"), SOCKET(8,"socket"), - RETRY(9,"重试"); + RETRY(9,"重试"), + TEST(10,"手动测试"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRetryModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRetryModel.java new file mode 100644 index 0000000..48ea646 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRetryModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + + +/** + * @author ns + * @create 2021/12/22 0022 下午 13:39 + */ +@Data +@ApiModel("重试类型model") +public class SuitRetryModel { + @ApiParam(value = "适配器代码") + private String suitCaseCode; + + @ApiParam(value = "适配记录id") + private Long bsSuitRecordId; + + @ApiParam(value = "适配器") + private BsSuitCase bsSuitCase; +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index c15f159..6e56daa 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -266,6 +266,14 @@ public class BsSuitCase extends BaseBean { return retryInterval == null ? 10: retryInterval; } + @Column(name = "RETRY_TIME") + @ApiParam(value = "重试次数（s）") + private Integer retryTime; + + public int getRetryTimeVal() { + return (retryTime == null || retryTime < 0) ? 1 : retryTime; + } + @Transient @ApiParam(value = "适配器套件明细") private Object bsSuitCaseDetail; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseType.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseType.java index ce0efa9..ac42c49 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseType.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseType.java @@ -34,7 +34,7 @@ public class BsSuitCaseType extends BaseBean { @Column(name = "SUIT_CASE_TYPE_ID") @ApiParam(value = "适配器类型id") @JsonSerialize(using = ToStringSerializer.class) - private Long suitCaseTypeId; + private Integer suitCaseTypeId; @Column(name = "SUIT_CASE_TYPE_NAME") @ApiParam(value = "适配器类型名称") @@ -48,6 +48,9 @@ public class BsSuitCaseType extends BaseBean { @ApiParam(value = "适配器适配失败报警邮箱") private String suitCaseTypeAlarmEmail; + @Column(name = "ENABLE_ALARM_EMAIL") + @ApiParam(value = "是否开启适配报警邮箱发送") + private Integer enableAlarmEmail; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index e3d1182..e2c7442 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -129,6 +129,12 @@ public class WmsCSFactTrans extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String packageNo; + + @Column(name = "CT_NO") + @ApiParam(value = "托盘") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String ctNo; + @Transient @AnnoOutputColumn(hidden = true) @ApiParam(value = "实盘箱数", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthQueryRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthQueryRecord.java new file mode 100644 index 0000000..ec6c23d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthQueryRecord.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @Description : 指标编号查询记录 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 13:54 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_HEALTH_QUERY_RECORD", indexes = { + @Index(columnList = "INDICATOR_CODE"), + @Index(columnList = "QUERY_SOURCE") +}) +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Api(value="仓库健康度指标编号查询记录",description = "仓库健康度指标编号查询记录") +public class WmsHealthQueryRecord extends BaseBean { + + private static final long serialVersionUID = 7332606119041273554L; + + @Column(name = "INDICATOR_CODE") + @ApiParam(value = "指标代码") + private String indicatorCode; + + @Column(name = "INDICATOR_VALUE") + @ApiParam(value = "指标结果") + private String indicatorValue; + + @Column(name = "QUERY_TIME",length = 13) + @ApiParam(value = "查询时间") + private Long queryTime; + +// @Column(name = "QUERY_TIME",length = 13) +// @ApiParam(value = "查询来源【第三方标签】") +// private String querySource; +// + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsHealthQueryResultDTO.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsHealthQueryResultDTO.java new file mode 100644 index 0000000..8539b48 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsHealthQueryResultDTO.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import java.io.Serializable; + +import lombok.Data; + +@Data +public class WmsHealthQueryResultDTO implements Serializable{ + + private static final long serialVersionUID = 3662345968978175458L; + + private String code; + + private String value; + + private Long time; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthQueryRecordRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthQueryRecordRepository.java new file mode 100644 index 0000000..660b2ed --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthQueryRecordRepository.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import java.util.List; + +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsHealthQueryRecord; + +@Repository +public interface WmsHealthQueryRecordRepository extends BaseRepository { + + @Query("from WmsHealthQueryRecord where indicator_code = :indicatorCode and query_time >= :queryTime") + List queryByCodeAndTime(String indicatorCode, Long queryTime); + + @Query("from WmsHealthQueryRecord where indicator_code = :indicatorCode and query_time between :startTime and :endTime") + List queryByCodeBetweenTime(String indicatorCode, Long startTime, Long endTime); + +}