errorMsg = new ArrayList<>();
- for (FieldError fieldError : fieldErrors) {
- String errMessage = fieldError.getDefaultMessage().subSequence(1,fieldError.getDefaultMessage().length()-1).toString();
- errorMsg.add(messageSource().getMessage(errMessage,null,locale));
- }
- return outputEncapsulationObject(PromptMessageEnum.PARAM_ILLEGAL,errorMsg,locale);
- }
-}
diff --git a/src/main/java/com/xkrs/encapsulation/PromptMessageEnum.java b/src/main/java/com/xkrs/encapsulation/PromptMessageEnum.java
deleted file mode 100644
index 79275a4..0000000
--- a/src/main/java/com/xkrs/encapsulation/PromptMessageEnum.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.xkrs.encapsulation;
-
-/**
- * 提示信息枚举
- * @author tajochen
- */
-public enum PromptMessageEnum{
-
- // 执行成功
- SUCCESS(0, "sys.message.success"),
-
-
- // 用户权限错误或非法操作： 1001-1999
- USER_NOT_LOGGED(1001, "sys.message.user.not_logged_in"),
- USER_LOGIN_ERROR(1002, "sys.message.user.login_error"),
- USER_ACCOUNT_FORBIDDEN(1003, "sys.message.user.account_forbidden"),
- USER_ACCOUNT_NOT_ACTIVATED(1004, "sys.message.user.account_not_activated"),
- USER_HAS_OVERTIME(1005, "sys.message.user.overtime"),
- USER_NO_PERMISSION(1006,"sys.message.user.no_permission"),
- USER_ALREADY_LOGGED(1007, "sys.message.user.already_logged"),
-
- // 请求参数错误或非法：2001-2999
- PARAM_NULL(2001, "sys.message.param.null"),
- PARAM_ILLEGAL(2002, "sys.message.param.illegal"),
-
- // 数据返回错误：3001-3999
- DATA_NONE(3001, "sys.message.data.none"),
-
- DATA_WRONG(3002, "sys.message.data.wrong"),
- DATA_EXIT(3003,"sys.message.exit"),
-
- // 操作失败：4001-4999
- PROCESS_FAIL(4001,"sys.message.process.fail"),
- PROCESS_OVERTIME(4002,"sys.message.process.overtime"),
- FILE_EXISTS(4003,"sys.message.file.exists"),
- FILE_WRITE_ERROR(4004,"sys.message.file.write.error"),
- FILE_READ_ERROR(4005,"sys.message.file.read.error"),
-
- // 系统内部错误或异常：5001-5999
- SYSTEM_INNER_ERROR(5001,"sys.message.system.inner_error"),
- SYSTEM_ABNORMAL(5002,"sys.message.system.abnormal"),
- SYSTEM_BUSY(5003,"sys.message.system.busy"),
- SYSTEM_MAINTAIN(5004,"sys.message.system.maintain"),
-
- // 数据库错误：6001-6999
- DATABASE_ERROR(6001,"sys.message.database.error");
-
- private int code;
-
- private String text;
-
- private PromptMessageEnum(int code,String text) {
- this.code = code;
- this.text = text;
- }
-
- public String getText() {
- return this.text;
- }
-
- public int getCode() {
- return this.code;
- }
-
-}
diff --git a/src/main/java/com/xkrs/model/entity/QcInspectionDataSourceEntity.java b/src/main/java/com/xkrs/model/entity/QcInspectionDataSourceEntity.java
deleted file mode 100644
index 80f3a34..0000000
--- a/src/main/java/com/xkrs/model/entity/QcInspectionDataSourceEntity.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * 质检采集数据表
- */
-@Entity
-@Table(name = "qc_inspection_data_source")
-public class QcInspectionDataSourceEntity implements Serializable {
-
- /**
- * 采集数据编号
- */
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Integer id;
-
- /**
- * 批次号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String lotNo;
-
- /**
- * 机器号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String machineNo;
-
- /**
- * 物料号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String materialNo;
-
- /**
- * 模具号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String modelNo;
-
- /**
- * 零件号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String partNo;
-
- /**
- * 检验项代码
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String inspectionItemCode;
-
- /**
- * 检验数值
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String inspectValue;
-
- public QcInspectionDataSourceEntity() {
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getLotNo() {
- return lotNo;
- }
-
- public void setLotNo(String lotNo) {
- this.lotNo = lotNo;
- }
-
- public String getMachineNo() {
- return machineNo;
- }
-
- public void setMachineNo(String machineNo) {
- this.machineNo = machineNo;
- }
-
- public String getMaterialNo() {
- return materialNo;
- }
-
- public void setMaterialNo(String materialNo) {
- this.materialNo = materialNo;
- }
-
- public String getModelNo() {
- return modelNo;
- }
-
- public void setModelNo(String modelNo) {
- this.modelNo = modelNo;
- }
-
- public String getPartNo() {
- return partNo;
- }
-
- public void setPartNo(String partNo) {
- this.partNo = partNo;
- }
-
- public String getInspectionItemCode() {
- return inspectionItemCode;
- }
-
- public void setInspectionItemCode(String inspectionItemCode) {
- this.inspectionItemCode = inspectionItemCode;
- }
-
- public String getInspectValue() {
- return inspectValue;
- }
-
- public void setInspectValue(String inspectValue) {
- this.inspectValue = inspectValue;
- }
-
- @Override
- public String toString() {
- return "QcInspectionDataSourceEntity{" + "id=" + id + ", lotNo='" + lotNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", modelNo='" + modelNo + '\'' + ", partNo='" + partNo + '\'' + ", inspectionItemCode='" + inspectionItemCode + '\'' + ", inspectValue='" + inspectValue + '\'' + '}';
- }
-}
diff --git a/src/main/java/com/xkrs/model/entity/QcInspectionFileEntity.java b/src/main/java/com/xkrs/model/entity/QcInspectionFileEntity.java
deleted file mode 100644
index 8675063..0000000
--- a/src/main/java/com/xkrs/model/entity/QcInspectionFileEntity.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "qc_inspection_file")
-public class QcInspectionFileEntity implements Serializable {
-
- /**
- * 编号
- */
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Integer id;
-
- /**
- * 批次号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String lotNo;
-
- /**
- * 机器号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String machineNo;
-
- /**
- * 物料号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String materialNo;
-
- /**
- * 模具号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String modelNo;
-
- /**
- * 零件号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String partNo;
-
- /**
- * 模版路径
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String templatePath;
-
- /**
- * 文件路径
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String filePath;
-
- public QcInspectionFileEntity() {
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getLotNo() {
- return lotNo;
- }
-
- public void setLotNo(String lotNo) {
- this.lotNo = lotNo;
- }
-
- public String getMachineNo() {
- return machineNo;
- }
-
- public void setMachineNo(String machineNo) {
- this.machineNo = machineNo;
- }
-
- public String getMaterialNo() {
- return materialNo;
- }
-
- public void setMaterialNo(String materialNo) {
- this.materialNo = materialNo;
- }
-
- public String getModelNo() {
- return modelNo;
- }
-
- public void setModelNo(String modelNo) {
- this.modelNo = modelNo;
- }
-
- public String getPartNo() {
- return partNo;
- }
-
- public void setPartNo(String partNo) {
- this.partNo = partNo;
- }
-
- public String getTemplatePath() {
- return templatePath;
- }
-
- public void setTemplatePath(String templatePath) {
- this.templatePath = templatePath;
- }
-
- public String getFilePath() {
- return filePath;
- }
-
- public void setFilePath(String filePath) {
- this.filePath = filePath;
- }
-
- @Override
- public String toString() {
- return "QcInspectionFileEntity{" + "id=" + id + ", lotNo='" + lotNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", modelNo='" + modelNo + '\'' + ", partNo='" + partNo + '\'' + ", templatePath='" + templatePath + '\'' + ", filePath='" + filePath + '\'' + '}';
- }
-
-}
diff --git a/src/main/java/com/xkrs/model/entity/QcInspectionItemDictEntity.java b/src/main/java/com/xkrs/model/entity/QcInspectionItemDictEntity.java
deleted file mode 100644
index ddde6da..0000000
--- a/src/main/java/com/xkrs/model/entity/QcInspectionItemDictEntity.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 9:26
- *
- * 1、实体类和表的映射关系
- * @Entity：声明实体类
- * @Table：配置实体类和表的映射关系 name：配置数据库表的名称
- * 2、实体类中属性和表中字段的映射关系
- * @Id：声明主键的配置
- * @GeneratedValue：配置主键的生成策略 GenerationType.SEQUENCE：序列
- * @Column：配置属性和字段的映射关系 name：数据库表中的字段名称
- */
-@Entity
-@Table(name = "qc_inspection_item_dict")
-public class QcInspectionItemDictEntity implements Serializable {
-
- /**
- * 索引
- */
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Integer id;
-
- /**
- * 检验项代码
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String inspectionItemCode;
-
- /**
- * 检验项名称
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String inspectionItemName;
-
- public QcInspectionItemDictEntity() {
- }
-
- public QcInspectionItemDictEntity(Integer id, String inspectionItemCode, String inspectionItemName) {
- this.id = id;
- this.inspectionItemCode = inspectionItemCode;
- this.inspectionItemName = inspectionItemName;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getInspectionItemCode() {
- return inspectionItemCode;
- }
-
- public void setInspectionItemCode(String inspectionItemCode) {
- this.inspectionItemCode = inspectionItemCode;
- }
-
- public String getInspectionItemName() {
- return inspectionItemName;
- }
-
- public void setInspectionItemName(String inspectionItemName) {
- this.inspectionItemName = inspectionItemName;
- }
-
- @Override
- public String toString() {
- return "DataDict{" + "id=" + id + ", inspectionItemCode='" + inspectionItemCode + '\'' + ", inspectionItemName='" + inspectionItemName + '\'' + '}';
- }
-
-}
diff --git a/src/main/java/com/xkrs/model/entity/QcInspectionPictureEntity.java b/src/main/java/com/xkrs/model/entity/QcInspectionPictureEntity.java
deleted file mode 100644
index 6d3d0c9..0000000
--- a/src/main/java/com/xkrs/model/entity/QcInspectionPictureEntity.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * 质检图片表
- */
-@Entity
-@Table(name = "qc_inspection_picture")
-public class QcInspectionPictureEntity implements Serializable {
-
- /**
- * 编号
- */
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Integer id;
-
- /**
- * 批次号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String lotNo;
-
- /**
- * 机器号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String machineNo;
-
- /**
- * 物料号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String materialNo;
-
- /**
- * 模具号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String modelNo;
-
- /**
- * 零件号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String partNo;
-
- /**
- * 图片路径
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String picturePath;
-
- public QcInspectionPictureEntity() {
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getLotNo() {
- return lotNo;
- }
-
- public void setLotNo(String lotNo) {
- this.lotNo = lotNo;
- }
-
- public String getMachineNo() {
- return machineNo;
- }
-
- public void setMachineNo(String machineNo) {
- this.machineNo = machineNo;
- }
-
- public String getMaterialNo() {
- return materialNo;
- }
-
- public void setMaterialNo(String materialNo) {
- this.materialNo = materialNo;
- }
-
- public String getModelNo() {
- return modelNo;
- }
-
- public void setModelNo(String modelNo) {
- this.modelNo = modelNo;
- }
-
- public String getPartNo() {
- return partNo;
- }
-
- public void setPartNo(String partNo) {
- this.partNo = partNo;
- }
-
- public String getPicturePath() {
- return picturePath;
- }
-
- public void setPicturePath(String picturePath) {
- this.picturePath = picturePath;
- }
-
- @Override
- public String toString() {
- return "QcInspectionPictureEntity{" + "id=" + id + ", lotNo='" + lotNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", modelNo='" + modelNo + '\'' + ", partNo='" + partNo + '\'' + ", picturePath='" + picturePath + '\'' + '}';
- }
-
-}
diff --git a/src/main/java/com/xkrs/model/entity/QcInspectionSpecEntity.java b/src/main/java/com/xkrs/model/entity/QcInspectionSpecEntity.java
deleted file mode 100644
index 0a32fce..0000000
--- a/src/main/java/com/xkrs/model/entity/QcInspectionSpecEntity.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * 检验规格实体类
- */
-@Entity
-@Table(name = "qc_inspection_spec")
-public class QcInspectionSpecEntity implements Serializable {
-
- /**
- * 规格编号
- */
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Integer id;
-
- /**
- * 零件号
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String partNo;
-
- /**
- * 检验项代码
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String inspectionItemCode;
-
- /**
- * 最大值
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String max;
-
- /**
- * 平均值
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String mean;
-
- /**
- * 最小值
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String min;
-
- /**
- * 单位
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String unit;
-
- /**
- * 检验方法
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String inspectionMethod;
-
- /**
- * 检验标准
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String inspectionStandard;
-
- /**
- * 备注
- */
- @Column(length = 85, columnDefinition = "varchar(85)")
- private String remark;
-
- public QcInspectionSpecEntity() {
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getPartNo() {
- return partNo;
- }
-
- public void setPartNo(String partNo) {
- this.partNo = partNo;
- }
-
- public String getInspectionItemCode() {
- return inspectionItemCode;
- }
-
- public void setInspectionItemCode(String inspectionItemCode) {
- this.inspectionItemCode = inspectionItemCode;
- }
-
- public String getMax() {
- return max;
- }
-
- public void setMax(String max) {
- this.max = max;
- }
-
- public String getMean() {
- return mean;
- }
-
- public void setMean(String mean) {
- this.mean = mean;
- }
-
- public String getMin() {
- return min;
- }
-
- public void setMin(String min) {
- this.min = min;
- }
-
- public String getUnit() {
- return unit;
- }
-
- public void setUnit(String unit) {
- this.unit = unit;
- }
-
- public String getInspectionMethod() {
- return inspectionMethod;
- }
-
- public void setInspectionMethod(String inspectionMethod) {
- this.inspectionMethod = inspectionMethod;
- }
-
- public String getInspectionStandard() {
- return inspectionStandard;
- }
-
- public void setInspectionStandard(String inspectionStandard) {
- this.inspectionStandard = inspectionStandard;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return "QcInspectionSpecEntity{" +
- "id=" + id +
- ", partNo='" + partNo + '\'' +
- ", inspectionItemCode='" + inspectionItemCode + '\'' +
- ", max='" + max + '\'' +
- ", mean='" + mean + '\'' +
- ", min='" + min + '\'' +
- ", unit='" + unit + '\'' +
- ", inspectionMethod='" + inspectionMethod + '\'' +
- ", inspectionStandard='" + inspectionStandard + '\'' +
- ", remark='" + remark + '\'' +
- '}';
- }
-
-}
diff --git a/src/main/java/com/xkrs/model/qo/QcInspectionDataSourceQo.java b/src/main/java/com/xkrs/model/qo/QcInspectionDataSourceQo.java
deleted file mode 100644
index b3648c5..0000000
--- a/src/main/java/com/xkrs/model/qo/QcInspectionDataSourceQo.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.xkrs.model.qo;
-
-public class QcInspectionDataSourceQo {
-
- /**
- * 采集数据编号
- */
- private Integer id;
-
- /**
- * 批次号
- */
- private String lotNo;
-
- /**
- * 机器号
- */
- private String machineNo;
-
- /**
- * 物料号
- */
- private String materialNo;
-
- /**
- * 模具号
- */
- private String modelNo;
-
- /**
- * 零件号
- */
- private String partNo;
-
- /**
- * 检验项代码
- */
- private String inspectionItemCode;
-
- /**
- * 检验数值
- */
- private String inspectValue;
-
- public QcInspectionDataSourceQo() {
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getLotNo() {
- return lotNo;
- }
-
- public void setLotNo(String lotNo) {
- this.lotNo = lotNo;
- }
-
- public String getMachineNo() {
- return machineNo;
- }
-
- public void setMachineNo(String machineNo) {
- this.machineNo = machineNo;
- }
-
- public String getMaterialNo() {
- return materialNo;
- }
-
- public void setMaterialNo(String materialNo) {
- this.materialNo = materialNo;
- }
-
- public String getModelNo() {
- return modelNo;
- }
-
- public void setModelNo(String modelNo) {
- this.modelNo = modelNo;
- }
-
- public String getPartNo() {
- return partNo;
- }
-
- public void setPartNo(String partNo) {
- this.partNo = partNo;
- }
-
- public String getInspectionItemCode() {
- return inspectionItemCode;
- }
-
- public void setInspectionItemCode(String inspectionItemCode) {
- this.inspectionItemCode = inspectionItemCode;
- }
-
- public String getInspectValue() {
- return inspectValue;
- }
-
- public void setInspectValue(String inspectValue) {
- this.inspectValue = inspectValue;
- }
-
-}
diff --git a/src/main/java/com/xkrs/model/qo/QcInspectionFileQo.java b/src/main/java/com/xkrs/model/qo/QcInspectionFileQo.java
deleted file mode 100644
index 258a0da..0000000
--- a/src/main/java/com/xkrs/model/qo/QcInspectionFileQo.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.xkrs.model.qo;
-
-public class QcInspectionFileQo {
-
- /**
- * 编号
- */
- private Integer id;
-
- /**
- * 批次号
- */
- private String lotNo;
-
- /**
- * 机器号
- */
- private String machineNo;
-
- /**
- * 物料号
- */
- private String materialNo;
-
- /**
- * 模具号
- */
- private String modelNo;
-
- /**
- * 零件号
- */
- private String partNo;
-
- /**
- * 模板路径
- */
- private String templatePath;
-
- /**
- * 文件路径
- */
- private String filePath;
-
- public QcInspectionFileQo() {
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getLotNo() {
- return lotNo;
- }
-
- public void setLotNo(String lotNo) {
- this.lotNo = lotNo;
- }
-
- public String getMachineNo() {
- return machineNo;
- }
-
- public void setMachineNo(String machineNo) {
- this.machineNo = machineNo;
- }
-
- public String getMaterialNo() {
- return materialNo;
- }
-
- public void setMaterialNo(String materialNo) {
- this.materialNo = materialNo;
- }
-
- public String getModelNo() {
- return modelNo;
- }
-
- public void setModelNo(String modelNo) {
- this.modelNo = modelNo;
- }
-
- public String getPartNo() {
- return partNo;
- }
-
- public void setPartNo(String partNo) {
- this.partNo = partNo;
- }
-
- public String getTemplatePath() {
- return templatePath;
- }
-
- public void setTemplatePath(String templatePath) {
- this.templatePath = templatePath;
- }
-
- public String getFilePath() {
- return filePath;
- }
-
- public void setFilePath(String filePath) {
- this.filePath = filePath;
- }
-}
diff --git a/src/main/java/com/xkrs/model/qo/QcInspectionItemDictQo.java b/src/main/java/com/xkrs/model/qo/QcInspectionItemDictQo.java
deleted file mode 100644
index 22bac1e..0000000
--- a/src/main/java/com/xkrs/model/qo/QcInspectionItemDictQo.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.xkrs.model.qo;
-
-public class QcInspectionItemDictQo {
-
- /**
- * 索引
- */
- private Integer id;
-
- /**
- * 检验项代码
- */
- private String inspectionItemCode;
-
- /**
- * 检验项名称
- */
- private String inspectionItemName;
-
- public QcInspectionItemDictQo() {
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getInspectionItemCode() {
- return inspectionItemCode;
- }
-
- public void setInspectionItemCode(String inspectionItemCode) {
- this.inspectionItemCode = inspectionItemCode;
- }
-
- public String getInspectionItemName() {
- return inspectionItemName;
- }
-
- public void setInspectionItemName(String inspectionItemName) {
- this.inspectionItemName = inspectionItemName;
- }
-}
diff --git a/src/main/java/com/xkrs/model/qo/QcInspectionPictureQo.java b/src/main/java/com/xkrs/model/qo/QcInspectionPictureQo.java
deleted file mode 100644
index 740cebf..0000000
--- a/src/main/java/com/xkrs/model/qo/QcInspectionPictureQo.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.xkrs.model.qo;
-
-public class QcInspectionPictureQo {
-
- /**
- * 编号
- */
- private Integer id;
-
- /**
- * 批次号
- */
- private String lotNo;
-
- /**
- * 机器号
- */
- private String machineNo;
-
- /**
- * 物料号
- */
- private String materialNo;
-
- /**
- * 模具号
- */
- private String modelNo;
-
- /**
- * 零件号
- */
- private String partNo;
-
- /**
- * 图片路径
- */
- private String picturePath;
-
- public QcInspectionPictureQo() {
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getLotNo() {
- return lotNo;
- }
-
- public void setLotNo(String lotNo) {
- this.lotNo = lotNo;
- }
-
- public String getMachineNo() {
- return machineNo;
- }
-
- public void setMachineNo(String machineNo) {
- this.machineNo = machineNo;
- }
-
- public String getMaterialNo() {
- return materialNo;
- }
-
- public void setMaterialNo(String materialNo) {
- this.materialNo = materialNo;
- }
-
- public String getModelNo() {
- return modelNo;
- }
-
- public void setModelNo(String modelNo) {
- this.modelNo = modelNo;
- }
-
- public String getPartNo() {
- return partNo;
- }
-
- public void setPartNo(String partNo) {
- this.partNo = partNo;
- }
-
- public String getPicturePath() {
- return picturePath;
- }
-
- public void setPicturePath(String picturePath) {
- this.picturePath = picturePath;
- }
-}
diff --git a/src/main/java/com/xkrs/model/qo/QcInspectionSpecQo.java b/src/main/java/com/xkrs/model/qo/QcInspectionSpecQo.java
deleted file mode 100644
index 0daecc9..0000000
--- a/src/main/java/com/xkrs/model/qo/QcInspectionSpecQo.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.xkrs.model.qo;
-
-public class QcInspectionSpecQo {
-
- /**
- * 规格编号
- */
- private Integer id;
-
- /**
- * 零件号
- */
- private String partNo;
-
- /**
- * 检验项代码
- */
- private String inspectionItemCode;
-
- /**
- * 最大值
- */
- private String max;
-
- /**
- * 平均值
- */
- private String mean;
-
- /**
- * 最小值
- */
- private String min;
-
- /**
- * 单位
- */
- private String unit;
-
- /**
- * 检验方法
- */
- private String inspectionMethod;
-
- /**
- * 检验标准
- */
- private String inspectionStandard;
-
- /**
- * 备注
- */
- private String remark;
-
- public QcInspectionSpecQo() {
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getPartNo() {
- return partNo;
- }
-
- public void setPartNo(String partNo) {
- this.partNo = partNo;
- }
-
- public String getInspectionItemCode() {
- return inspectionItemCode;
- }
-
- public void setInspectionItemCode(String inspectionItemCode) {
- this.inspectionItemCode = inspectionItemCode;
- }
-
- public String getMax() {
- return max;
- }
-
- public void setMax(String max) {
- this.max = max;
- }
-
- public String getMean() {
- return mean;
- }
-
- public void setMean(String mean) {
- this.mean = mean;
- }
-
- public String getMin() {
- return min;
- }
-
- public void setMin(String min) {
- this.min = min;
- }
-
- public String getUnit() {
- return unit;
- }
-
- public void setUnit(String unit) {
- this.unit = unit;
- }
-
- public String getInspectionMethod() {
- return inspectionMethod;
- }
-
- public void setInspectionMethod(String inspectionMethod) {
- this.inspectionMethod = inspectionMethod;
- }
-
- public String getInspectionStandard() {
- return inspectionStandard;
- }
-
- public void setInspectionStandard(String inspectionStandard) {
- this.inspectionStandard = inspectionStandard;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-}
diff --git a/src/main/java/com/xkrs/service/QcInspectionDataSourceService.java b/src/main/java/com/xkrs/service/QcInspectionDataSourceService.java
deleted file mode 100644
index 43536e6..0000000
--- a/src/main/java/com/xkrs/service/QcInspectionDataSourceService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.xkrs.service;
-
-import com.xkrs.model.qo.QcInspectionDataSourceQo;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 16:42
- */
-public interface QcInspectionDataSourceService {
-
- /**
- * 添加测量数据
- *
- * @param inspectionDataSourceQo
- * @return
- */
- String insertDataSource(QcInspectionDataSourceQo inspectionDataSourceQo);
-}
diff --git a/src/main/java/com/xkrs/service/QcInspectionFileService.java b/src/main/java/com/xkrs/service/QcInspectionFileService.java
deleted file mode 100644
index f0cc160..0000000
--- a/src/main/java/com/xkrs/service/QcInspectionFileService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.xkrs.service;
-
-import com.xkrs.model.qo.QcInspectionFileQo;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/20 15:24
- */
-public interface QcInspectionFileService {
-
- /**
- * 添加模板信息
- *
- * @param inspectionFileQo
- * @return
- */
- String insertFileExcel(QcInspectionFileQo inspectionFileQo, MultipartFile fileExcel) throws IOException;
-
- /**
- * 导出excel
- *
- * @param inspectionFileQo
- * @return
- */
- String exportExcel(QcInspectionFileQo inspectionFileQo) throws IOException, InvalidFormatException;
-}
diff --git a/src/main/java/com/xkrs/service/QcInspectionItemDictService.java b/src/main/java/com/xkrs/service/QcInspectionItemDictService.java
deleted file mode 100644
index 9ff4883..0000000
--- a/src/main/java/com/xkrs/service/QcInspectionItemDictService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.xkrs.service;
-
-import com.xkrs.model.qo.QcInspectionItemDictQo;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 10:10
- */
-public interface QcInspectionItemDictService {
-
- /**
- * 添加字典数据
- * @param inspectionItemDictQo
- * @return
- */
- String insertDataDict(QcInspectionItemDictQo inspectionItemDictQo);
-}
diff --git a/src/main/java/com/xkrs/service/QcInspectionPictureService.java b/src/main/java/com/xkrs/service/QcInspectionPictureService.java
deleted file mode 100644
index 5aa5562..0000000
--- a/src/main/java/com/xkrs/service/QcInspectionPictureService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.xkrs.service;
-
-import com.xkrs.model.qo.QcInspectionPictureQo;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-
-public interface QcInspectionPictureService {
-
- /**
- * 添加图片
- *
- * @param inspectionPictureQo
- * @return
- */
- String insertPicture(QcInspectionPictureQo inspectionPictureQo, MultipartFile pictureFile) throws IOException;
-
-}
diff --git a/src/main/java/com/xkrs/service/QcInspectionSpecService.java b/src/main/java/com/xkrs/service/QcInspectionSpecService.java
deleted file mode 100644
index 0ea1eb1..0000000
--- a/src/main/java/com/xkrs/service/QcInspectionSpecService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.xkrs.service;
-
-import com.xkrs.model.qo.QcInspectionSpecQo;
-
-public interface QcInspectionSpecService {
-
- /**
- * 添加规格数据
- *
- * @param inspectionSpecQo
- * @return
- */
- String insertSpec(QcInspectionSpecQo inspectionSpecQo);
-
-}
diff --git a/src/main/java/com/xkrs/service/impl/QcInspectionDataSourceServiceImpl.java b/src/main/java/com/xkrs/service/impl/QcInspectionDataSourceServiceImpl.java
deleted file mode 100644
index d101eeb..0000000
--- a/src/main/java/com/xkrs/service/impl/QcInspectionDataSourceServiceImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.xkrs.service.impl;
-
-import com.xkrs.dao.QcInspectionDataSourceDao;
-import com.xkrs.dao.QcInspectionItemDictDao;
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.QcInspectionDataSourceEntity;
-import com.xkrs.model.entity.QcInspectionItemDictEntity;
-import com.xkrs.model.qo.QcInspectionDataSourceQo;
-import com.xkrs.service.QcInspectionDataSourceService;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Locale;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 16:43
- */
-@Service
-public class QcInspectionDataSourceServiceImpl implements QcInspectionDataSourceService {
-
- @Resource
- private QcInspectionDataSourceDao inspectionDataSourceDao;
-
- @Resource
- private QcInspectionItemDictDao inspectionItemDictDao;
-
- /**
- * 添加测量数据
- *
- * @param inspectionDataSourceQo
- * @return
- */
- @Override
- public String insertDataSource(QcInspectionDataSourceQo inspectionDataSourceQo) {
- Locale locale = LocaleContextHolder.getLocale();
- QcInspectionItemDictEntity byInspectionItemCode = inspectionItemDictDao.findByInspectionItemCode(inspectionDataSourceQo.getInspectionItemCode());
- if (byInspectionItemCode == null) {
- return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该字典类型！", locale);
- }
- QcInspectionDataSourceEntity qcInspectionDataSourceEntity = new QcInspectionDataSourceEntity();
- if (inspectionDataSourceQo.getId() > 0) {
- qcInspectionDataSourceEntity.setId(inspectionDataSourceQo.getId());
- }
- qcInspectionDataSourceEntity.setLotNo(inspectionDataSourceQo.getLotNo());
- qcInspectionDataSourceEntity.setMachineNo(inspectionDataSourceQo.getMachineNo());
- qcInspectionDataSourceEntity.setMaterialNo(inspectionDataSourceQo.getMaterialNo());
- qcInspectionDataSourceEntity.setModelNo(inspectionDataSourceQo.getModelNo());
- qcInspectionDataSourceEntity.setPartNo(inspectionDataSourceQo.getPartNo());
- qcInspectionDataSourceEntity.setInspectionItemCode(inspectionDataSourceQo.getInspectionItemCode());
- qcInspectionDataSourceEntity.setInspectValue(inspectionDataSourceQo.getInspectValue());
- inspectionDataSourceDao.save(qcInspectionDataSourceEntity);
- return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
- }
-}
diff --git a/src/main/java/com/xkrs/service/impl/QcInspectionFileServiceImpl.java b/src/main/java/com/xkrs/service/impl/QcInspectionFileServiceImpl.java
deleted file mode 100644
index f13a6cc..0000000
--- a/src/main/java/com/xkrs/service/impl/QcInspectionFileServiceImpl.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.xkrs.service.impl;
-
-import com.xkrs.dao.QcInspectionDataSourceDao;
-import com.xkrs.dao.QcInspectionFileDao;
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.QcInspectionDataSourceEntity;
-import com.xkrs.model.entity.QcInspectionFileEntity;
-import com.xkrs.model.entity.QcInspectionItemDictEntity;
-import com.xkrs.model.qo.QcInspectionFileQo;
-import com.xkrs.service.QcInspectionFileService;
-import com.xkrs.util.ExcelUploadUtil;
-import com.xkrs.util.ExportExcel;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.transaction.Transactional;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/20 15:24
- */
-@Service
-public class QcInspectionFileServiceImpl implements QcInspectionFileService {
-
- @Resource
- private QcInspectionFileDao inspectionFileDao;
-
- @Resource
- private QcInspectionItemDictEntity inspectionItemDict;
-
- @Resource
- private QcInspectionDataSourceDao inspectionDataSourceDao;
-
- /**
- * 添加模板信息
- *
- * @param inspectionFileQo
- * @return
- */
- @Override
- public String insertFileExcel(QcInspectionFileQo inspectionFileQo, MultipartFile fileExcel) throws IOException {
- String lotNo = inspectionFileQo.getLotNo();
- String machineNo = inspectionFileQo.getMachineNo();
- String materialNo = inspectionFileQo.getMaterialNo();
- String modelNo = inspectionFileQo.getModelNo();
- String partNo = inspectionFileQo.getPartNo();
- Locale locale = LocaleContextHolder.getLocale();
- List qcInspectionFileEntities = inspectionFileDao.selectFile(lotNo, machineNo, materialNo, modelNo, partNo);
- if (qcInspectionFileEntities != null || qcInspectionFileEntities.isEmpty()) {
- return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "已存在该产品的模板!", locale);
- }
- if (fileExcel == null) {
- return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "模板不能为空！", locale);
- }
- String file = ExcelUploadUtil.memoryFile(fileExcel);
- QcInspectionFileEntity fileEntity = new QcInspectionFileEntity();
- fileEntity.setId(inspectionFileQo.getId());
- fileEntity.setLotNo(lotNo);
- fileEntity.setMachineNo(machineNo);
- fileEntity.setMaterialNo(materialNo);
- fileEntity.setModelNo(modelNo);
- fileEntity.setPartNo(partNo);
- fileEntity.setTemplatePath(file);
- inspectionFileDao.save(fileEntity);
- return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
- }
-
- /**
- * 导出excel
- *
- * @param inspectionFileQo
- * @return
- */
- @Transactional(rollbackOn = Exception.class)
- @Override
- public String exportExcel(QcInspectionFileQo inspectionFileQo) throws IOException, InvalidFormatException {
- String lotNo = inspectionFileQo.getLotNo();
- String machineNo = inspectionFileQo.getMachineNo();
- String materialNo = inspectionFileQo.getMaterialNo();
- String modelNo = inspectionFileQo.getModelNo();
- String partNo = inspectionFileQo.getPartNo();
- Locale locale = LocaleContextHolder.getLocale();
- List qcInspectionFileEntities = inspectionFileDao.selectFile(lotNo, machineNo, materialNo, modelNo, partNo);
- if (qcInspectionFileEntities == null || qcInspectionFileEntities.isEmpty()) {
- return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的模板，请添加！", locale);
- }
- String templatePath = qcInspectionFileEntities.get(0).getTemplatePath();
- List inspectionDataSources = inspectionDataSourceDao.selectDataSource(lotNo, machineNo, materialNo, modelNo, partNo);
- if (inspectionDataSources == null || inspectionDataSources.isEmpty()) {
- return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的信息！", locale);
- }
- Map map = new HashMap<>();
- for (QcInspectionDataSourceEntity inspectionDataSource : inspectionDataSources) {
- map.put(inspectionDataSource.getInspectionItemCode(), inspectionDataSource.getInspectValue());
- }
- String fill = ExportExcel.exportToProveExcel(map, templatePath);
- inspectionFileDao.updateFilePath(lotNo, machineNo, materialNo, modelNo, partNo, fill);
- return outputEncapsulationObject(PromptMessageEnum.SUCCESS, fill, locale);
- }
-}
diff --git a/src/main/java/com/xkrs/service/impl/QcInspectionItemDictServiceImpl.java b/src/main/java/com/xkrs/service/impl/QcInspectionItemDictServiceImpl.java
deleted file mode 100644
index 5ac8138..0000000
--- a/src/main/java/com/xkrs/service/impl/QcInspectionItemDictServiceImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.xkrs.service.impl;
-
-import com.xkrs.dao.QcInspectionItemDictDao;
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.QcInspectionItemDictEntity;
-import com.xkrs.model.qo.QcInspectionItemDictQo;
-import com.xkrs.service.QcInspectionItemDictService;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Locale;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 10:28
- */
-@Service
-public class QcInspectionItemDictServiceImpl implements QcInspectionItemDictService {
-
- @Resource
- private QcInspectionItemDictDao inspectionItemDictDao;
-
- /**
- * 添加字典数据
- *
- * @param inspectionItemDictQo
- * @return
- */
- @Override
- public String insertDataDict(QcInspectionItemDictQo inspectionItemDictQo) {
- Locale locale = LocaleContextHolder.getLocale();
- QcInspectionItemDictEntity englishName = inspectionItemDictDao.findByInspectionItemCode(inspectionItemDictQo.getInspectionItemCode());
- if (englishName != null) {
- return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "该产品变量已存在，请勿重复添加！", locale);
- }
- QcInspectionItemDictEntity qcInspectionItemDictEntity = new QcInspectionItemDictEntity();
- qcInspectionItemDictEntity.setInspectionItemName(inspectionItemDictQo.getInspectionItemName());
- qcInspectionItemDictEntity.setInspectionItemCode(inspectionItemDictQo.getInspectionItemCode());
- inspectionItemDictDao.save(qcInspectionItemDictEntity);
- return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
- }
-}
diff --git a/src/main/java/com/xkrs/service/impl/QcInspectionPictureServiceImpl.java b/src/main/java/com/xkrs/service/impl/QcInspectionPictureServiceImpl.java
deleted file mode 100644
index 8d94c28..0000000
--- a/src/main/java/com/xkrs/service/impl/QcInspectionPictureServiceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.xkrs.service.impl;
-
-import com.xkrs.dao.QcInspectionPictureDao;
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.QcInspectionPictureEntity;
-import com.xkrs.model.qo.QcInspectionPictureQo;
-import com.xkrs.service.QcInspectionPictureService;
-import com.xkrs.util.ExcelUploadUtil;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.Locale;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-@Service
-public class QcInspectionPictureServiceImpl implements QcInspectionPictureService {
-
- @Resource
- private QcInspectionPictureDao inspectionPictureDao;
-
- @Override
- public String insertPicture(QcInspectionPictureQo inspectionPictureQo, MultipartFile pictureFile) throws IOException {
- Locale locale = LocaleContextHolder.getLocale();
- String file = ExcelUploadUtil.memoryFile(pictureFile);
- QcInspectionPictureEntity qcInspectionPicture = new QcInspectionPictureEntity();
- qcInspectionPicture.setId(inspectionPictureQo.getId());
- qcInspectionPicture.setLotNo(inspectionPictureQo.getLotNo());
- qcInspectionPicture.setMachineNo(inspectionPictureQo.getMachineNo());
- qcInspectionPicture.setMaterialNo(inspectionPictureQo.getMaterialNo());
- qcInspectionPicture.setModelNo(inspectionPictureQo.getModelNo());
- qcInspectionPicture.setPartNo(inspectionPictureQo.getPartNo());
- qcInspectionPicture.setPicturePath(file);
- inspectionPictureDao.save(qcInspectionPicture);
- return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
- }
-}
diff --git a/src/main/java/com/xkrs/service/impl/QcInspectionSpecServiceImpl.java b/src/main/java/com/xkrs/service/impl/QcInspectionSpecServiceImpl.java
deleted file mode 100644
index 27ae754..0000000
--- a/src/main/java/com/xkrs/service/impl/QcInspectionSpecServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.xkrs.service.impl;
-
-import com.xkrs.dao.QcInspectionItemDictDao;
-import com.xkrs.dao.QcInspectionSpecDao;
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.QcInspectionSpecEntity;
-import com.xkrs.model.qo.QcInspectionSpecQo;
-import com.xkrs.service.QcInspectionSpecService;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Locale;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-@Service
-public class QcInspectionSpecServiceImpl implements QcInspectionSpecService {
-
- @Resource
- private QcInspectionSpecDao inspectionSpecDao;
-
- @Resource
- private QcInspectionItemDictDao inspectionItemDictDao;
-
-
- /**
- * 新增规格数据
- *
- * @param inspectionSpecQo
- * @return
- */
- @Override
- public String insertSpec(QcInspectionSpecQo inspectionSpecQo) {
- Locale locale = LocaleContextHolder.getLocale();
- QcInspectionSpecEntity inspectionSpec = new QcInspectionSpecEntity();
- if (inspectionSpecQo.getId() > 0) {
- inspectionSpec.setId(inspectionSpecQo.getId());
- }
- inspectionSpec.setPartNo(inspectionSpecQo.getPartNo());
- inspectionSpec.setInspectionItemCode(inspectionSpecQo.getInspectionItemCode());
- inspectionSpec.setMax(inspectionSpecQo.getMax());
- inspectionSpec.setMean(inspectionSpecQo.getMean());
- inspectionSpec.setMin(inspectionSpecQo.getMin());
- inspectionSpec.setUnit(inspectionSpecQo.getUnit());
- inspectionSpec.setInspectionMethod(inspectionSpecQo.getInspectionMethod());
- inspectionSpec.setInspectionStandard(inspectionSpecQo.getInspectionStandard());
- inspectionSpec.setRemark(inspectionSpecQo.getRemark());
- inspectionSpecDao.save(inspectionSpec);
- return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
- }
-}
diff --git a/src/main/java/com/xkrs/util/ExcelUploadUtil.java b/src/main/java/com/xkrs/util/ExcelUploadUtil.java
deleted file mode 100644
index d0096d5..0000000
--- a/src/main/java/com/xkrs/util/ExcelUploadUtil.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.xkrs.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-/**
- * @author XinYi Song
- */
-public class ExcelUploadUtil {
-
- public static Logger log = LoggerFactory.getLogger(ExcelUploadUtil.class);
-
- /**
- * 上传单张图片
- * @param fileExcel
- * @return
- * @throws IOException
- */
- public static String memoryFile(MultipartFile fileExcel) throws IOException {
- //String uploadPath = "http://139.199.98.175:2088/wfTaskImage/";
- String uploadPath = "http://192.168.2.9:2088/";
- //获取原始文件名
- String originalFilename = fileExcel.getOriginalFilename();
- if (originalFilename != null && !"".equals(originalFilename)) {
- //找到 . 的位置
- int index = originalFilename.lastIndexOf(".");
- //根据 . 的位置进行分割，拿到文件后缀名
- String suffix = originalFilename.substring(index);
- //uuid生成新的文件名
- String newName = UUID.randomUUID().toString() + suffix;
-
- //将图片保存到本地/usr/etc/images/Folder
- //File file = new File("E:/shoptest/");
- File file = new File("/home/sxy/server/industrial_measurement/excel/");
- if (!file.exists()) {
- file.mkdirs();
- }
- //String path = "E:/shoptest/" + newName;
- String path = "/home/sxy/server/industrial_measurement/excel/" + newName;
- String uploadsImage = uploadPath + newName;
- //实现上传
- fileExcel.transferTo(new File(path));
-
-
- return path;
- }
- return null;
- }
-
- /**
- * 以文件形式，批量上传图片
- * @param files
- * @return
- * @throws IOException
- */
- /*public static List uploadImage(MultipartFile[] files, String fireCode) throws IOException {
- //String uploadPath = "http://139.199.98.175:2099/forestTaskImage/";
- String uploadPath = "http://118.24.27.47:2088/";
- String newName = "";
- String oldName = "";
- List fireTaskPhotos = new ArrayList<>();
- for(MultipartFile file : files){
- //获取file图片名称
- oldName = file.getOriginalFilename();
- //找到 . 的位置
- int index = oldName.lastIndexOf(".");
- //根据 . 的位置进行分割，拿到文件后缀名
- String suffix = oldName.substring(index);
- //uuid生成新的文件名
- newName = UUID.randomUUID().toString() + suffix;
- //将图片保存到本地/usr/etc/images/Folder
- File file1 = new File("/home/sxy/server/fire_point/firePointImage/");
- //File file1 = new File("E:/file/work/image/");
- if (!file1.exists()) {
- file1.mkdirs();
- }
- String path = "/home/sxy/server/fire_point/firePointImage/" + newName;
- //String path = "E:/file/work/image/" + newName;
- String uploadPaths = "/firePointImage/" + newName;
- //实现上传
- file.transferTo(new File(path));
- FireTaskPhoto fireTaskPhoto = new FireTaskPhoto();
- fireTaskPhoto.setPhotoFireCode(fireCode);
- fireTaskPhoto.setTaskPhoto(uploadPaths);
-
- fireTaskPhotos.add(fireTaskPhoto);
- }
- return fireTaskPhotos;
- }*/
-
-
-
- /**
- * 删除本地或服务器储存的图片
- * @param path
- * @return
- */
- public static String delFile(String path){
- String resultInfo = null;
- int lastIndexOf = path.lastIndexOf("/");
- String imgPath = path.substring(lastIndexOf + 1,path.length());
- System.out.println(imgPath);
- imgPath = "/usr/local/etc/images/" + imgPath;
-// img_path = "/usr/etc/images/Folder/" + img_path;
- File file = new File(imgPath);
- if(file.exists()){
- if(file.delete()){
- resultInfo = "删除成功！";
- }else {
- resultInfo = "删除失败！";
- }
- }else {
- resultInfo = "文件不存在";
- }
- return resultInfo;
- }
-
- /**
- * 通过图片路径解析 ，上传保存
- * @param listImgSrc
- * @return
- */
- public static List downloadImage(List listImgSrc) {
- try {
- List list = new ArrayList();
- //开始时间
- Date beginDate = new Date();
- for (String url : listImgSrc) {
- //开始时间
- Date beginDate2 = new Date();
- String imageName = url.substring(url.lastIndexOf("/") + 1, url.length());
- URL uri = new URL(url);
- InputStream in = uri.openStream();
- //String pathUpload = "E:/img/" + imageName;
- String pathUpload = "/home/web/wf-fire-service/wfimage/" + imageName;
- FileOutputStream fo = new FileOutputStream(new File(pathUpload));
- byte[] buf = new byte[1024];
- int length = 0;
- log.info("-------开始下载:" + url);
- while ((length = in.read(buf, 0, buf.length)) != -1) {
- fo.write(buf, 0, length);
- }
- in.close();
- fo.close();
- list.add(imageName);
- log.info(imageName + "------下载完成");
- //结束时间
- Date overDate2 = new Date();
- double time = overDate2.getTime() - beginDate2.getTime();
- log.info("-----耗时：" + time / 1000 + "s");
- }
- Date overDate = new Date();
- double time = overDate.getTime() - beginDate.getTime();
- log.info("======总耗时：" + time / 1000 + "s");
- return list;
- } catch (Exception e) {
- log.info("++++++下载失败");
- }
- return null;
- }
-
- /**
- * 删除本地文件夹图片
- * @param url
- */
- public static void deleteImage(String url){
- File file=new File(url);
- //判断file是否是文件目录 若是返回TRUE
- if (file.isDirectory()){
- //name存储file文件夹中的文件名
- String[] name =file.list();
- for (int i=0; i map,String templateFileName) {
-
-
- String s = System.currentTimeMillis() + ".xlsx";
- // 方案2 根据Map填充
- String fileName = "/usr/local/excel/" + s;
- //String fileName = "E:\\shoptest\\" + s;
- // 这里 会填充到第一个sheet， 然后文件流会自动关闭
-
- ExcelWriterBuilder write = EasyExcel.write(fileName);
-
- ExcelWriterBuilder excelWriterBuilder = write.withTemplate(templateFileName);
-
- ExcelWriter build = excelWriterBuilder.build();
- WriteSheet writeSheet = EasyExcel.writerSheet().build();
-
- build.fill(map,writeSheet);
- build.finish();
-
- //EasyExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(map);
- return "http://118.24.27.47:2088/excel/"+s;
- //return "http://192.168.2.139/"+s;
- }*/
-
-
- public static String exportToProveExcel(Map dataMap, String srcFilePath) throws IOException, InvalidFormatException {
- String s = System.currentTimeMillis() + ".xlsx";
- //String path = "E:/shop/"+s;
- String path = "/home/sxy/server/industrial_measurement/excel/" + s;
-
- // 开始转换。利用 transformer 转到Excel
- XLSTransformer transformer = new XLSTransformer();
- // 参数：srcFilePath：模板源文件 cMap：需要导出的数据 destFile.getAbsolutePath()：下载的目标文件
- transformer.transformXLS(srcFilePath, dataMap, path);
- //return "http://192.168.2.139/"+s;
- return "http://118.24.27.47:2088/excel/"+s;
- }
-
- /*public static void main(String[] args) throws IOException, InvalidFormatException {
- // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替
- String templateFileName = TestFileUtil.getPath() + "templates" + File.separator + "test.xlsx";
- Map map = new HashMap();
- map.put("name", "张三");
- map.put("sex", "男");
- //simpleFill(map,templateFileName);
- HttpServletResponse response = null;
- String s = exportToProveExcel(map);
- System.out.println(s);
- }*/
-}
diff --git a/src/main/java/com/xkrs/util/Query.java b/src/main/java/com/xkrs/util/Query.java
deleted file mode 100644
index 86dff0d..0000000
--- a/src/main/java/com/xkrs/util/Query.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.xkrs.util;
-
-import com.xkrs.dao.QcInspectionItemDictDao;
-import com.xkrs.model.entity.QcInspectionItemDictEntity;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 13:56
- */
-@Component
-public class Query {
-
- @Resource
- private QcInspectionItemDictDao inspectionItemDictDao;
-
- /**
- * 动态多条件查询字典信息
- *
- * @return
- */
- public List selectDataDict(String inspectionItemCode, String inspectionItemName) {
- Specification specification = new Specification() {
- @Override
- public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) {
- List list = new ArrayList<>();
- if (inspectionItemCode != null && !"".equals(inspectionItemCode)) {
- list.add(criteriaBuilder.equal(root.get("inspectionItemCode").as(String.class), inspectionItemCode));
- }
- if (inspectionItemName != null && !"".equals(inspectionItemName)) {
- list.add(criteriaBuilder.equal(root.get("inspectionItemName").as(String.class), inspectionItemName));
- }
- Predicate[] predicates = new Predicate[list.size()];
- return criteriaBuilder.and(list.toArray(predicates));
- }
- };
- return inspectionItemDictDao.findAll(specification);
- }
-}
diff --git a/src/main/java/com/xkrs/util/TestFileUtil.java b/src/main/java/com/xkrs/util/TestFileUtil.java
deleted file mode 100644
index eb6df51..0000000
--- a/src/main/java/com/xkrs/util/TestFileUtil.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.xkrs.util;
-
-import java.io.File;
-import java.io.InputStream;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/17 9:29
- */
-public class TestFileUtil {
-
- public static InputStream getResourcesFileInputStream(String fileName) {
- return Thread.currentThread().getContextClassLoader().getResourceAsStream("" + fileName);
- }
-
- public static String getPath() {
- return TestFileUtil.class.getResource("/").getPath();
- }
-
- public static File createNewFile(String pathName) {
- File file = new File(getPath() + pathName);
- if (file.exists()) {
- file.delete();
- } else {
- if (!file.getParentFile().exists()) {
- file.getParentFile().mkdirs();
- }
- }
- return file;
- }
-
- public static File readFile(String pathName) {
- return new File(getPath() + pathName);
- }
-
- public static File readUserHomeFile(String pathName) {
- return new File(System.getProperty("user.home") + File.separator + pathName);
- }
-}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
deleted file mode 100644
index dabcc81..0000000
--- a/src/main/resources/application.properties
+++ /dev/null
@@ -1,56 +0,0 @@
-server.port = 6810
-
-## 数据源配置
-#spring.datasource.url = jdbc:postgresql://localhost:5432/data_model
-#spring.datasource.userName = postgres
-#spring.datasource.password = 123456
-#spring.datasource.driverClassName = org.postgresql.Driver
-
-spring.datasource.url = jdbc:mysql://192.168.2.9:3306/data_model?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-spring.datasource.userName = sxy
-spring.datasource.password = sxy123
-spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-
-server.tomcat.uri-encoding=UTF-8
-
-# jackson 配置
-spring.jackson.serialization.write-date-keys-as-timestamps=false
-
-## Hikari连接池设置
-spring.datasource.hikari.auto-commit = true
-spring.datasource.hikari.maximum-pool-size = 100
-spring.datasource.hikari.idle-timeout = 10000
-spring.datasource.hikari.minimum-idle = 5
-spring.datasource.hikari.validation-timeout = 3000
-
-## Spring Data JPA 配置
-spring.jpa.database = mysql
-spring.jpa.database-platform = org.hibernate.dialect.MySQL8Dialect
-spring.jpa.show-sql = false
-# 指定 ddl mode (none, validate, create, create-drop, update)
-spring.jpa.hibernate.ddl-auto = update
-# 命名策略
-spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
-#spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQL95Dialect
-#spring.jpa.properties.hibernate.dialect = org.hibernate.spatial.dialect.postgis.PostgisDialect
-spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults = false
-
-## Devtools配置
-spring.devtools.livereload.enabled = true
-
-## 多国语言配置
-spring.messages.basename = i18n/messages
-spring.messages.encoding = UTF-8
-
-# 上传文件配置
-spring.servlet.multipart.enabled=true
-# 最大文件大小
-spring.servlet.multipart.max-file-size = 100MB
-# 最大请求大小
-spring.servlet.multipart.max-request-size = 100MB
-
-spring.main.allow-bean-definition-overriding = true
-
-my.FileServerAdminAdress = http://127.0.0.1:4096/
-my.FileServerAdress = http://118.24.27.47:4096/
-
diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties
deleted file mode 100644
index 8cfedc5..0000000
--- a/src/main/resources/i18n/messages.properties
+++ /dev/null
@@ -1,162 +0,0 @@
-sys.message.success = 成功
-sys.message.null = 暂时还没有数据
-sys.message.exit = 已存在相关内容，请勿重复操作
-sys.message.user.not_logged_in = 用户未登录
-sys.message.user.login_error = 用户登陆失败
-sys.message.user.account_forbidden = 用户已被禁止
-sys.message.user.account_not_activated = 用户未激活
-sys.message.user.overtime = 用户登录超时
-sys.message.user.no_permission = 用户权限不足
-sys.message.user.already_logged = 用户已经登录
-sys.message.param.null = 参数为空
-sys.message.param.illegal = 参数非法
-sys.message.data.none = 数据为空
-sys.message.data.wrong = 数据错误
-sys.message.process.fail = 处理失败
-sys.message.process.overtime = 处理超时
-sys.message.system.inner_error = 系统内部错误
-sys.message.system.abnormal = 系统异常
-sys.message.system.busy = 系统正忙，请稍后
-sys.message.system.maintain = 系统维护中
-sys.message.database.error = 数据库错误
-sys.message.file.exists = 文件已存在
-sys.message.file.write.error = 文件写入失败
-sys.message.file.read.error = 文件读取失败
-
-SysUser.id.blank = 用户id不能为空
-SysUser.userName.blank = 用户名不能为空
-SysUser.userName.length.illegal = 用户名长度不合法
-SysUser.userName.format.illegal = 用户名格式不合法
-SysUser.nickName.length.illegal = 用户昵称长度不合法
-SysUser.userCode.length.illegal = 用户编码长度不合法
-SysUser.userCode.format.illegal = 用户编码含有非法字符
-SysUser.password.blank = 用户密码不能为空
-SysUser.password.length.illegal = 用户密码长度不合法
-SysUser.password.format.illegal = 用户密码格式不合法
-SysUser.sex.num.null = 用户性别数字不能为空
-SysUser.sex.num.illegal = 用户性别数字不合法
-SysUser.telephone.format.illegal = 用户手机号码不合法
-SysUser.email.length.illegal = 用户邮箱长度不合法
-SysUser.email.format.illegal = 用户邮箱格式不合法
-SysUser.admCode.illegal = 用户行政区划代码不合法
-SysUser.address.length.illegal = 用户详细地址长度不合法
-SysUser.birthday.format.illegal = 用户出生日期必须是 yyyy-MM-dd
-SysUser.personalSignature.length.illegal = 用户个性签名长度非法
-SysUser.portraitId.illegal = 用户头像id非法
-SysUser.statusCode.null = 用户当前状态编码为空
-SysUser.statusCode.illegal = 用户当前状态编码非法
-SysUser.deleteFlag.null = 用户删除标记不能是空
-
-TrajectoryRecord.id.null = id 不能为空
-TrajectoryRecord.startTimeTs.null = startTimeTs 不能为空
-
-SatelliteFirePoint.id.null = id 不能为空
-SatelliteFirePoint.fireCode.null = fireCode 不能为空
-SatelliteFirePoint.fireCode.length.illegal = fireCode 长度过长
-SatelliteFirePoint.countyCode.null = countyCode 不能为空
-SatelliteFirePoint.countyCode.length.illegal = countyCode 长度过长
-SatelliteFirePoint.countyName.null = countyName 不能为空
-SatelliteFirePoint.countyName.length.illegal = countyName 长度过长
-SatelliteFirePoint.satelliteType.null = satelliteType 不能为空
-SatelliteFirePoint.fireStatus.null = fireStatus 不能为空
-SatelliteFirePoint.verifyStatus.null = verifyStatus 不能为空
-SatelliteFirePoint.satelliteTimeTs.null = satelliteTimeTs 不能为空
-
-PictureFirePoint.id.null = id 不能为空
-PictureFirePoint.fireCode.null = fireCode 不能为空
-PictureFirePoint.fireCode.length.illegal = fireCode 长度过长
-PictureFirePoint.pictureName.length.illegal = pictureName 长度过长
-PictureFirePoint.picturePath.null = picturePath 不能为空
-PictureFirePoint.picturePath.length.illegal = picturePath 长度过长
-PictureFirePoint.memo.length.illegal = memo 长度过长
-PictureFirePoint.size.length.illegal = size 长度过长
-PictureFirePoint.md5.null = md5 不能为空
-PictureFirePoint.md5.length.illegal = md5 长度过长
-PictureFirePoint.shootTimeTs.null = shootTimeTs 不能为空
-
-PersonInvestigator.id.null = id 不能为空
-PersonInvestigator.name.null = name 不能为空
-PersonInvestigator.name.length.illegal = name 长度过长
-PersonInvestigator.code.length.illegal = code 长度过长
-PersonInvestigator.telephone.null = telephone 不能为空
-PersonInvestigator.telephone.format.illegal = telephone 格式非法
-PersonInvestigator.sex.null = sex 不能为空
-PersonInvestigator.sex.format.illegal = sex 格式非法
-PersonInvestigator.idCard.length.illegal = idCard 长度过长
-PersonInvestigator.memo.length.illegal = memo 长度过长
-PersonInvestigator.linkUserName.null = linkUserName 不能为空
-PersonInvestigator.linkUserName.format.illegal = linkUserName 格式非法
-PersonInvestigator.password.null = password 不能为空
-PersonInvestigator.password.format.illegal = password 格式非法
-InvestigateFirePoint.verifyTimeTs.null = verifyTimeTs 不能为空
-
-InvestigateFirePoint.id.null = id 不能为空
-InvestigateFirePoint.fireCode.null = fireCode 不能为空
-InvestigateFirePoint.fireCode.length.illegal = fireCode 长度过长
-InvestigateFirePoint.countyCode.null = countyCode 不能为空
-InvestigateFirePoint.countyCode.length.illegal = countyCode 长度过长
-InvestigateFirePoint.countyName.null = countyName 不能为空
-InvestigateFirePoint.countyName.length.illegal = countyName 长度过长
-InvestigateFirePoint.address.null = address 不能为空
-InvestigateFirePoint.fireArea.null = fireArea 不能为空
-InvestigateFirePoint.verifyType.null = verifyType 不能为空
-InvestigateFirePoint.satelliteType.null = satelliteType 不能为空
-InvestigateFirePoint.satelliteType.length.illegal = satelliteType 长度过长
-
-FileDocument.id.null = id 不能为空
-FileDocument.name.null = name 不能为空
-FileDocument.name.length.illegal = name 长度过长
-FileDocument.category.length.illegal = category 长度过长
-FileDocument.filePath.null = filePath 不能为空
-FileDocument.filePath.length.illegal = filePath 长度过长
-FileDocument.size.length.illegal = size 长度过长
-FileDocument.md5.null = md5 不能为空
-FileDocument.md5.length.illegal = md5 长度过长
-FileDocument.memo.length.illegal = memo 长度过长
-FileDocument.checkingToken.length.illegal = checkingToken 长度过长
-
-AppFile.id.null = id 不能为空
-AppFile.name.null = name 不能为空
-AppFile.name.length.illegal = name 长度过长
-AppFile.appPath.null = appPath 不能为空
-AppFile.appPath.length.illegal = appPath 长度过长
-AppFile.versionNumber.null = versionNumber 不能为空
-AppFile.versionNumber.length.illegal = versionNumber 长度过长
-AppFile.versionNumber.format.illegal = versionNumber 格式不合法
-AppFile.size.null = size 不能为空
-AppFile.size.length.illegal = size 长度过长
-AppFile.md5.null = md5 不能为空
-AppFile.md5.length.illegal = md5 长度过长
-AppFile.memo.length.illegal = memo 长度过长
-
-RealFirePoint.id.null = id 不能为空
-RealFirePoint.fireCode.null = fireCode 不能为空
-RealFirePoint.fireCode.length.illegal = fireCode 不合法
-RealFirePoint.countyCode.null = countyCode 不能为空
-RealFirePoint.countyCode.length.illegal = countyCode 不合法
-RealFirePoint.countyName.null = countyName 不能为空
-RealFirePoint.countyName.length.illegal = countyName 不合法
-RealFirePoint.address.null = address 不能为空
-RealFirePoint.address.length.illegal = address 不合法
-RealFirePoint.fireArea.null = fireArea 不能为空
-RealFirePoint.verifyTimeTs.null = verifyTimeTs 不能为空
-RealFirePoint.verifyType.null = verifyType 不能为空
-
-InvestigationTeam.id.null = id 不能为空
-InvestigationTeam.teamName.null = teamName 不能为空
-InvestigationTeam.teamName.length.illegal = teamName 长度过长
-InvestigationTeam.memo.length.illegal = memo 长度过长
-InvestigationTeam.userName.null = userName 不能为空
-InvestigationTeam.userName.length.illegal = userName 长度过长
-InvestigationTeam.userRealName.null = userRealName 不能为空
-InvestigationTeam.userRealName.length.illegal = userRealName 长度过长
-
-RelTeamInvestigator.id.null = id 不能为空
-RelTeamInvestigator.teamCode.null = teamCode 不能为空
-RelTeamInvestigator.teamCode.length.illegal = teamCode 长度过长
-RelTeamInvestigator.userName.null = userName 不能为空
-RelTeamInvestigator.userName.length.illegal = userName 长度过长
-RelTeamInvestigator.teamDeputy.null = teamDeputy 不能为空
-RelTeamInvestigator.memo.length.illegal = memo 长度过长
-RelTeamInvestigator.userRealName.null = userRealName 不能为空
-RelTeamInvestigator.userRealName.length.illegal = userRealName 长度过长
diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties
deleted file mode 100644
index 9b23e85..0000000
--- a/src/main/resources/i18n/messages_en_US.properties
+++ /dev/null
@@ -1,162 +0,0 @@
-sys.message.success = success
-sys.message.null = null
-sys.message.exit = data already exists
-sys.message.user.not_logged_in = user not logged in
-sys.message.user.login_error = user login failed
-sys.message.user.account_forbidden = this account is forbidden
-sys.message.user.account_not_activated = this account not activated
-sys.message.user.overtime = user login timeout
-sys.message.user.no_permission = user permission denied
-sys.message.user.already_logged = user already logged
-sys.message.param.null = parameter is null
-sys.message.param.illegal = parameter is illegal
-sys.message.data.none = data is none
-sys.message.data.wrong = data is wrong
-sys.message.process.fail = process fail
-sys.message.process.overtime = process overtime
-sys.message.system.inner_error = system inner error
-sys.message.system.abnormal = system abnormal
-sys.message.system.busy = system is busy
-sys.message.system.maintain = system maintenance
-sys.message.database.error = database error
-sys.message.file.exists = file exists
-sys.message.file.write.error = file write error
-sys.message.file.read.error = file read error
-
-SysUser.id.blank = user id can't be blank
-SysUser.userName.blank = user name can't be blank
-SysUser.userName.length.illegal = user name length illegal
-SysUser.userName.format.illegal = user name format illegal
-SysUser.nickName.length.illegal = user nickname length illegal
-SysUser.userCode.length.illegal = user code length illegal
-SysUser.userCode.format.illegal = user code cantains illegal character
-SysUser.password.blank = user password can't be blank
-SysUser.password.length.illegal = user password length illegal
-SysUser.password.format.illegal = user password format illegal
-SysUser.sex.num.null = user sex num can't be blank
-SysUser.sex.num.illegal = user sex num illegal
-SysUser.telephone.format.illegal = user telephone format illegal
-SysUser.email.length.illegal = user email length illegal
-SysUser.email.format.illegal = user email format illegal
-SysUser.admCode.illegal = user administrative area code illegal
-SysUser.address.length.illegal = user address length illegal
-SysUser.birthday.format.illegal = user birthday must be yyyy-MM-dd
-SysUser.personalSignature.length.illegal = user personal signature length illegal
-SysUser.portraitId.illegal = user portrait id illegal
-SysUser.statusCode.null = user current status code can't be blank
-SysUser.statusCode.illegal = user current status code illegal
-SysUser.deleteFlag.null = user delete flag can't be null
-
-TrajectoryRecord.id.null = id can't be null
-TrajectoryRecord.startTimeTs.null = startTimeTs can't be null
-
-SatelliteFirePoint.id.null = id can't be blank
-SatelliteFirePoint.fireCode.null = fireCode can't be blank
-SatelliteFirePoint.fireCode.length.illegal = fireCode length illegal
-SatelliteFirePoint.countyCode.null = countyCode can't be blank
-SatelliteFirePoint.countyCode.length.illegal = countyCode length illegal
-SatelliteFirePoint.countyName.null = countyName can't be blank
-SatelliteFirePoint.countyName.length.illegal = countyName length illegal
-SatelliteFirePoint.satelliteType.null = satelliteType can't be blank
-SatelliteFirePoint.fireStatus.null = fireStatus can't be blank
-SatelliteFirePoint.verifyStatus.null = verifyStatus can't be blank
-SatelliteFirePoint.satelliteTimeTs.null = satelliteTimeTs can't be blank
-
-PictureFirePoint.id.null = id can't be blank
-PictureFirePoint.fireCode.null = fireCode can't be blank
-PictureFirePoint.fireCode.length.illegal = fireCode length illegal
-PictureFirePoint.pictureName.length.illegal = pictureName length illegal
-PictureFirePoint.picturePath.null = picturePath can't be blank
-PictureFirePoint.picturePath.length.illegal = picturePath length illegal
-PictureFirePoint.memo.length.illegal = memo length illegal
-PictureFirePoint.size.length.illegal = size length illegal
-PictureFirePoint.md5.null = md5 can't be blank
-PictureFirePoint.md5.length.illegal = md5 length illegal
-PictureFirePoint.shootTimeTs.null = shootTimeTs can't be blank
-
-PersonInvestigator.id.null = id can't be blank
-PersonInvestigator.name.null = name can't be blank
-PersonInvestigator.name.length.illegal = name length illegal
-PersonInvestigator.code.length.illegal = code length illegal
-PersonInvestigator.telephone.null = telephone can't be blank
-PersonInvestigator.telephone.format.illegal = telephone format illegal
-PersonInvestigator.sex.null = sex format can't be blank
-PersonInvestigator.sex.format.illegal = sex format illegal
-PersonInvestigator.idCard.length.illegal = idCard length illegal
-PersonInvestigator.memo.length.illegal = memo length illegal
-PersonInvestigator.linkUserName.null = linkUserName can't be blank
-PersonInvestigator.linkUserName.format.illegal = linkUserName format illegal
-PersonInvestigator.password.null = password can't be blank
-PersonInvestigator.password.format.illegal = password format
-InvestigateFirePoint.verifyTimeTs.null = verifyTimeTs can't be blank
-
-InvestigateFirePoint.id.null = id can't be blank
-InvestigateFirePoint.fireCode.null = fireCode can't be blank
-InvestigateFirePoint.fireCode.length.illegal = fireCode length illegal
-InvestigateFirePoint.countyCode.null = countyCode can't be blank
-InvestigateFirePoint.countyCode.length.illegal = countyCode length illegal
-InvestigateFirePoint.countyName.null = countyName can't be blank
-InvestigateFirePoint.countyName.length.illegal = countyName length illegal
-InvestigateFirePoint.address.null = address can't be blank
-InvestigateFirePoint.fireArea.null = fireArea can't be blank
-InvestigateFirePoint.verifyType.null = verifyType can't be blank
-InvestigateFirePoint.satelliteType.null = satelliteType can't be blank
-InvestigateFirePoint.satelliteType.length.illegal = satelliteType length illegal
-
-FileDocument.id.null = id can't be blank
-FileDocument.name.null = name can't be blank
-FileDocument.name.length.illegal = name length illegal
-FileDocument.category.length.illegal = category length illegal
-FileDocument.filePath.null = filePath can't be blank
-FileDocument.filePath.length.illegal = filePath length illegal
-FileDocument.size.length.illegal = size length illegal
-FileDocument.md5.null = md5 can't be blank
-FileDocument.md5.length.illegal = md5 length illegal
-FileDocument.memo.length.illegal = memo length illegal
-FileDocument.checkingToken.length.illegal = checkingToken length illegal
-
-AppFile.id.null = id can't be blank
-AppFile.name.null = name can't be blank
-AppFile.name.length.illegal = name length illegal
-AppFile.appPath.null = appPath can't be blank
-AppFile.appPath.length.illegal = appPath length illegal
-AppFile.versionNumber.null = versionNumber can't be blank
-AppFile.versionNumber.length.illegal = versionNumber length illegal
-AppFile.versionNumber.format.illegal = versionNumber illegal
-AppFile.size.null = size can't be blank
-AppFile.size.length.illegal = size length illegal
-AppFile.md5.null = md5 can't be blank
-AppFile.md5.length.illegal = md5 length illegal
-AppFile.memo.length.illegal = memo length illegal
-
-RealFirePoint.id.null = id can't be blank
-RealFirePoint.fireCode.null = fireCode can't be blank
-RealFirePoint.fireCode.length.illegal = fireCode illegal
-RealFirePoint.countyCode.null = countyCode can't be blank
-RealFirePoint.countyCode.length.illegal = countyCode
-RealFirePoint.countyName.null = countyName can't be blank
-RealFirePoint.countyName.length.illegal = countyName illegal
-RealFirePoint.address.null = address can't be blank
-RealFirePoint.address.length.illegal = address illegal
-RealFirePoint.fireArea.null = fireArea can't be blank
-RealFirePoint.verifyTimeTs.null = verifyTimeTs can't be blank
-RealFirePoint.verifyType.null = verifyType can't be blank
-
-InvestigationTeam.id.null = id can't be blank
-InvestigationTeam.teamName.null = teamName can't be blank
-InvestigationTeam.teamName.length.illegal = teamName length illegal
-InvestigationTeam.memo.length.illegal = memo length illegal
-InvestigationTeam.userName.null = userName can't be blank
-InvestigationTeam.userName.length.illegal = userName length illegal
-InvestigationTeam.userRealName.null = userRealName can't be blank
-InvestigationTeam.userRealName.length.illegal = userRealName length illegal
-
-RelTeamInvestigator.id.null = id can't be blank
-RelTeamInvestigator.teamCode.null = teamCode can't be blank
-RelTeamInvestigator.teamCode.length.illegal = teamCode length illegal
-RelTeamInvestigator.userName.null = userName can't be blank
-RelTeamInvestigator.userName.length.illegal = userName length illegal
-RelTeamInvestigator.teamDeputy.null = teamDeputy can't be blank
-RelTeamInvestigator.memo.length.illegal = memo length illegal
-RelTeamInvestigator.userRealName.null = userRealName can't be blank
-RelTeamInvestigator.userRealName.length.illegal = userRealName length illegal
diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties
deleted file mode 100644
index 8cfedc5..0000000
--- a/src/main/resources/i18n/messages_zh_CN.properties
+++ /dev/null
@@ -1,162 +0,0 @@
-sys.message.success = 成功
-sys.message.null = 暂时还没有数据
-sys.message.exit = 已存在相关内容，请勿重复操作
-sys.message.user.not_logged_in = 用户未登录
-sys.message.user.login_error = 用户登陆失败
-sys.message.user.account_forbidden = 用户已被禁止
-sys.message.user.account_not_activated = 用户未激活
-sys.message.user.overtime = 用户登录超时
-sys.message.user.no_permission = 用户权限不足
-sys.message.user.already_logged = 用户已经登录
-sys.message.param.null = 参数为空
-sys.message.param.illegal = 参数非法
-sys.message.data.none = 数据为空
-sys.message.data.wrong = 数据错误
-sys.message.process.fail = 处理失败
-sys.message.process.overtime = 处理超时
-sys.message.system.inner_error = 系统内部错误
-sys.message.system.abnormal = 系统异常
-sys.message.system.busy = 系统正忙，请稍后
-sys.message.system.maintain = 系统维护中
-sys.message.database.error = 数据库错误
-sys.message.file.exists = 文件已存在
-sys.message.file.write.error = 文件写入失败
-sys.message.file.read.error = 文件读取失败
-
-SysUser.id.blank = 用户id不能为空
-SysUser.userName.blank = 用户名不能为空
-SysUser.userName.length.illegal = 用户名长度不合法
-SysUser.userName.format.illegal = 用户名格式不合法
-SysUser.nickName.length.illegal = 用户昵称长度不合法
-SysUser.userCode.length.illegal = 用户编码长度不合法
-SysUser.userCode.format.illegal = 用户编码含有非法字符
-SysUser.password.blank = 用户密码不能为空
-SysUser.password.length.illegal = 用户密码长度不合法
-SysUser.password.format.illegal = 用户密码格式不合法
-SysUser.sex.num.null = 用户性别数字不能为空
-SysUser.sex.num.illegal = 用户性别数字不合法
-SysUser.telephone.format.illegal = 用户手机号码不合法
-SysUser.email.length.illegal = 用户邮箱长度不合法
-SysUser.email.format.illegal = 用户邮箱格式不合法
-SysUser.admCode.illegal = 用户行政区划代码不合法
-SysUser.address.length.illegal = 用户详细地址长度不合法
-SysUser.birthday.format.illegal = 用户出生日期必须是 yyyy-MM-dd
-SysUser.personalSignature.length.illegal = 用户个性签名长度非法
-SysUser.portraitId.illegal = 用户头像id非法
-SysUser.statusCode.null = 用户当前状态编码为空
-SysUser.statusCode.illegal = 用户当前状态编码非法
-SysUser.deleteFlag.null = 用户删除标记不能是空
-
-TrajectoryRecord.id.null = id 不能为空
-TrajectoryRecord.startTimeTs.null = startTimeTs 不能为空
-
-SatelliteFirePoint.id.null = id 不能为空
-SatelliteFirePoint.fireCode.null = fireCode 不能为空
-SatelliteFirePoint.fireCode.length.illegal = fireCode 长度过长
-SatelliteFirePoint.countyCode.null = countyCode 不能为空
-SatelliteFirePoint.countyCode.length.illegal = countyCode 长度过长
-SatelliteFirePoint.countyName.null = countyName 不能为空
-SatelliteFirePoint.countyName.length.illegal = countyName 长度过长
-SatelliteFirePoint.satelliteType.null = satelliteType 不能为空
-SatelliteFirePoint.fireStatus.null = fireStatus 不能为空
-SatelliteFirePoint.verifyStatus.null = verifyStatus 不能为空
-SatelliteFirePoint.satelliteTimeTs.null = satelliteTimeTs 不能为空
-
-PictureFirePoint.id.null = id 不能为空
-PictureFirePoint.fireCode.null = fireCode 不能为空
-PictureFirePoint.fireCode.length.illegal = fireCode 长度过长
-PictureFirePoint.pictureName.length.illegal = pictureName 长度过长
-PictureFirePoint.picturePath.null = picturePath 不能为空
-PictureFirePoint.picturePath.length.illegal = picturePath 长度过长
-PictureFirePoint.memo.length.illegal = memo 长度过长
-PictureFirePoint.size.length.illegal = size 长度过长
-PictureFirePoint.md5.null = md5 不能为空
-PictureFirePoint.md5.length.illegal = md5 长度过长
-PictureFirePoint.shootTimeTs.null = shootTimeTs 不能为空
-
-PersonInvestigator.id.null = id 不能为空
-PersonInvestigator.name.null = name 不能为空
-PersonInvestigator.name.length.illegal = name 长度过长
-PersonInvestigator.code.length.illegal = code 长度过长
-PersonInvestigator.telephone.null = telephone 不能为空
-PersonInvestigator.telephone.format.illegal = telephone 格式非法
-PersonInvestigator.sex.null = sex 不能为空
-PersonInvestigator.sex.format.illegal = sex 格式非法
-PersonInvestigator.idCard.length.illegal = idCard 长度过长
-PersonInvestigator.memo.length.illegal = memo 长度过长
-PersonInvestigator.linkUserName.null = linkUserName 不能为空
-PersonInvestigator.linkUserName.format.illegal = linkUserName 格式非法
-PersonInvestigator.password.null = password 不能为空
-PersonInvestigator.password.format.illegal = password 格式非法
-InvestigateFirePoint.verifyTimeTs.null = verifyTimeTs 不能为空
-
-InvestigateFirePoint.id.null = id 不能为空
-InvestigateFirePoint.fireCode.null = fireCode 不能为空
-InvestigateFirePoint.fireCode.length.illegal = fireCode 长度过长
-InvestigateFirePoint.countyCode.null = countyCode 不能为空
-InvestigateFirePoint.countyCode.length.illegal = countyCode 长度过长
-InvestigateFirePoint.countyName.null = countyName 不能为空
-InvestigateFirePoint.countyName.length.illegal = countyName 长度过长
-InvestigateFirePoint.address.null = address 不能为空
-InvestigateFirePoint.fireArea.null = fireArea 不能为空
-InvestigateFirePoint.verifyType.null = verifyType 不能为空
-InvestigateFirePoint.satelliteType.null = satelliteType 不能为空
-InvestigateFirePoint.satelliteType.length.illegal = satelliteType 长度过长
-
-FileDocument.id.null = id 不能为空
-FileDocument.name.null = name 不能为空
-FileDocument.name.length.illegal = name 长度过长
-FileDocument.category.length.illegal = category 长度过长
-FileDocument.filePath.null = filePath 不能为空
-FileDocument.filePath.length.illegal = filePath 长度过长
-FileDocument.size.length.illegal = size 长度过长
-FileDocument.md5.null = md5 不能为空
-FileDocument.md5.length.illegal = md5 长度过长
-FileDocument.memo.length.illegal = memo 长度过长
-FileDocument.checkingToken.length.illegal = checkingToken 长度过长
-
-AppFile.id.null = id 不能为空
-AppFile.name.null = name 不能为空
-AppFile.name.length.illegal = name 长度过长
-AppFile.appPath.null = appPath 不能为空
-AppFile.appPath.length.illegal = appPath 长度过长
-AppFile.versionNumber.null = versionNumber 不能为空
-AppFile.versionNumber.length.illegal = versionNumber 长度过长
-AppFile.versionNumber.format.illegal = versionNumber 格式不合法
-AppFile.size.null = size 不能为空
-AppFile.size.length.illegal = size 长度过长
-AppFile.md5.null = md5 不能为空
-AppFile.md5.length.illegal = md5 长度过长
-AppFile.memo.length.illegal = memo 长度过长
-
-RealFirePoint.id.null = id 不能为空
-RealFirePoint.fireCode.null = fireCode 不能为空
-RealFirePoint.fireCode.length.illegal = fireCode 不合法
-RealFirePoint.countyCode.null = countyCode 不能为空
-RealFirePoint.countyCode.length.illegal = countyCode 不合法
-RealFirePoint.countyName.null = countyName 不能为空
-RealFirePoint.countyName.length.illegal = countyName 不合法
-RealFirePoint.address.null = address 不能为空
-RealFirePoint.address.length.illegal = address 不合法
-RealFirePoint.fireArea.null = fireArea 不能为空
-RealFirePoint.verifyTimeTs.null = verifyTimeTs 不能为空
-RealFirePoint.verifyType.null = verifyType 不能为空
-
-InvestigationTeam.id.null = id 不能为空
-InvestigationTeam.teamName.null = teamName 不能为空
-InvestigationTeam.teamName.length.illegal = teamName 长度过长
-InvestigationTeam.memo.length.illegal = memo 长度过长
-InvestigationTeam.userName.null = userName 不能为空
-InvestigationTeam.userName.length.illegal = userName 长度过长
-InvestigationTeam.userRealName.null = userRealName 不能为空
-InvestigationTeam.userRealName.length.illegal = userRealName 长度过长
-
-RelTeamInvestigator.id.null = id 不能为空
-RelTeamInvestigator.teamCode.null = teamCode 不能为空
-RelTeamInvestigator.teamCode.length.illegal = teamCode 长度过长
-RelTeamInvestigator.userName.null = userName 不能为空
-RelTeamInvestigator.userName.length.illegal = userName 长度过长
-RelTeamInvestigator.teamDeputy.null = teamDeputy 不能为空
-RelTeamInvestigator.memo.length.illegal = memo 长度过长
-RelTeamInvestigator.userRealName.null = userRealName 不能为空
-RelTeamInvestigator.userRealName.length.illegal = userRealName 长度过长
diff --git a/src/main/resources/templates/a.xlsx b/src/main/resources/templates/a.xlsx
deleted file mode 100644
index 7d41989..0000000
Binary files a/src/main/resources/templates/a.xlsx and /dev/null differ
diff --git a/src/main/resources/templates/test.xlsx b/src/main/resources/templates/test.xlsx
deleted file mode 100644
index 6fa30ec..0000000
Binary files a/src/main/resources/templates/test.xlsx and /dev/null differ