From d1698aaa487f0a0cac5535413c8933ca9c36255c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 10 May 2022 23:20:25 +0800 Subject: [PATCH 1/2] andon --- .../pojo/andon/model/ExcelImportErrorModel.java | 35 +++++++++++++++++ .../pojo/andon/model/ExcelImportResultModel.java | 44 ++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportErrorModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportResultModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportErrorModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportErrorModel.java new file mode 100644 index 0000000..90b4974 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportErrorModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.andon.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/8/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("andon导入异常结果model") +public class ExcelImportErrorModel implements Serializable { + + @ApiParam("错误的行号") + private int rowNum; + + @ApiParam("错误数量") + private int errorNum; + + @ApiParam("错误列号") + private String cellNum; + + @ApiParam("错误描述") + private String errorInfo; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportResultModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportResultModel.java new file mode 100644 index 0000000..89e1642 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportResultModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author: wangjie + * @CreateDate: 2019/8/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("andon导入结果model") +public class ExcelImportResultModel implements Serializable { + + @ApiParam("结果") + private boolean result; + + @ApiParam("成功行数量") + private int successRowNum; + + @ApiParam("失败行数量") + private int failRowNum; + + @ApiParam("错误信息集合") + private List excelImportErrorModels; + + @ApiParam("错误的行号") + private String errorRows; + + @ApiParam("导入数据集合") + private List excelList; + + @ApiParam("导入进度") + private String importSpeed; + +} From a4314ba22e4159888bdeed83a06bf440a82fd28b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 11 May 2022 15:03:06 +0800 Subject: [PATCH 2/2] andon --- .../cn/estsh/i3plus/pojo/andon/bean/AndonFile.java | 55 ++++++++++++++++ .../pojo/andon/bean/AndonModuleExcelManage.java | 50 +++++++++++++++ .../i3plus/pojo/andon/model/AndonConfigModel.java | 68 ++++++++++++++++++++ .../andon/model/AndonModuleExcelManageModel.java | 73 ++++++++++++++++++++++ .../andon/repository/IAndonFileRepository.java | 16 +++++ .../IAndonModuleExcelManageRepository.java | 14 +++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 16 +++++ 7 files changed, 292 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonFile.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonModuleExcelManage.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonModuleExcelManageModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonFileRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonModuleExcelManageRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonFile.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonFile.java new file mode 100644 index 0000000..96c5a5e --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonFile.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.andon.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.*; +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/12/4 1:28 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "ANDON_FILE") +@Api("文件表") +public class AndonFile extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5743291150478737944L; + + @Column(name = "FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("文件URL") + private String fileUrl; + + @Column(name = "GROUP_NAME") + @ApiParam("组名") + private String groupName; + + @Column(name = "FILE_ORIGIN_NAME") + @ApiParam("文件原名") + private String fileOriginName; + + @Column(name = "FILE_SIZE") + @ApiParam("文件大小") + private String fileSize; + + @Column(name = "FILE_TYPE") + @ApiParam("文件类型名称") + private String fileType; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonModuleExcelManage.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonModuleExcelManage.java new file mode 100644 index 0000000..ef1c70b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonModuleExcelManage.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.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.*; +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "ANDON_MODULE_EXCEL_MANAGE", indexes = { + @Index(columnList = "MODULE_CODE"), + @Index(columnList = "MODULE_NAME") +}) +@Api("模块EXCEL管理表") +public class AndonModuleExcelManage extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4174331010179941394L; + + @Column(name = "MODULE_CODE") + @ApiParam("模块代码") + private String moduleCode; + + @Column(name = "MODULE_NAME") + @ApiParam("模块名称") + private String moduleName; + + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; + + @Transient + @ApiParam("文件URL") + private String fileUrl; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java new file mode 100644 index 0000000..39bbd60 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author wangjie + * @version 1.0 + * @date 2021/1/15 15:32 + **/ +@Data +@ApiModel("模块EXCEL管理") +public class AndonConfigModel implements Serializable { + + private static final long serialVersionUID = -3904799282814930138L; + + @ApiParam("id") + private String idStr; + + @ApiParam("id") + private Long id; + + @ApiParam(value ="名称") + private String name; + + @ApiParam(value ="参数代码") + private String configCode; + + @ApiParam(value ="参数描述") + private String configDescription; + + @ApiParam(value ="参数键") + private String configKey; + + @ApiParam(value ="参数键描述") + private String configKeyName; + + @ApiParam(value ="参数值类型") + private String configValueType; + + @ApiParam(value ="参数值类型描述") + private String configValueTypeName; + + @ApiParam(value ="参数值") + private String configValue; + + @ApiParam(value ="参数值描述") + private String configValueDesc; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("创建用户") + private String createUser; + + @ApiParam("创建日期") + private String createDatetime; + + @ApiParam("修改人") + private String modifyUser; + + @ApiParam("修改日期") + private String modifyDatetime; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonModuleExcelManageModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonModuleExcelManageModel.java new file mode 100644 index 0000000..7bf091d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonModuleExcelManageModel.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author wangjie + * @version 1.0 + * @date 2021/1/15 15:32 + **/ +@Data +@ApiModel("模块EXCEL管理") +public class AndonModuleExcelManageModel implements Serializable { + + private static final long serialVersionUID = 5632288300819137538L; + + @ApiParam("id") + private String idStr; + + @ApiParam("id") + private Long id; + + @ApiParam("模块代码") + private String moduleCode; + + @ApiParam("模块名称") + private String moduleName; + + @ApiParam("文件ID") + private Long fileId; + + @ApiParam("文件URL") + private String fileUrl; + + @ApiParam("文件原名") + private String fileOriginName; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("创建用户") + private String createUser; + + @ApiParam("创建日期") + private String createDatetime; + + @ApiParam("修改人") + private String modifyUser; + + @ApiParam("修改日期") + private String modifyDatetime; + + public AndonModuleExcelManageModel() { + } + + public AndonModuleExcelManageModel(Long id, String moduleCode, String moduleName, Long fileId, String fileUrl, String fileOriginName, + String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.moduleCode = moduleCode; + this.moduleName = moduleName; + this.fileId = fileId; + this.fileUrl = fileUrl; + this.fileOriginName = fileOriginName; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonFileRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonFileRepository.java new file mode 100644 index 0000000..6042562 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonFileRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonFile; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface IAndonFileRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonModuleExcelManageRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonModuleExcelManageRepository.java new file mode 100644 index 0000000..1cfc299 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonModuleExcelManageRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonModuleExcelManage; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @author wangjie + * @version 1.0 + * @date 2021/1/29 15:02 + **/ +@Repository +public interface IAndonModuleExcelManageRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 9162515..a898563 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -16,6 +16,13 @@ import org.springframework.util.StringUtils; **/ public class AndonHqlPack { + public static DdlPackBean getAllBaseData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + return packBean; + } + /** * 安灯通知方式查询封装 * @param andonCellGroupCfg @@ -1128,4 +1135,13 @@ public class AndonHqlPack { DdlPreparedPack.getStringLikerPack(record.getAndonOrderNo(), "andonOrderNo", packBean); return packBean; } + + public static DdlPackBean getConfig(AndonConfig config) { + DdlPackBean packBean = getAllBaseDataByNormalPro(config, config.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(config.getConfigCode(), "configCode", packBean); + DdlPreparedPack.getStringLikerPack(config.getName(), "name", packBean); + DdlPreparedPack.getStringEqualPack(config.getConfigKey(), "configKey", packBean); + DdlPreparedPack.getStringEqualPack(config.getConfigValueType(), "configValueType", packBean); + return packBean; + } }