diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml new file mode 100644 index 0000000..15ad445 --- /dev/null +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -0,0 +1,30 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-base-mongo + + + + org.springframework.boot + spring-boot-starter-data-mongodb + + + i3plus.pojo + i3plus-pojo-base + + + i3plus.pojo + i3plus-pojo-platform + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java similarity index 94% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java index 04c9a2d..a399769 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java +++ b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java @@ -2,13 +2,11 @@ package cn.estsh.i3plus.pojo.base.jpa.dao; import cn.estsh.i3plus.pojo.base.common.Pager; import org.bson.conversions.Bson; -import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.repository.NoRepositoryBean; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @Description : 自定义Repository的方法接口 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java similarity index 100% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java similarity index 100% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java similarity index 100% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java similarity index 100% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java similarity index 100% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java similarity index 100% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java similarity index 100% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index c6e3a32..36858cc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -10,12 +10,11 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; import org.hibernate.annotations.GenericGenerator; -import org.springframework.data.mongodb.core.index.IndexDirection; -import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.*; import java.io.Serializable; import java.util.LinkedHashMap; +import java.util.Map; /** * @Description : @@ -89,7 +88,6 @@ public abstract class BaseBean implements Serializable { searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") public String createUser; - @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) 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 1dba3c4..5e6fc6d 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 @@ -2606,4 +2606,53 @@ public class CommonEnumUtil { } } + /** + * 条码解析校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BARCODE_CHECK_MODE { + SEPARATOR_NUM(10, "分割数"), + ANALYTIC_NUM(20, "解析数"), + WEAK(30, "弱校验"); + + private int value; + private String description; + + BARCODE_CHECK_MODE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + + public static Integer descriptionOfValue(String desc) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java index a0b2a6a..3ec55dc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -50,4 +51,13 @@ public class SysBarcodeRule extends BaseBean { @ApiParam(value ="条码规则描述") private String barcodeRuleDescription; + @Column(name = "CHECK_MODE", columnDefinition = "default 1") + @ApiParam(value ="校验模式") + @AnnoOutputColumn(refClass = CommonEnumUtil.BARCODE_CHECK_MODE.class) + private Integer checkMode; + + public int getCheckModeVal() { + return checkMode == null ? CommonEnumUtil.BARCODE_CHECK_MODE.SEPARATOR_NUM.getValue() : checkMode; + } + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index d53eb6b..f45692e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -8,12 +8,6 @@ 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 org.springframework.data.mongodb.core.mapping.Document; - -import javax.persistence.Column; -import javax.persistence.Table; /** * @Description : @@ -23,115 +17,88 @@ import javax.persistence.Table; * @Modify: **/ @Data -@Document -@DynamicInsert -@DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_CONSOLE") @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogConsole extends BaseBean { private static final long serialVersionUID = -6073378683575266830L; /******** 服务器信息 ********/ - @Column(name="SOFT_TYPE") @ApiParam(value ="产品名称") private Integer softType; public String getSoftTypeTxt() { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Column(name="LOG_HOST") @ApiParam(value ="服务器IP") private String logHost; - @Column(name="LOG_PID") @ApiParam(value ="应用PID") @JsonSerialize(using = ToStringSerializer.class) private Long logPid; - @Column(name="LOG_PORT") @ApiParam(value ="应用端口") private Integer logPort; - @Column(name="LOG_GROUP") @ApiParam(value ="日志分组(日志记录器名称,getLogger方法的参数值)") private String logGroup; - @Column(name="LOG_LEVEL") @ApiParam(value ="日志等级(OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL)") private String logLevel; - @Column(name="LOG_TYPE") @ApiParam(value ="操作类型(post,put,get)") private String logType; /******** 用户信息 ********/ - @Column(name="USER_HOST") @ApiParam(value ="用户登录IP") private String userHost; - @Column(name="USER_BROWSER") @ApiParam(value ="用户登录浏览器") private String userBrowser; - @Column(name="USER_OS") @ApiParam(value ="用户登录操作系统") private String userOs; - @Column(name="USER_ID") @ApiParam(value ="账号ID") @JsonSerialize(using = ToStringSerializer.class) private Long userId; - @Column(name="USER_LOGIN_NAME") @ApiParam(value ="用户登录名称") private String userLoginName; /******** 日志信息 ********/ - @Column(name="REQUEST_ID") @ApiParam(value ="请求ID") @JsonSerialize(using = ToStringSerializer.class) private Long requestId; - @Column(name="EXECUTE_THREAD_ID") @ApiParam(value ="执行线程") private String executeThreadId; - @Column(name="EXECUTE_CLASS_NAME") @ApiParam(value ="执行Class") private String executeClassName; - @Column(name="EXECUTE_METHOD") @ApiParam(value ="执行方法") private String executeMethod; - @Column(name="EXECUTE_LINE_NUMBER") @ApiParam(value ="报错行数") private Integer executeLineNumber; - @Column(name="EXECUTE_TITLE") @ApiParam(value ="方法标题") private String executeTitle; - @Column(name="EXECUTE_ARGS") @ApiParam(value ="执行参数") private String executeArgs; - @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") private Integer executeTime; - @Column(name="EXECUTE_STATUS") @ApiParam(value ="执行状态") private String executeStatus; - @Column(name="EXECUTE_MESSAGE") @ApiParam(value ="执行日志信息") private String executeMessage; - @Column(name="ERROR_STACK_TRACE",length = 5000) @ApiParam(value ="执行异常堆栈信息") private String errorStackTrace; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index 90e1854..7b67f0d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -7,14 +7,8 @@ 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 org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; /** * @Description : 系统异常 @@ -24,18 +18,13 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Document -@DynamicInsert -@DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_EXCEPTION") @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogException extends BaseBean { private static final long serialVersionUID = -2844455884020022321L; //CommonEnumUtil.SOFT_TYPE - @Indexed - @Column(name="SOFT_TYPE") + @ApiParam(value ="系统模块(枚举)", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer softType; @@ -43,15 +32,12 @@ public class SysLogException extends BaseBean { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Column(name="EXC_CLASS_NAME") @ApiParam(value ="异常类名") private String excClassName; - @Column(name="EXC_MESSAGE") @ApiParam(value ="异常信息") private String excMessage; - @Column(name="EXC_STACK") @ApiParam(value ="堆栈信息") private String excStack; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index f14accf..3558410 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -12,11 +12,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; -import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.Table; /** @@ -27,7 +23,6 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) @@ -36,8 +31,6 @@ import javax.persistence.Table; public class SysLogOperate extends BaseBean { private static final long serialVersionUID = 1515035521283176727L; - @Indexed - @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块(枚举)", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer softType; @@ -45,8 +38,6 @@ public class SysLogOperate extends BaseBean { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Indexed - @Column(name="OPERATE_TYPE") @ApiParam(value ="操作类型" , example = "-1") @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") private Integer operateType; @@ -55,19 +46,15 @@ public class SysLogOperate extends BaseBean { return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType); } - @Column(name="OPERATE_MESSAGE") @ApiParam(value ="操作信息" , access ="操作信息") private String operateMessage; - @Column(name="USER_LOGIN_NAME") @ApiParam(value ="登录用户名称" , access ="登录用户名称") private String userLoginName; - @Column(name="REMOTE_IP") @ApiParam(value ="请求IP" , access ="请求IP") private String remoteIp; - @Column(name="REQUEST_URL") @ApiParam(value ="请求路径" , access ="请求路径") private String requestUrl; @@ -75,11 +62,9 @@ public class SysLogOperate extends BaseBean { // @ApiParam(value ="http请求方法" , access ="http请求方法") // private String httpMethod; - @Column(name="LOG_ARGS") @ApiParam(value ="方法入参" , access ="方法入参") private String logArgs; - @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index c45cd05..789e923 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -10,14 +10,8 @@ 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 org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; /** * @Description : 系统日志表 @@ -27,17 +21,11 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Document -@DynamicInsert -@DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_SYSTEM") @Api(value="系统日志表",description = "系统日志表") public class SysLogSystem extends BaseBean { private static final long serialVersionUID = -2209777442410263684L; - @Indexed - @Column(name="LOG_LEVEL") @ApiParam(value ="日志级别" , example ="1") @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name") private Integer logLevel; @@ -45,8 +33,6 @@ public class SysLogSystem extends BaseBean { return logLevel == null ? null : ImppEnumUtil.LOG_LEVEL.valueOfDescription(logLevel); } - @Indexed - @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块(枚举)", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer softType; @@ -54,8 +40,6 @@ public class SysLogSystem extends BaseBean { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Indexed - @Column(name="LOG_MODULE_ID") @ApiParam(value ="系统模块(枚举)", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer logModuleId; @@ -63,48 +47,37 @@ public class SysLogSystem extends BaseBean { return logModuleId == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(logModuleId); } - @Column(name="REMOTE_IP") @ApiParam(value ="请求IP" , access ="请求IP") private String remoteIp; - @Column(name="REQUEST_URL") @ApiParam(value ="请求路径" , access ="请求路径") private String requestUrl; - @Column(name="HTTP_METHOD") @ApiParam(value ="http请求方法" , access ="http请求方法") private String httpMethod; - @Column(name="LOG_CLASS") @ApiParam(value ="触发类路径" , access ="触发类路径") private String logClass; - @Column(name="LOG_METHOD") @ApiParam(value ="触发方法" , access ="触发方法") private String logMethod; - @Column(name="ARGS_COUNT") @ApiParam(value ="入参数量" , access ="入参数量", example = "0") private Integer argsCount; - @Column(name="LOG_ARGS") @ApiParam(value ="方法入参" , access ="方法入参") private String logArgs; - @Column(name="LOG_TITLE") @ApiParam(value ="日志标题") private String logTitle; - @Column(name="LOG_DETAIL") @ApiParam(value ="日志详情") private String logDetail; - @Column(name="SERVER_HOST") @ApiParam(value ="服务器") private String serverHost; - @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 1294aa0..f94befb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -11,11 +11,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Table; /** * @Description : 定时任务执行记录 @@ -25,67 +22,52 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_TASK_TIME") @Api(value="定时任务执行日志",description = "定时任务执行记录") public class SysLogTaskTime extends BaseBean { private static final long serialVersionUID = -841008177433745529L; - @Column(name="SCHEDULER_INSTANCE_ID") @ApiParam(value ="调度器实例id") private String schedulerInstanceId; - @Column(name="SCHEDULER_SERVER_IP") @ApiParam(value ="调度服务器ip") private String schedulerServerIp; - @Column(name="SCHEDULER_SERVER_PORT") @ApiParam(value ="调度服务器端口") private Integer schedulerServerPort; - @Column(name="TASK_THREAD_ID") @ApiParam(value ="任务线程id") @JsonSerialize(using = ToStringSerializer.class) private Long taskThreadId; - @Column(name="NAME") @ApiParam(value ="任务名称") private String name; - @Column(name="GROUP_NAME") @ApiParam(value ="任务组名称") private String groupName; - @Column(name="TASK_PLAN_ID") @ApiParam(value ="任务计划id" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long taskPlanId; - @Column(name="SOFT_TYPE") @ApiParam(value ="产品名称") private Integer softType; public String getSoftTypeTxt() { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Column(name="TASK_CYCLE_NAME_RDD") @ApiParam(value ="任务周期名称") private String taskCycleNameRdd; - @Column(name="TASK_CYCLE_EXPS_RDD") @ApiParam(value ="任务周期表达式") private String taskCycleExpsRdd; - @Indexed - @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; - @Column(name="TASK_STATUS") @ApiParam(value ="任务完成情况(枚举:1正常,2失败)") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer taskStatus; @@ -94,7 +76,6 @@ public class SysLogTaskTime extends BaseBean { return taskStatus == null ? CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() : taskStatus; } - @Column(name="TASK_LOG_ERROR") @ApiParam(value ="任务异常日志") private String taskLogError; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/LpsStockQuanModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/LpsStockQuanModel.java new file mode 100644 index 0000000..ed9db98 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/LpsStockQuanModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** +* @Description : LPS库存 +* @Reference : +* @author: jessica.chen +* @date: 2019/12/10 17:10 +* @Modify: +*/ + +@Data +@Api(value="LPS库存模板",description = "LPS库存模板") +public class LpsStockQuanModel extends BaseBean { + + private static final long serialVersionUID = 2167743108452607913L; + + //源存储区 + @ApiParam(value = "FromLocation") + @AnnoOutputColumn + private String srcZoneNo; + + //目标库位 + @ApiParam(value = "ToBIn") + @AnnoOutputColumn + private String locateNo; + + //零件号 + @ApiParam(value = "Item") + @AnnoOutputColumn + private String partNo; + + @ApiParam(value = "Qty") + @AnnoOutputColumn + private String qty; + + @ApiParam(value = "下标值") + @AnnoOutputColumn(required = false) + private Integer index; +} diff --git a/pom.xml b/pom.xml index cc8fce6..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ modules/i3plus-pojo-ptl modules/i3plus-pojo-ics modules/i3plus-pojo-mdm + modules/i3plus-pojo-base-mongo @@ -50,11 +51,6 @@ - - org.springframework.boot - spring-boot-starter-data-mongodb - - io.springfox