完善输入参数是否可空

src/main/java/com/xkrs/WordAndExcelApplication.java

@@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class WordAndExcelApplication {
 
     public static void main(String[] args) {
+
         SpringApplication.run(WordAndExcelApplication.class, args);
     }
 

src/main/java/com/xkrs/controller/DataDictController.java

@@ -1,95 +0,0 @@
-package com.xkrs.controller;
-
-import com.xkrs.dao.DataDictDao;
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.DataDict;
-import com.xkrs.model.qo.DataDictQo;
-import com.xkrs.model.qo.DataDictUpdateQo;
-import com.xkrs.service.DataDictService;
-import com.xkrs.util.DataDictQuery;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.transaction.Transactional;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 10:54
- */
-@RestController
-public class DataDictController {
-
-    @Resource
-    private DataDictService dataDictService;
-
-    @Resource
-    private DataDictDao dataDictDao;
-
-    @Resource
-    private DataDictQuery dataDictQuery;
-
-    /**
-     * 添加字典变量数据
-     *
-     * @param dataDictQo
-     * @return
-     */
-    @PostMapping("/insertDataDict")
-    public String insertDataDict(@RequestBody DataDictQo dataDictQo) {
-        return dataDictService.insertDataDict(dataDictQo);
-    }
-
-    /**
-     * 动态多条件查询字典信息
-     *
-     * @param inspectionItemName
-     * @param inspectionItemCode
-     * @return
-     */
-    @GetMapping("/selectDataDict")
-    public String selectDataDict(@RequestParam("inspectionItemName") String inspectionItemName,
-                                 @RequestParam("inspectionItemCode") String inspectionItemCode) {
-        Locale locale = LocaleContextHolder.getLocale();
-        List<DataDict> dataDict = dataDictQuery.selectDataDict(inspectionItemName, inspectionItemCode);
-        if (dataDict == null || dataDict.size() == 0) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时还没有该型号类型的字典信息！", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, dataDict, locale);
-    }
-
-    /**
-     * 根据id查询字典信息，用于数据回显，方便进行修改操作
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping("/selectDataDictById")
-    public String selectDataDictById(@RequestParam("id") Integer id) {
-        Locale locale = LocaleContextHolder.getLocale();
-        Optional<DataDict> byId = dataDictDao.findById(id);
-        if (byId.isEmpty()) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时还没有该型号类型的字典信息！", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, byId.get(), locale);
-    }
-
-    /**
-     * 根据id修改字典信息
-     *
-     * @param dataDictUpdateQo
-     * @return
-     */
-    @PostMapping("/updateDict")
-    @Transactional(rollbackOn = Exception.class)
-    public String updateDict(@RequestBody DataDictUpdateQo dataDictUpdateQo) {
-        Locale locale = LocaleContextHolder.getLocale();
-        dataDictDao.updateDict(dataDictUpdateQo.getId(), dataDictUpdateQo.getInspectionItemName());
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "修改成功！", locale);
-    }
-}

src/main/java/com/xkrs/controller/DataSourceController.java

@@ -1,85 +0,0 @@
-package com.xkrs.controller;
-
-import com.xkrs.dao.DataSourceDao;
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.DataSource;
-import com.xkrs.model.qo.DataSourceQo;
-import com.xkrs.service.DataSourceService;
-import com.xkrs.util.DataSourceQuery;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Locale;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 17:05
- */
-@RestController
-public class DataSourceController {
-
-    @Resource
-    private DataSourceService dataSourceService;
-
-    @Resource
-    private DataSourceQuery dataSourceQuery;
-
-    @Resource
-    private DataSourceDao dataSourceDao;
-
-    /**
-     * 添加测量数据
-     *
-     * @param dataSourceQo
-     * @return
-     */
-    @PostMapping("/insertDataSource")
-    public String insertDataSource(@RequestBody DataSourceQo dataSourceQo) {
-        return dataSourceService.insertDataSource(dataSourceQo);
-    }
-
-    /**
-     * 查询某一产品的测量信息
-     *
-     * @param lotNo         批次号
-     * @param machineNo     机器号
-     * @param materialNo    物料号
-     * @param modelNo       模具号
-     * @param machineTypeNo 机种号
-     * @param craftItemName 工艺项目名称
-     * @return
-     */
-    @GetMapping("/selectDataSource")
-    public String selectDataSource(@RequestParam(required = false, value = "lotNo") String lotNo,
-                                   @RequestParam(required = false, value = "machineNo") String machineNo,
-                                   @RequestParam(required = false, value = "materialNo") String materialNo,
-                                   @RequestParam(required = false, value = "modelNo") String modelNo,
-                                   @RequestParam(required = false, value = "machineTypeNo") String machineTypeNo,
-                                   @RequestParam(required = false, value = "craftItemName") String craftItemName) {
-        Locale locale = LocaleContextHolder.getLocale();
-        List<DataSource> dataSources = dataSourceQuery.selectDataSource(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName);
-        if (dataSources == null || dataSources.size() == 0) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的测量信息！", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, dataSources, locale);
-    }
-
-    /**
-     * 查询全部的测量信息
-     *
-     * @return
-     */
-    @GetMapping("/selectAllSource")
-    public String selectAllSource() {
-        Locale locale = LocaleContextHolder.getLocale();
-        List<DataSource> dataSources = dataSourceDao.findAll();
-        if (dataSources.size() == 0) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的测量信息！", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, dataSources, locale);
-    }
-}

src/main/java/com/xkrs/controller/PictureController.java

@@ -1,60 +0,0 @@
-package com.xkrs.controller;
-
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.PictureEntity;
-import com.xkrs.model.qo.PictureQo;
-import com.xkrs.service.PictureService;
-import com.xkrs.util.PictureQuery;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/20 16:01
- */
-@RestController
-public class PictureController {
-
-    @Resource
-    private PictureService pictureService;
-
-    @Resource
-    private PictureQuery pictureQuery;
-
-    /**
-     * 上传图片
-     */
-    @PostMapping("/insertPicture")
-    public String insertPicture(PictureQo pictureQo, @RequestParam("filePicture") MultipartFile filePicture) throws IOException {
-        return pictureService.insertPicture(pictureQo, filePicture);
-    }
-
-    /**
-     * 查询图片
-     */
-    @GetMapping("/selectPicture")
-    public String selectPicture(@RequestParam(required = false, value = "lotNo") String lotNo,
-                                @RequestParam(required = false, value = "machineNo") String machineNo,
-                                @RequestParam(required = false, value = "materialNo") String materialNo,
-                                @RequestParam(required = false, value = "modelNo") String modelNo,
-                                @RequestParam(required = false, value = "machineTypeNo") String machineTypeNo,
-                                @RequestParam(required = false, value = "craftItemName") String craftItemName) {
-        Locale locale = LocaleContextHolder.getLocale();
-        List<PictureEntity> pictureEntities = pictureQuery.selectPicture(lotNo, machineNo, materialNo, modelNo, machineTypeNo,craftItemName);
-        if (pictureEntities.isEmpty()) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该图片！", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, pictureEntities, locale);
-    }
-}

src/main/java/com/xkrs/controller/QcItemController.java

@@ -0,0 +1,50 @@
+package com.xkrs.controller;
+
+import com.xkrs.model.qo.QcItemQoDelete;
+import com.xkrs.model.qo.QcItemQoInsert;
+import com.xkrs.model.qo.QcItemQoUpdate;
+import com.xkrs.service.QcItemService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+public class QcItemController {
+
+    @Resource
+    private QcItemService qcItemService;
+
+    /**
+     * 添加检验项目
+     */
+    @PostMapping("/insertQcItem")
+    public String insertQcItem(@RequestBody QcItemQoInsert insertQo) {
+        return qcItemService.insertQcItem(insertQo);
+    }
+
+    /**
+     * 删除检验项目
+     */
+    @PostMapping("/deleteQcItem")
+    public String deleteQcItem(@RequestBody QcItemQoDelete deleteQo) {
+        return qcItemService.deleteQcItem(deleteQo);
+    }
+
+    /**
+     * 更新检验项目名称
+     */
+    @PostMapping("/updateQcItem")
+    public String updateQcItem(@RequestBody QcItemQoUpdate updateQo) {
+        return qcItemService.updateQcItem(updateQo);
+    }
+
+    /**
+     * 查询检验项目
+     */
+    @GetMapping("/queryQcItem")
+    public String queryQcItem(@RequestParam(required = false, value = "no") String no, @RequestParam(required = false, value = "name") String name) {
+        return qcItemService.queryQcItem(no, name);
+    }
+
+
+}

src/main/java/com/xkrs/controller/QcSourceController.java

@@ -0,0 +1,41 @@
+package com.xkrs.controller;
+
+import com.xkrs.model.qo.QcSourceQoDelete;
+import com.xkrs.model.qo.QcSourceQoInsert;
+import com.xkrs.service.QcSourceService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+
+@RestController
+public class QcSourceController {
+
+    @Resource
+    private QcSourceService qcSourceService;
+
+    /**
+     * 添加检验数据
+     */
+    @PostMapping("/insertQcSource")
+    public String insertQcSource(QcSourceQoInsert insertQo, @RequestParam(required = false, value = "picture") MultipartFile picture) {
+        return qcSourceService.insertQcSource(insertQo, picture);
+    }
+
+    /**
+     * 删除检验数据
+     */
+    @PostMapping("/deleteQcSource")
+    public String deleteQcSource(@RequestBody QcSourceQoDelete deleteQo) {
+        return qcSourceService.deleteQcSource(deleteQo);
+    }
+
+    /**
+     * 查询检验数据
+     */
+    @GetMapping("/queryQcSource")
+    public String queryQcSource(@RequestParam(required = false, value = "batchNo") String batchNo, @RequestParam(required = false, value = "machineNo") String machineNo, @RequestParam(required = false, value = "materialNo") String materialNo, @RequestParam(required = false, value = "mouldNo") String mouldNo, @RequestParam(required = false, value = "varietyNo") String varietyNo) {
+        return qcSourceService.queryQcSource(batchNo, machineNo, materialNo, mouldNo, varietyNo);
+    }
+
+}

src/main/java/com/xkrs/controller/QcSpecController.java

@@ -0,0 +1,49 @@
+package com.xkrs.controller;
+
+import com.xkrs.model.qo.QcSpecQoDelete;
+import com.xkrs.model.qo.QcSpecQoInsert;
+import com.xkrs.model.qo.QcSpecQoUpdate;
+import com.xkrs.service.QcSpecService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+public class QcSpecController {
+
+    @Resource
+    private QcSpecService qcSpecService;
+
+    /**
+     * 添加检验规格
+     */
+    @PostMapping("/insertQcSpec")
+    public String insertQcSpec(@RequestBody QcSpecQoInsert insertQo) {
+        return qcSpecService.insertQcSpec(insertQo);
+    }
+
+    /**
+     * 删除检验规格
+     */
+    @PostMapping("/deleteQcSpec")
+    public String deleteQcSpec(@RequestBody QcSpecQoDelete deleteQo) {
+        return qcSpecService.deleteQcSpec(deleteQo);
+    }
+
+    /**
+     * 更新检验规格
+     */
+    @PostMapping("/updateQcSpec")
+    public String updateQcSpec(@RequestBody QcSpecQoUpdate updateQo) {
+        return qcSpecService.updateQcSpec(updateQo);
+    }
+
+    /**
+     * 查询检验规格
+     */
+    @GetMapping("/queryQcSpec")
+    public String queryQcSpec(@RequestParam(required = false, value = "varietyNo") String varietyNo, @RequestParam(required = false, value = "qcItemNo") String qcItemNo) {
+        return qcSpecService.queryQcSpec(varietyNo, qcItemNo);
+    }
+
+}

src/main/java/com/xkrs/controller/SpecController.java

@@ -1,55 +0,0 @@
-package com.xkrs.controller;
-
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.SpecEntity;
-import com.xkrs.model.qo.SpecQo;
-import com.xkrs.service.SpecService;
-import com.xkrs.util.SpecQuery;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Locale;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/20 16:01
- */
-@RestController
-public class SpecController {
-
-    @Resource
-    private SpecService specService;
-
-    @Resource
-    private SpecQuery specQuery;
-
-    /**
-     * 添加规格数据
-     *
-     * @param specQo
-     */
-    @PostMapping("/insertSpec")
-    public String insertSpec(@RequestBody SpecQo specQo) {
-        return specService.insertSpec(specQo);
-    }
-
-    /**
-     * 查询规格信息
-     */
-    @GetMapping("/selectSpec")
-    public String selectSpec(@RequestParam(required = false, value = "machineTypeNo") String machineTypeNo,
-                             @RequestParam(required = false, value = "inspectionItemCode") String inspectionItemCode,
-                             @RequestParam(required = false, value = "craftItemName") String craftItemName) {
-        Locale locale = LocaleContextHolder.getLocale();
-        List<SpecEntity> specEntities = specQuery.selectSpec(machineTypeNo, inspectionItemCode, craftItemName);
-        if (specEntities.isEmpty()) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该规格信息！", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, specEntities, locale);
-    }
-
-}

src/main/java/com/xkrs/dao/DataDictDao.java

@@ -1,42 +0,0 @@
-package com.xkrs.dao;
-
-import com.xkrs.model.entity.DataDict;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 10:03
- */
-@Component
-public interface DataDictDao extends JpaRepository<DataDict,Long>, JpaSpecificationExecutor<DataDict> {
-
-    /**
-     * 通过质检项代码查询字典表的数据
-     * @param inspectionItemCode
-     * @return
-     */
-    Optional<DataDict> findByInspectionItemCode(String inspectionItemCode);
-
-    /**
-     * 根据id查询字典信息
-     * @param id
-     * @return
-     */
-    Optional<DataDict> findById(Integer id);
-
-    /**
-     * 根据id修改字典的信息
-     * @param id
-     * @param inspectionItemName
-     */
-    @Modifying(clearAutomatically=true)
-    @Query(value = "UPDATE qc_inspection_item_dict SET inspection_item_name = ?2 where id = ?1",nativeQuery = true)
-    void updateDict(Integer id, String inspectionItemName);
-}

src/main/java/com/xkrs/dao/DataSourceDao.java

@@ -1,19 +0,0 @@
-package com.xkrs.dao;
-
-import com.xkrs.model.entity.DataSource;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 16:41
- */
-@Component
-public interface DataSourceDao extends JpaRepository<DataSource, Long>, JpaSpecificationExecutor<DataSource> {
-
-}

src/main/java/com/xkrs/dao/PictureDao.java

@@ -1,32 +0,0 @@
-package com.xkrs.dao;
-
-import com.xkrs.model.entity.PictureEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Component;
-
-import java.util.Optional;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 16:41
- */
-@Component
-public interface PictureDao extends JpaRepository<PictureEntity, Long>, JpaSpecificationExecutor<PictureEntity> {
-
-    /**
-     * 查询图片信息
-     *
-     * @param lotNo         批次号
-     * @param machineNo     机器号
-     * @param materialNo    物料号
-     * @param modelNo       模具号
-     * @param machineTypeNo 机种号
-     * @param craftItemName 工艺项目名称
-     * @return
-     */
-    @Query(value = "SELECT * FROM qc_inspection_picture WHERE lot_no = ? AND machine_no = ? AND material_no = ? AND model_no = ? AND machine_type_no = ? AND craft_item_name = ? ", nativeQuery = true)
-    Optional<PictureEntity> selectPicture(String lotNo, String machineNo, String materialNo, String modelNo, String machineTypeNo, String craftItemName);
-
-}

src/main/java/com/xkrs/dao/QcItemDao.java

@@ -0,0 +1,34 @@
+package com.xkrs.dao;
+
+import com.xkrs.model.entity.QcItemEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * 检验项目Dao
+ */
+@Component
+public interface QcItemDao extends JpaRepository<QcItemEntity, Integer>, JpaSpecificationExecutor<QcItemEntity> {
+
+    Optional<QcItemEntity> findByNo(String no);
+
+    /**
+     * 更新检验项目名称
+     */
+    @Modifying(clearAutomatically = true)
+    @Query(value = "UPDATE qc_item SET update_time = ?2, name = ?3 WHERE id = ?1", nativeQuery = true)
+    void updateNameById(Integer id, String updateTime, String name);
+
+    /**
+     * 查询检验项目
+     */
+    @Query(value = "SELECT id, no, name, type FROM qc_item WHERE no LIKE %?1% AND name LIKE %?2% ORDER BY create_time ASC", nativeQuery = true)
+    List<Map<String, Object>> queryQcItem(String no, String name);
+}

src/main/java/com/xkrs/dao/QcSourceDao.java

@@ -0,0 +1,21 @@
+package com.xkrs.dao;
+
+import com.xkrs.model.entity.QcSourceEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 检验数据Dao
+ */
+@Component
+public interface QcSourceDao extends JpaRepository<QcSourceEntity, Integer>, JpaSpecificationExecutor<QcSourceEntity> {
+
+    @Query(value = "SELECT id, batch_no AS batchNo, machine_no AS machineNo, material_no AS materialNo, mould_no AS mouldNo, variety_no AS varietyNo, qc_item_no AS qcItemNo, qc_value AS qcValue FROM qc_source WHERE batch_no LIKE %?1% AND machine_no LIKE %?2% AND material_no LIKE %?3% AND mould_no LIKE %?4% AND variety_no LIKE %?5% ORDER BY create_time DESC", nativeQuery = true)
+    List<Map<String, Object>> queryQcSource(String batchNo, String machineNo, String materialNo, String mouldNo, String varietyNo);
+
+}

src/main/java/com/xkrs/dao/QcSpecDao.java

@@ -0,0 +1,31 @@
+package com.xkrs.dao;
+
+import com.xkrs.model.entity.QcSpecEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@Component
+public interface QcSpecDao extends JpaRepository<QcSpecEntity, Integer>, JpaSpecificationExecutor<QcSpecEntity> {
+
+    Optional<QcSpecEntity> findByVarietyNoAndQcItemNo(String varietyNo, String qcItemNo);
+
+    /**
+     * 更新检验规格
+     */
+    @Modifying(clearAutomatically = true)
+    @Query(value = "UPDATE qc_spec SET update_time = ?2, max = ?3, mean = ?4, min = ?5, unit = ?6, method = ?7, standard = ?8, remark = ?9 WHERE id = ?1", nativeQuery = true)
+    void updateQcSpecById(Integer id, String updateTime, String max, String mean, String min, String unit, String method, String standard, String remark);
+
+    /**
+     * 查询检验规格
+     */
+    @Query(value = "SELECT id, variety_no AS varietyNo, qc_item_no AS qcItemNo, max, mean, min, unit, method, standard, remark FROM qc_spec WHERE variety_no LIKE %?1% AND qc_item_no LIKE %?2% ORDER BY create_time ASC", nativeQuery = true)
+    List<Map<String, Object>> queryQcSpec(String varietyNo, String qcItemNo);
+}

src/main/java/com/xkrs/dao/SpecDao.java

@@ -1,18 +0,0 @@
-package com.xkrs.dao;
-
-import com.xkrs.model.entity.SpecEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 16:41
- */
-@Component
-public interface SpecDao extends JpaRepository<SpecEntity, Long>, JpaSpecificationExecutor<SpecEntity> {
-
-}

src/main/java/com/xkrs/encapsulation/EncapsulationObejct.java

@@ -4,8 +4,9 @@ import java.io.Serializable;
 
 /**
  * 输出信息对象
- * @author tajochen
+ *
  * @param <T>
+ * @author tajochen
  */
 public class EncapsulationObejct<T> implements Serializable {
 
@@ -50,10 +51,6 @@ public class EncapsulationObejct<T> implements Serializable {
 
     @Override
     public String toString() {
-        return "EncapsulationObejct{" +
-                "status=" + status +
-                ", msg='" + msg + '\'' +
-                ", data=" + data +
-                '}';
+        return "EncapsulationObejct{" + "status=" + status + ", msg='" + msg + '\'' + ", data=" + data + '}';
     }
 }

src/main/java/com/xkrs/encapsulation/OutputEncapsulation.java

@@ -21,6 +21,7 @@ import java.util.Properties;
 
 /**
  * 输出信息封装
+ *
  * @author tajochen
  */
 @Component
@@ -30,6 +31,7 @@ public class OutputEncapsulation {
 
     /**
      * 读取多国语言文件
+     *
      * @return
      */
     public static MessageSource messageSource() {
@@ -50,6 +52,7 @@ public class OutputEncapsulation {
 
     /**
      * 封装输出数据
+     *
      * @param promptMessageEnum
      * @param obj
      * @return
@@ -58,12 +61,12 @@ public class OutputEncapsulation {
 
         EncapsulationObejct encapsulationObejct = new EncapsulationObejct();
         encapsulationObejct.setStatus(promptMessageEnum.getCode());
-        encapsulationObejct.setMsg(messageSource().getMessage(promptMessageEnum.getText(),null,locale));
+        encapsulationObejct.setMsg(messageSource().getMessage(promptMessageEnum.getText(), null, locale));
         encapsulationObejct.setData(obj);
 
         ObjectMapper objectMapper = new ObjectMapper();
         // 忽略无法转换的对象
-        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS,false);
+        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
         // 忽略json字符串中不识别的属性
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         // 解决jackson无法反序列化LocalDateTime的问题,引入jsr310标准
@@ -82,15 +85,16 @@ public class OutputEncapsulation {
 
     /**
      * 输出请求值检验错误信息
+     *
      * @param fieldErrors
      * @return
      */
-    public static String outputEncapsulationErrorList(List<FieldError> fieldErrors, Locale locale){
+    public static String outputEncapsulationErrorList(List<FieldError> fieldErrors, Locale locale) {
         List<String> 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));
+            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);
+        return outputEncapsulationObject(PromptMessageEnum.PARAM_ILLEGAL, errorMsg, locale);
     }
 }

src/main/java/com/xkrs/model/entity/DataDict.java

@@ -1,68 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 9:26
- */
-@Entity
-@Table(name = "qc_inspection_item_dict")
-public class DataDict {
-
-    /**
-     * 索引
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "qc_inspection_item_dict_seq_gen")
-    @SequenceGenerator(name = "qc_inspection_item_dict_seq_gen", sequenceName = "qc_inspection_item_dict_id_seq", allocationSize = 1)
-    private Integer id;
-
-    /**
-     * 质检项代码
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String inspectionItemCode;
-
-    /**
-     * 质检项名称
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String inspectionItemName;
-
-    public DataDict() {
-    }
-
-    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 + '\'' +
-                '}';
-    }
-}

src/main/java/com/xkrs/model/entity/DataSource.java

@@ -1,148 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 14:08
- */
-@Entity
-@Table(name = "qc_inspection_data_source")
-public class DataSource {
-
-    /**
-     * 主键id
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "qc_inspection_data_source_seq_gen")
-    @SequenceGenerator(name = "qc_inspection_data_source_seq_gen", sequenceName = "qc_inspection_data_source_id_seq", allocationSize = 1)
-    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 machineTypeNo;
-
-    /**
-     * 检验项代码
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String inspectionItemCode;
-
-    /**
-     * 工艺项目名称
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String craftItemName;
-
-    /**
-     * 检验数值
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String inspectValue;
-
-    public DataSource() {
-    }
-
-    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 getMachineTypeNo() {
-        return machineTypeNo;
-    }
-
-    public void setMachineTypeNo(String machineTypeNo) {
-        this.machineTypeNo = machineTypeNo;
-    }
-
-    public String getInspectionItemCode() {
-        return inspectionItemCode;
-    }
-
-    public void setInspectionItemCode(String inspectionItemCode) {
-        this.inspectionItemCode = inspectionItemCode;
-    }
-
-    public String getCraftItemName() {
-        return craftItemName;
-    }
-
-    public void setCraftItemName(String craftItemName) {
-        this.craftItemName = craftItemName;
-    }
-
-    public String getInspectValue() {
-        return inspectValue;
-    }
-
-    public void setInspectValue(String inspectValue) {
-        this.inspectValue = inspectValue;
-    }
-
-    @Override
-    public String toString() {
-        return "DataSource{" + "id=" + id + ", lotNo='" + lotNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", modelNo='" + modelNo + '\'' + ", machineTypeNo='" + machineTypeNo + '\'' + ", inspectionItemCode='" + inspectionItemCode + '\'' + ", craftItemName='" + craftItemName + '\'' + ", inspectValue='" + inspectValue + '\'' + '}';
-    }
-}

src/main/java/com/xkrs/model/entity/FileEntity.java

@@ -143,16 +143,6 @@ public class FileEntity {
 
     @Override
     public String toString() {
-        return "FileEntity{" +
-                "id=" + id +
-                ", lotNo='" + lotNo + '\'' +
-                ", machineNo='" + machineNo + '\'' +
-                ", materialNo='" + materialNo + '\'' +
-                ", modelNo='" + modelNo + '\'' +
-                ", machineTypeNo='" + machineTypeNo + '\'' +
-                ", craftItemName='" + craftItemName + '\'' +
-                ", fileUploadPath='" + fileUploadPath + '\'' +
-                ", fileDownloadPath='" + fileDownloadPath + '\'' +
-                '}';
+        return "FileEntity{" + "id=" + id + ", lotNo='" + lotNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", modelNo='" + modelNo + '\'' + ", machineTypeNo='" + machineTypeNo + '\'' + ", craftItemName='" + craftItemName + '\'' + ", fileUploadPath='" + fileUploadPath + '\'' + ", fileDownloadPath='" + fileDownloadPath + '\'' + '}';
     }
 }

src/main/java/com/xkrs/model/entity/PictureEntity.java

@@ -1,138 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-
-@Entity
-@Table(name = "qc_inspection_picture")
-public class PictureEntity {
-    /**
-     * 主键id
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "qc_inspection_picture_seq_gen")
-    @SequenceGenerator(name = "qc_inspection_picture_seq_gen", sequenceName = "qc_inspection_picture_id_seq", allocationSize = 1)
-    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 machineTypeNo;
-
-    /**
-     * 工艺项目名称
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String craftItemName;
-
-    /**
-     * 图片路径
-     */
-    @Column(length = 2048, columnDefinition = "varchar(2048)")
-    private String picturePath;
-
-    public PictureEntity() {
-    }
-
-    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 getMachineTypeNo() {
-        return machineTypeNo;
-    }
-
-    public void setMachineTypeNo(String machineTypeNo) {
-        this.machineTypeNo = machineTypeNo;
-    }
-
-    public String getCraftItemName() {
-        return craftItemName;
-    }
-
-    public void setCraftItemName(String craftItemName) {
-        this.craftItemName = craftItemName;
-    }
-
-    public String getPicturePath() {
-        return picturePath;
-    }
-
-    public void setPicturePath(String picturePath) {
-        this.picturePath = picturePath;
-    }
-
-    @Override
-    public String toString() {
-        return "PictureEntity{" +
-                "id=" + id +
-                ", lotNo='" + lotNo + '\'' +
-                ", machineNo='" + machineNo + '\'' +
-                ", materialNo='" + materialNo + '\'' +
-                ", modelNo='" + modelNo + '\'' +
-                ", machineTypeNo='" + machineTypeNo + '\'' +
-                ", craftItemName='" + craftItemName + '\'' +
-                ", picturePath='" + picturePath + '\'' +
-                '}';
-    }
-}

src/main/java/com/xkrs/model/entity/QcItemEntity.java

@@ -0,0 +1,107 @@
+package com.xkrs.model.entity;
+
+import javax.persistence.*;
+
+/**
+ * 检验项目
+ */
+@Entity
+@Table(name = "qc_item")
+public class QcItemEntity {
+
+    /**
+     * 主键id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "qc_item_seq_gen")
+    @SequenceGenerator(name = "qc_item_seq_gen", sequenceName = "qc_item_id_seq", allocationSize = 1)
+    private Integer id;
+
+    /**
+     * 创建时间
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String updateTime;
+
+    /**
+     * 编号
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String no;
+
+    /**
+     * 名称
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String name;
+
+    /**
+     * 类型
+     * "0":文本格式
+     * "1":图片格式
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String type;
+
+    public QcItemEntity() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String toString() {
+        return "QcItemEntity{" + "id=" + id + ", createTime='" + createTime + '\'' + ", updateTime='" + updateTime + '\'' + ", no='" + no + '\'' + ", name='" + name + '\'' + ", type='" + type + '\'' + '}';
+    }
+}

src/main/java/com/xkrs/model/entity/QcSourceEntity.java

@@ -0,0 +1,147 @@
+package com.xkrs.model.entity;
+
+import javax.persistence.*;
+
+/**
+ * 检验数据
+ */
+@Entity
+@Table(name = "qc_source")
+public class QcSourceEntity {
+
+    /**
+     * 主键id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "qc_source_seq_gen")
+    @SequenceGenerator(name = "qc_source_seq_gen", sequenceName = "qc_source_id_seq", allocationSize = 1)
+    private Integer id;
+
+    /**
+     * 创建时间
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String createTime;
+
+    /**
+     * 批次号
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String batchNo;
+
+    /**
+     * 机器号
+     */
+    @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 mouldNo;
+
+    /**
+     * 机种号
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String varietyNo;
+
+    /**
+     * 检验项目编号
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String qcItemNo;
+
+    /**
+     * 数值
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String qcValue;
+
+    public QcSourceEntity() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
+
+    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 getMouldNo() {
+        return mouldNo;
+    }
+
+    public void setMouldNo(String mouldNo) {
+        this.mouldNo = mouldNo;
+    }
+
+    public String getVarietyNo() {
+        return varietyNo;
+    }
+
+    public void setVarietyNo(String varietyNo) {
+        this.varietyNo = varietyNo;
+    }
+
+    public String getQcItemNo() {
+        return qcItemNo;
+    }
+
+    public void setQcItemNo(String qcItemNo) {
+        this.qcItemNo = qcItemNo;
+    }
+
+    public String getQcValue() {
+        return qcValue;
+    }
+
+    public void setQcValue(String qcValue) {
+        this.qcValue = qcValue;
+    }
+
+    @Override
+    public String toString() {
+        return "QcSourceEntity{" + "id=" + id + ", createTime='" + createTime + '\'' + ", batchNo='" + batchNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", mouldNo='" + mouldNo + '\'' + ", varietyNo='" + varietyNo + '\'' + ", qcItemNo='" + qcItemNo + '\'' + ", qcValue='" + qcValue + '\'' + '}';
+    }
+}

src/main/java/com/xkrs/model/entity/QcSpecEntity.java

@@ -2,34 +2,44 @@ package com.xkrs.model.entity;
 
 import javax.persistence.*;
 
+/**
+ * 检验规格
+ */
 @Entity
-@Table(name = "qc_inspection_spec")
-public class SpecEntity {
+@Table(name = "qc_spec")
+public class QcSpecEntity {
+
     /**
      * 主键id
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "qc_inspection_spec_seq_gen")
-    @SequenceGenerator(name = "qc_inspection_spec_seq_gen", sequenceName = "qc_inspection_spec_id_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "qc_spec_seq_gen")
+    @SequenceGenerator(name = "qc_spec_seq_gen", sequenceName = "qc_spec_id_seq", allocationSize = 1)
     private Integer id;
 
+    /**
+     * 创建时间
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String updateTime;
+
     /**
      * 机种号
      */
     @Column(length = 85, columnDefinition = "varchar(85)")
-    private String machineTypeNo;
+    private String varietyNo;
 
     /**
-     * 检验项代码
+     * 检验项目编号
      */
     @Column(length = 85, columnDefinition = "varchar(85)")
-    private String inspectionItemCode;
-
-    /**
-     * 工艺项目名称
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String craftItemName;
+    private String qcItemNo;
 
     /**
      * 最大值
@@ -59,13 +69,13 @@ public class SpecEntity {
      * 检验方法
      */
     @Column(length = 85, columnDefinition = "varchar(85)")
-    private String inspectionMethod;
+    private String method;
 
     /**
      * 检验标准
      */
     @Column(length = 85, columnDefinition = "varchar(85)")
-    private String inspectionStandard;
+    private String standard;
 
     /**
      * 备注
@@ -73,7 +83,7 @@ public class SpecEntity {
     @Column(length = 85, columnDefinition = "varchar(85)")
     private String remark;
 
-    public SpecEntity() {
+    public QcSpecEntity() {
     }
 
     public Integer getId() {
@@ -84,28 +94,36 @@ public class SpecEntity {
         this.id = id;
     }
 
-    public String getMachineTypeNo() {
-        return machineTypeNo;
+    public String getCreateTime() {
+        return createTime;
     }
 
-    public void setMachineTypeNo(String machineTypeNo) {
-        this.machineTypeNo = machineTypeNo;
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
     }
 
-    public String getInspectionItemCode() {
-        return inspectionItemCode;
+    public String getUpdateTime() {
+        return updateTime;
     }
 
-    public void setInspectionItemCode(String inspectionItemCode) {
-        this.inspectionItemCode = inspectionItemCode;
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
     }
 
-    public String getCraftItemName() {
-        return craftItemName;
+    public String getVarietyNo() {
+        return varietyNo;
     }
 
-    public void setCraftItemName(String craftItemName) {
-        this.craftItemName = craftItemName;
+    public void setVarietyNo(String varietyNo) {
+        this.varietyNo = varietyNo;
+    }
+
+    public String getQcItemNo() {
+        return qcItemNo;
+    }
+
+    public void setQcItemNo(String qcItemNo) {
+        this.qcItemNo = qcItemNo;
     }
 
     public String getMax() {
@@ -140,20 +158,20 @@ public class SpecEntity {
         this.unit = unit;
     }
 
-    public String getInspectionMethod() {
-        return inspectionMethod;
+    public String getMethod() {
+        return method;
     }
 
-    public void setInspectionMethod(String inspectionMethod) {
-        this.inspectionMethod = inspectionMethod;
+    public void setMethod(String method) {
+        this.method = method;
     }
 
-    public String getInspectionStandard() {
-        return inspectionStandard;
+    public String getStandard() {
+        return standard;
     }
 
-    public void setInspectionStandard(String inspectionStandard) {
-        this.inspectionStandard = inspectionStandard;
+    public void setStandard(String standard) {
+        this.standard = standard;
     }
 
     public String getRemark() {
@@ -166,18 +184,6 @@ public class SpecEntity {
 
     @Override
     public String toString() {
-        return "SpecEntity{" +
-                "id=" + id +
-                ", machineTypeNo='" + machineTypeNo + '\'' +
-                ", inspectionItemCode='" + inspectionItemCode + '\'' +
-                ", craftItemName='" + craftItemName + '\'' +
-                ", max='" + max + '\'' +
-                ", mean='" + mean + '\'' +
-                ", min='" + min + '\'' +
-                ", unit='" + unit + '\'' +
-                ", inspectionMethod='" + inspectionMethod + '\'' +
-                ", inspectionStandard='" + inspectionStandard + '\'' +
-                ", remark='" + remark + '\'' +
-                '}';
+        return "QcSpecEntity{" + "id=" + id + ", createTime='" + createTime + '\'' + ", updateTime='" + updateTime + '\'' + ", varietyNo='" + varietyNo + '\'' + ", qcItemNo='" + qcItemNo + '\'' + ", max='" + max + '\'' + ", mean='" + mean + '\'' + ", min='" + min + '\'' + ", unit='" + unit + '\'' + ", method='" + method + '\'' + ", standard='" + standard + '\'' + ", remark='" + remark + '\'' + '}';
     }
 }

src/main/java/com/xkrs/model/qo/DataDictQo.java

@@ -1,43 +0,0 @@
-package com.xkrs.model.qo;
-
-import com.xkrs.model.validation.DataDictQoInsert;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 10:14
- */
-public class DataDictQo {
-
-    /**
-     * 质检项代码
-     */
-    @NotBlank(message = "{DataDict.inspectionItemCode.blank}", groups = {DataDictQoInsert.class})
-    private String inspectionItemCode;
-
-    /**
-     * 质检项名称
-     */
-    @NotBlank(message = "{DataDict.inspectionItemName.blank}", groups = {DataDictQoInsert.class})
-    private String inspectionItemName;
-
-    public DataDictQo() {
-    }
-
-    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;
-    }
-}

src/main/java/com/xkrs/model/qo/DataDictUpdateQo.java

@@ -1,40 +0,0 @@
-package com.xkrs.model.qo;
-
-import com.xkrs.model.validation.DataDictUpdateQoUpdate;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/20 11:23
- */
-public class DataDictUpdateQo {
-
-    @NotBlank(message = "{DataDict.id.blank}", groups = {DataDictUpdateQoUpdate.class})
-    private Integer id;
-
-    /**
-     * 质检项名称
-     */
-    @NotBlank(message = "{DataDict.inspectionItemName.blank}", groups = {DataDictUpdateQoUpdate.class})
-    private String inspectionItemName;
-
-    public DataDictUpdateQo() {
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getInspectionItemName() {
-        return inspectionItemName;
-    }
-
-    public void setInspectionItemName(String inspectionItemName) {
-        this.inspectionItemName = inspectionItemName;
-    }
-}

src/main/java/com/xkrs/model/qo/DataSourceQo.java

@@ -1,128 +0,0 @@
-package com.xkrs.model.qo;
-
-import com.xkrs.model.validation.DataSourceQoInsert;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 16:37
- */
-public class DataSourceQo {
-
-    /**
-     * 批次号
-     */
-    @NotBlank(message = "{DataSource.lotNo.blank}", groups = {DataSourceQoInsert.class})
-    private String lotNo;
-
-    /**
-     * 机器号
-     */
-    @NotBlank(message = "{DataSource.machineNo.blank}", groups = {DataSourceQoInsert.class})
-    private String machineNo;
-
-    /**
-     * 物料号
-     */
-    @NotBlank(message = "{DataSource.materialNo.blank}", groups = {DataSourceQoInsert.class})
-    private String materialNo;
-
-    /**
-     * 模具号
-     */
-    @NotBlank(message = "{DataSource.modelNo.blank}", groups = {DataSourceQoInsert.class})
-    private String modelNo;
-
-    /**
-     * 机种号
-     */
-    @NotBlank(message = "{DataSource.machineTypeNo.blank}", groups = {DataSourceQoInsert.class})
-    private String machineTypeNo;
-
-    /**
-     * 检验项代码
-     */
-    @NotBlank(message = "{DataSource.inspectionItemCode.blank}", groups = {DataSourceQoInsert.class})
-    private String inspectionItemCode;
-
-    /**
-     * 工艺项目名称
-     */
-    @NotBlank(message = "{DataSource.craftItemName.blank}", groups = {DataSourceQoInsert.class})
-    private String craftItemName;
-
-    /**
-     * 检验数值
-     */
-    @NotBlank(message = "{DataSource.inspectValue.blank}", groups = {DataSourceQoInsert.class})
-    private String inspectValue;
-
-    public DataSourceQo() {
-    }
-
-    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 getMachineTypeNo() {
-        return machineTypeNo;
-    }
-
-    public void setMachineTypeNo(String machineTypeNo) {
-        this.machineTypeNo = machineTypeNo;
-    }
-
-    public String getInspectionItemCode() {
-        return inspectionItemCode;
-    }
-
-    public void setInspectionItemCode(String inspectionItemCode) {
-        this.inspectionItemCode = inspectionItemCode;
-    }
-
-    public String getCraftItemName() {
-        return craftItemName;
-    }
-
-    public void setCraftItemName(String craftItemName) {
-        this.craftItemName = craftItemName;
-    }
-
-    public String getInspectValue() {
-        return inspectValue;
-    }
-
-    public void setInspectValue(String inspectValue) {
-        this.inspectValue = inspectValue;
-    }
-
-}

src/main/java/com/xkrs/model/qo/FileQo.java

@@ -1,6 +1,6 @@
 package com.xkrs.model.qo;
 
-import com.xkrs.model.validation.FileQoInsert;
+import com.xkrs.model.va.FileQoInsert;
 
 import javax.validation.constraints.NotBlank;
 

src/main/java/com/xkrs/model/qo/PictureQo.java

@@ -1,95 +0,0 @@
-package com.xkrs.model.qo;
-
-import com.xkrs.model.validation.PictureQoInsert;
-
-import javax.validation.constraints.NotBlank;
-
-public class PictureQo {
-
-    /**
-     * 批次号
-     */
-    @NotBlank(message = "{PictureEntity.lotNo.blank}", groups = {PictureQoInsert.class})
-    private String lotNo;
-
-    /**
-     * 机器号
-     */
-    @NotBlank(message = "{PictureEntity.machineNo.blank}", groups = {PictureQoInsert.class})
-    private String machineNo;
-
-    /**
-     * 物料号
-     */
-    @NotBlank(message = "{PictureEntity.materialNo.blank}", groups = {PictureQoInsert.class})
-    private String materialNo;
-
-    /**
-     * 模具号
-     */
-    @NotBlank(message = "{PictureEntity.modelNo.blank}", groups = {PictureQoInsert.class})
-    private String modelNo;
-
-    /**
-     * 机种号
-     */
-    @NotBlank(message = "{PictureEntity.machineTypeNo.blank}", groups = {PictureQoInsert.class})
-    private String machineTypeNo;
-
-    /**
-     * 工艺项目名称
-     */
-    @NotBlank(message = "{PictureEntity.craftItemName.blank}", groups = {PictureQoInsert.class})
-    private String craftItemName;
-
-    public PictureQo() {
-    }
-
-    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 getMachineTypeNo() {
-        return machineTypeNo;
-    }
-
-    public void setMachineTypeNo(String machineTypeNo) {
-        this.machineTypeNo = machineTypeNo;
-    }
-
-    public String getCraftItemName() {
-        return craftItemName;
-    }
-
-    public void setCraftItemName(String craftItemName) {
-        this.craftItemName = craftItemName;
-    }
-}

src/main/java/com/xkrs/model/qo/QcItemQoDelete.java

@@ -0,0 +1,33 @@
+package com.xkrs.model.qo;
+
+import com.xkrs.model.va.QcItemQoDeleteVa;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 删除检验项目接收类
+ */
+public class QcItemQoDelete {
+
+    /**
+     * 主键id
+     */
+    @NotBlank(message = "{QcItemEntity.id.blank}", groups = {QcItemQoDeleteVa.class})
+    private Integer id;
+
+    public QcItemQoDelete() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return "QcItemQoDelete{" + "id=" + id + '}';
+    }
+}

src/main/java/com/xkrs/model/qo/QcItemQoInsert.java

@@ -0,0 +1,61 @@
+package com.xkrs.model.qo;
+
+import com.xkrs.model.va.QcItemQoInsertVa;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 新增检验项目接收类
+ */
+public class QcItemQoInsert {
+
+    /**
+     * 编号
+     */
+    @NotBlank(message = "{QcItemEntity.no.blank}", groups = {QcItemQoInsertVa.class})
+    private String no;
+
+    /**
+     * 名称
+     */
+    @NotBlank(message = "{QcItemEntity.name.blank}", groups = {QcItemQoInsertVa.class})
+    private String name;
+
+    /**
+     * 类型
+     */
+    @NotBlank(message = "{QcItemEntity.type.blank}", groups = {QcItemQoInsertVa.class})
+    private String type;
+
+    public QcItemQoInsert() {
+    }
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String toString() {
+        return "QcItemQoInsert{" + "no='" + no + '\'' + ", name='" + name + '\'' + ", type='" + type + '\'' + '}';
+    }
+}

src/main/java/com/xkrs/model/qo/QcItemQoUpdate.java

@@ -0,0 +1,47 @@
+package com.xkrs.model.qo;
+
+import com.xkrs.model.va.QcItemQoUpdateVa;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 更新检验项目接收类
+ */
+public class QcItemQoUpdate {
+
+    /**
+     * 主键id
+     */
+    @NotBlank(message = "{QcItemEntity.id.blank}", groups = {QcItemQoUpdateVa.class})
+    private Integer id;
+
+    /**
+     * 名称
+     */
+    @NotBlank(message = "{QcItemEntity.name.blank}", groups = {QcItemQoUpdateVa.class})
+    private String name;
+
+    public QcItemQoUpdate() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "QcItemQoUpdate{" + "id=" + id + ", name='" + name + '\'' + '}';
+    }
+}

src/main/java/com/xkrs/model/qo/QcSourceQoDelete.java

@@ -0,0 +1,33 @@
+package com.xkrs.model.qo;
+
+import com.xkrs.model.va.QcSourceQoDeleteVa;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 删除检验数据接收类
+ */
+public class QcSourceQoDelete {
+
+    /**
+     * 主键id
+     */
+    @NotBlank(message = "{QcSourceEntity.id.blank}", groups = {QcSourceQoDeleteVa.class})
+    private Integer id;
+
+    public QcSourceQoDelete() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return "QcSourceQoDelete{" + "id=" + id + '}';
+    }
+}

src/main/java/com/xkrs/model/qo/QcSourceQoInsert.java

@@ -0,0 +1,116 @@
+package com.xkrs.model.qo;
+
+import com.xkrs.model.va.QcSourceQoInsertVa;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 新增检验数据接收类
+ */
+public class QcSourceQoInsert {
+
+    /**
+     * 批次号
+     */
+    @NotBlank(message = "{QcSourceEntity.batchNo.blank}", groups = {QcSourceQoInsertVa.class})
+    private String batchNo;
+
+    /**
+     * 机器号
+     */
+    @NotBlank(message = "{QcSourceEntity.machineNo.blank}", groups = {QcSourceQoInsertVa.class})
+    private String machineNo;
+
+    /**
+     * 物料号
+     */
+    @NotBlank(message = "{QcSourceEntity.materialNo.blank}", groups = {QcSourceQoInsertVa.class})
+    private String materialNo;
+
+    /**
+     * 模具号
+     */
+    @NotBlank(message = "{QcSourceEntity.mouldNo.blank}", groups = {QcSourceQoInsertVa.class})
+    private String mouldNo;
+
+    /**
+     * 机种号
+     */
+    @NotBlank(message = "{QcSourceEntity.varietyNo.blank}", groups = {QcSourceQoInsertVa.class})
+    private String varietyNo;
+
+    /**
+     * 检验项目编号
+     */
+    @NotBlank(message = "{QcSourceEntity.qcItemNo.blank}", groups = {QcSourceQoInsertVa.class})
+    private String qcItemNo;
+
+    /**
+     * 数值
+     */
+    private String qcValue;
+
+    public QcSourceQoInsert() {
+    }
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
+
+    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 getMouldNo() {
+        return mouldNo;
+    }
+
+    public void setMouldNo(String mouldNo) {
+        this.mouldNo = mouldNo;
+    }
+
+    public String getVarietyNo() {
+        return varietyNo;
+    }
+
+    public void setVarietyNo(String varietyNo) {
+        this.varietyNo = varietyNo;
+    }
+
+    public String getQcItemNo() {
+        return qcItemNo;
+    }
+
+    public void setQcItemNo(String qcItemNo) {
+        this.qcItemNo = qcItemNo;
+    }
+
+    public String getQcValue() {
+        return qcValue;
+    }
+
+    public void setQcValue(String qcValue) {
+        this.qcValue = qcValue;
+    }
+
+    @Override
+    public String toString() {
+        return "QcSourceQoInsert{" + "batchNo='" + batchNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", mouldNo='" + mouldNo + '\'' + ", varietyNo='" + varietyNo + '\'' + ", qcItemNo='" + qcItemNo + '\'' + ", qcValue='" + qcValue + '\'' + '}';
+    }
+}

src/main/java/com/xkrs/model/qo/QcSpecQoDelete.java

@@ -0,0 +1,33 @@
+package com.xkrs.model.qo;
+
+import com.xkrs.model.va.QcSpecQoDeleteVa;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 删除检验规格接收类
+ */
+public class QcSpecQoDelete {
+
+    /**
+     * 主键id
+     */
+    @NotBlank(message = "{QcSpecEntity.id.blank}", groups = {QcSpecQoDeleteVa.class})
+    private Integer id;
+
+    public QcSpecQoDelete() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return "QcSpecQoDelete{" + "id=" + id + '}';
+    }
+}

src/main/java/com/xkrs/model/qo/QcSpecQoInsert.java

@@ -0,0 +1,138 @@
+package com.xkrs.model.qo;
+
+import com.xkrs.model.va.QcSpecQoInsertVa;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 新增检验规格接收类
+ */
+public class QcSpecQoInsert {
+
+    /**
+     * 机种号
+     */
+    @NotBlank(message = "{QcSpecEntity.varietyNo.blank}", groups = {QcSpecQoInsertVa.class})
+    private String varietyNo;
+
+    /**
+     * 检验项目编号
+     */
+    @NotBlank(message = "{QcSpecEntity.qcItemNo.blank}", groups = {QcSpecQoInsertVa.class})
+    private String qcItemNo;
+
+    /**
+     * 最大值
+     */
+    private String max;
+
+    /**
+     * 平均值
+     */
+    private String mean;
+
+    /**
+     * 最小值
+     */
+    private String min;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 检验方法
+     */
+    private String method;
+
+    /**
+     * 检验标准
+     */
+    private String standard;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public QcSpecQoInsert() {
+    }
+
+    public String getVarietyNo() {
+        return varietyNo;
+    }
+
+    public void setVarietyNo(String varietyNo) {
+        this.varietyNo = varietyNo;
+    }
+
+    public String getQcItemNo() {
+        return qcItemNo;
+    }
+
+    public void setQcItemNo(String qcItemNo) {
+        this.qcItemNo = qcItemNo;
+    }
+
+    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 getMethod() {
+        return method;
+    }
+
+    public void setMethod(String method) {
+        this.method = method;
+    }
+
+    public String getStandard() {
+        return standard;
+    }
+
+    public void setStandard(String standard) {
+        this.standard = standard;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "QcSpecQoInsert{" + "varietyNo='" + varietyNo + '\'' + ", qcItemNo='" + qcItemNo + '\'' + ", max='" + max + '\'' + ", mean='" + mean + '\'' + ", min='" + min + '\'' + ", unit='" + unit + '\'' + ", method='" + method + '\'' + ", standard='" + standard + '\'' + ", remark='" + remark + '\'' + '}';
+    }
+}

src/main/java/com/xkrs/model/qo/QcSpecQoUpdate.java

@@ -0,0 +1,124 @@
+package com.xkrs.model.qo;
+
+import com.xkrs.model.va.QcSpecQoUpdateVa;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 更新检验规格接收类
+ */
+public class QcSpecQoUpdate {
+
+    /**
+     * 主键id
+     */
+    @NotBlank(message = "{QcSpecEntity.id.blank}", groups = {QcSpecQoUpdateVa.class})
+    private Integer id;
+
+    /**
+     * 最大值
+     */
+    private String max;
+
+    /**
+     * 平均值
+     */
+    private String mean;
+
+    /**
+     * 最小值
+     */
+    private String min;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 检验方法
+     */
+    private String method;
+
+    /**
+     * 检验标准
+     */
+    private String standard;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public QcSpecQoUpdate() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    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 getMethod() {
+        return method;
+    }
+
+    public void setMethod(String method) {
+        this.method = method;
+    }
+
+    public String getStandard() {
+        return standard;
+    }
+
+    public void setStandard(String standard) {
+        this.standard = standard;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "QcSpecQoUpdate{" + "id=" + id + ", max='" + max + '\'' + ", mean='" + mean + '\'' + ", min='" + min + '\'' + ", unit='" + unit + '\'' + ", method='" + method + '\'' + ", standard='" + standard + '\'' + ", remark='" + remark + '\'' + '}';
+    }
+}

src/main/java/com/xkrs/model/qo/SpecQo.java

@@ -1,150 +0,0 @@
-package com.xkrs.model.qo;
-
-import com.xkrs.model.validation.SpecQoInsert;
-
-import javax.validation.constraints.NotBlank;
-
-public class SpecQo {
-
-    /**
-     * 机种号
-     */
-    @NotBlank(message = "{SpecEntity.machineTypeNo.blank}", groups = {SpecQoInsert.class})
-    private String machineTypeNo;
-
-    /**
-     * 检验项代码
-     */
-    @NotBlank(message = "{SpecEntity.inspectionItemCode.blank}", groups = {SpecQoInsert.class})
-    private String inspectionItemCode;
-
-    /**
-     * 工艺项目名称
-     */
-    @NotBlank(message = "{SpecEntity.craftItemName.blank}", groups = {SpecQoInsert.class})
-    private String craftItemName;
-
-    /**
-     * 最大值
-     */
-    @NotBlank(message = "{SpecEntity.max.blank}", groups = {SpecQoInsert.class})
-    private String max;
-
-    /**
-     * 平均值
-     */
-    @NotBlank(message = "{SpecEntity.mean.blank}", groups = {SpecQoInsert.class})
-    private String mean;
-
-    /**
-     * 最小值
-     */
-    @NotBlank(message = "{SpecEntity.min.blank}", groups = {SpecQoInsert.class})
-    private String min;
-
-    /**
-     * 单位
-     */
-    @NotBlank(message = "{SpecEntity.unit.blank}", groups = {SpecQoInsert.class})
-    private String unit;
-
-    /**
-     * 检验方法
-     */
-    @NotBlank(message = "{SpecEntity.inspectionMethod.blank}", groups = {SpecQoInsert.class})
-    private String inspectionMethod;
-
-    /**
-     * 检验标准
-     */
-    @NotBlank(message = "{SpecEntity.inspectionStandard.blank}", groups = {SpecQoInsert.class})
-    private String inspectionStandard;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public SpecQo() {
-    }
-
-    public String getMachineTypeNo() {
-        return machineTypeNo;
-    }
-
-    public void setMachineTypeNo(String machineTypeNo) {
-        this.machineTypeNo = machineTypeNo;
-    }
-
-    public String getInspectionItemCode() {
-        return inspectionItemCode;
-    }
-
-    public void setInspectionItemCode(String inspectionItemCode) {
-        this.inspectionItemCode = inspectionItemCode;
-    }
-
-    public String getCraftItemName() {
-        return craftItemName;
-    }
-
-    public void setCraftItemName(String craftItemName) {
-        this.craftItemName = craftItemName;
-    }
-
-    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;
-    }
-}

src/main/java/com/xkrs/model/va/FileQoInsert.java

@@ -1,4 +1,4 @@
-package com.xkrs.model.validation;
+package com.xkrs.model.va;
 
 /**
  * @Author: XinYi Song

src/main/java/com/xkrs/model/va/QcItemQoDeleteVa.java

@@ -0,0 +1,4 @@
+package com.xkrs.model.va;
+
+public interface QcItemQoDeleteVa {
+}

src/main/java/com/xkrs/model/va/QcItemQoInsertVa.java

@@ -0,0 +1,4 @@
+package com.xkrs.model.va;
+
+public interface QcItemQoInsertVa {
+}

src/main/java/com/xkrs/model/va/QcItemQoUpdateVa.java

@@ -0,0 +1,4 @@
+package com.xkrs.model.va;
+
+public interface QcItemQoUpdateVa {
+}

src/main/java/com/xkrs/model/va/QcSourceQoDeleteVa.java

@@ -0,0 +1,4 @@
+package com.xkrs.model.va;
+
+public interface QcSourceQoDeleteVa {
+}

src/main/java/com/xkrs/model/va/QcSourceQoInsertVa.java

@@ -0,0 +1,4 @@
+package com.xkrs.model.va;
+
+public interface QcSourceQoInsertVa {
+}

src/main/java/com/xkrs/model/va/QcSpecQoDeleteVa.java

@@ -0,0 +1,4 @@
+package com.xkrs.model.va;
+
+public interface QcSpecQoDeleteVa {
+}

src/main/java/com/xkrs/model/va/QcSpecQoInsertVa.java

@@ -0,0 +1,4 @@
+package com.xkrs.model.va;
+
+public interface QcSpecQoInsertVa {
+}

src/main/java/com/xkrs/model/va/QcSpecQoUpdateVa.java

@@ -0,0 +1,4 @@
+package com.xkrs.model.va;
+
+public interface QcSpecQoUpdateVa {
+}

src/main/java/com/xkrs/model/validation/DataDictQoInsert.java

@@ -1,8 +0,0 @@
-package com.xkrs.model.validation;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 10:22
- */
-public interface DataDictQoInsert {
-}

src/main/java/com/xkrs/model/validation/DataDictUpdateQoUpdate.java

@@ -1,8 +0,0 @@
-package com.xkrs.model.validation;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/20 11:23
- */
-public interface DataDictUpdateQoUpdate {
-}

src/main/java/com/xkrs/model/validation/DataSourceQoInsert.java

@@ -1,8 +0,0 @@
-package com.xkrs.model.validation;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 16:39
- */
-public interface DataSourceQoInsert {
-}

src/main/java/com/xkrs/model/validation/FileUpdateQoUpdate.java

@@ -1,8 +0,0 @@
-package com.xkrs.model.validation;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/20 16:21
- */
-public interface FileUpdateQoUpdate {
-}

src/main/java/com/xkrs/model/validation/PictureQoInsert.java

@@ -1,8 +0,0 @@
-package com.xkrs.model.validation;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/20 15:26
- */
-public interface PictureQoInsert {
-}

src/main/java/com/xkrs/model/validation/SpecQoInsert.java

@@ -1,8 +0,0 @@
-package com.xkrs.model.validation;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 10:22
- */
-public interface SpecQoInsert {
-}

src/main/java/com/xkrs/service/DataDictService.java

@@ -1,18 +0,0 @@
-package com.xkrs.service;
-
-import com.xkrs.model.entity.DataDict;
-import com.xkrs.model.qo.DataDictQo;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 10:10
- */
-public interface DataDictService {
-
-    /**
-     * 添加字典数据
-     * @param dataDictQo
-     * @return
-     */
-    String insertDataDict(DataDictQo dataDictQo);
-}

src/main/java/com/xkrs/service/DataSourceService.java

@@ -1,17 +0,0 @@
-package com.xkrs.service;
-
-import com.xkrs.model.qo.DataSourceQo;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 16:42
- */
-public interface DataSourceService {
-
-    /**
-     * 添加测量数据
-     * @param dataSourceQo
-     * @return
-     */
-    String insertDataSource(DataSourceQo dataSourceQo);
-}

src/main/java/com/xkrs/service/FileService.java

@@ -4,7 +4,6 @@ import com.xkrs.model.qo.FileQo;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
@@ -15,13 +14,15 @@ public interface FileService {
 
     /**
      * 添加模板信息
+     *
      * @param fileQo
      * @return
      */
-    String insertFileExcel(FileQo fileQo,MultipartFile fileExcel) throws IOException;
+    String insertFileExcel(FileQo fileQo, MultipartFile fileExcel) throws IOException;
 
     /**
      * 导出excel
+     *
      * @param fileQo
      * @return
      */

src/main/java/com/xkrs/service/PictureService.java

@@ -1,19 +0,0 @@
-package com.xkrs.service;
-
-import com.xkrs.model.qo.PictureQo;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/20 15:24
- */
-public interface PictureService {
-
-    /**
-     * 添加图片
-     */
-    String insertPicture(PictureQo pictureQo, MultipartFile pictureFile)throws IOException;
-
-}

src/main/java/com/xkrs/service/QcItemService.java

@@ -0,0 +1,29 @@
+package com.xkrs.service;
+
+import com.xkrs.model.qo.QcItemQoDelete;
+import com.xkrs.model.qo.QcItemQoInsert;
+import com.xkrs.model.qo.QcItemQoUpdate;
+
+public interface QcItemService {
+
+    /**
+     * 添加检验项目
+     */
+    String insertQcItem(QcItemQoInsert insertQo);
+
+    /**
+     * 删除检验项目
+     */
+    String deleteQcItem(QcItemQoDelete deleteQo);
+
+    /**
+     * 更新检验项目名称
+     */
+    String updateQcItem(QcItemQoUpdate updateQo);
+
+    /**
+     * 查询检验项目
+     */
+    String queryQcItem(String no, String name);
+
+}

src/main/java/com/xkrs/service/QcSourceService.java

@@ -0,0 +1,24 @@
+package com.xkrs.service;
+
+import com.xkrs.model.qo.QcSourceQoDelete;
+import com.xkrs.model.qo.QcSourceQoInsert;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface QcSourceService {
+
+    /**
+     * 添加检验数据
+     */
+    String insertQcSource(QcSourceQoInsert insertQo, MultipartFile picture);
+
+    /**
+     * 删除检验数据
+     */
+    String deleteQcSource(QcSourceQoDelete deleteQo);
+
+    /**
+     * 查询检验数据
+     */
+    String queryQcSource(String batchNo, String machineNo, String materialNo, String mouldNo, String varietyNo);
+
+}

src/main/java/com/xkrs/service/QcSpecService.java

@@ -0,0 +1,29 @@
+package com.xkrs.service;
+
+import com.xkrs.model.qo.QcSpecQoDelete;
+import com.xkrs.model.qo.QcSpecQoInsert;
+import com.xkrs.model.qo.QcSpecQoUpdate;
+
+public interface QcSpecService {
+
+    /**
+     * 添加检验规格
+     */
+    String insertQcSpec(QcSpecQoInsert insertQo);
+
+    /**
+     * 删除检验规格
+     */
+    String deleteQcSpec(QcSpecQoDelete deleteQo);
+
+    /**
+     * 更新检验规格
+     */
+    String updateQcSpec(QcSpecQoUpdate updateQo);
+
+    /**
+     * 查询检验规格
+     */
+    String queryQcSpec(String varietyNo, String qcItemNo);
+
+}

src/main/java/com/xkrs/service/SpecService.java

@@ -1,19 +0,0 @@
-package com.xkrs.service;
-
-import com.xkrs.model.qo.SpecQo;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/20 15:24
- */
-public interface SpecService {
-
-    /**
-     * 添加规格数据
-     *
-     * @param specQo
-     * @return
-     */
-    String insertSpec(SpecQo specQo);
-
-}

src/main/java/com/xkrs/service/impl/DataDictServiceImpl.java

@@ -1,46 +0,0 @@
-package com.xkrs.service.impl;
-
-import com.xkrs.dao.DataDictDao;
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.DataDict;
-import com.xkrs.model.qo.DataDictQo;
-import com.xkrs.service.DataDictService;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Locale;
-import java.util.Optional;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 10:28
- */
-@Service
-public class DataDictServiceImpl implements DataDictService {
-
-    @Resource
-    private DataDictDao dataDictDao;
-
-    /**
-     * 添加字典数据
-     *
-     * @param dataDictQo
-     * @return
-     */
-    @Override
-    public String insertDataDict(DataDictQo dataDictQo) {
-        Locale locale = LocaleContextHolder.getLocale();
-        Optional<DataDict> byInspectionItemCode = dataDictDao.findByInspectionItemCode(dataDictQo.getInspectionItemCode());
-        if (byInspectionItemCode.isPresent()) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "该产品变量已存在，请勿重复添加！", locale);
-        }
-        DataDict dataDict = new DataDict();
-        dataDict.setInspectionItemName(dataDictQo.getInspectionItemName());
-        dataDict.setInspectionItemCode(dataDictQo.getInspectionItemCode());
-        dataDictDao.save(dataDict);
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
-    }
-}

src/main/java/com/xkrs/service/impl/DataSourceServiceImpl.java

@@ -1,57 +0,0 @@
-package com.xkrs.service.impl;
-
-import com.xkrs.dao.DataDictDao;
-import com.xkrs.dao.DataSourceDao;
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.DataDict;
-import com.xkrs.model.entity.DataSource;
-import com.xkrs.model.qo.DataSourceQo;
-import com.xkrs.service.DataSourceService;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Locale;
-import java.util.Optional;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 16:43
- */
-@Service
-public class DataSourceServiceImpl implements DataSourceService {
-
-    @Resource
-    private DataSourceDao dataSourceDao;
-
-    @Resource
-    private DataDictDao dataDictDao;
-
-    /**
-     * 添加测量数据
-     *
-     * @param dataSourceQo
-     * @return
-     */
-    @Override
-    public String insertDataSource(DataSourceQo dataSourceQo) {
-        Locale locale = LocaleContextHolder.getLocale();
-        Optional<DataDict> byInspectionItemCode = dataDictDao.findByInspectionItemCode(dataSourceQo.getInspectionItemCode());
-        if (byInspectionItemCode.isEmpty()) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该字典类型！", locale);
-        }
-        DataSource dataSource = new DataSource();
-        dataSource.setLotNo(dataSourceQo.getLotNo());
-        dataSource.setMachineNo(dataSourceQo.getMachineNo());
-        dataSource.setMaterialNo(dataSourceQo.getMaterialNo());
-        dataSource.setModelNo(dataSourceQo.getModelNo());
-        dataSource.setMachineTypeNo(dataSourceQo.getMachineTypeNo());
-        dataSource.setCraftItemName(dataSourceQo.getCraftItemName());
-        dataSource.setInspectionItemCode(dataSourceQo.getInspectionItemCode());
-        dataSource.setInspectValue(dataSourceQo.getInspectValue());
-        dataSourceDao.save(dataSource);
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
-    }
-}

src/main/java/com/xkrs/service/impl/FileServiceImpl.java

@@ -1,12 +1,11 @@
 package com.xkrs.service.impl;
 
 import com.xkrs.dao.FileDao;
+import com.xkrs.dao.QcSourceDao;
 import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.DataSource;
 import com.xkrs.model.entity.FileEntity;
 import com.xkrs.model.qo.FileQo;
 import com.xkrs.service.FileService;
-import com.xkrs.util.DataSourceQuery;
 import com.xkrs.util.ExcelUploadUtil;
 import com.xkrs.util.ExportExcel;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -32,7 +31,7 @@ public class FileServiceImpl implements FileService {
     private FileDao fileDao;
 
     @Resource
-    private DataSourceQuery dataSourceQuery;
+    private QcSourceDao qcSourceDao;
 
     /**
      * 添加模板信息
@@ -89,13 +88,13 @@ public class FileServiceImpl implements FileService {
             return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的模板，请添加！", locale);
         }
         String fileUploadPath = fileEntity.get().getFileUploadPath();
-        List<DataSource> dataSources = dataSourceQuery.selectDataSource(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName);
-        if (dataSources == null || dataSources.size() == 0) {
+        List<Map<String, Object>> resultList = qcSourceDao.queryQcSource(lotNo, machineNo, materialNo, modelNo, machineTypeNo);
+        if (resultList == null || resultList.size() == 0) {
             return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的信息！", locale);
         }
         Map<String, String> map = new HashMap<>();
-        for (DataSource dataSource : dataSources) {
-            map.put(dataSource.getInspectionItemCode(), dataSource.getInspectValue());
+        for (Map<String, Object> result : resultList) {
+            map.put((String) result.get("qcItemNo"), (String) result.get("qcValue"));
         }
         String fill = ExportExcel.exportToProveExcel(map, fileUploadPath);
         fileDao.updateFileDownloadPath(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName, fill);

src/main/java/com/xkrs/service/impl/PictureServiceImpl.java

@@ -1,51 +0,0 @@
-package com.xkrs.service.impl;
-
-import com.xkrs.dao.PictureDao;
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.PictureEntity;
-import com.xkrs.model.qo.PictureQo;
-import com.xkrs.service.PictureService;
-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 java.util.Optional;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-@Service
-public class PictureServiceImpl implements PictureService {
-
-    @Resource
-    private PictureDao pictureDao;
-
-    @Override
-    public String insertPicture(PictureQo pictureQo, MultipartFile pictureFile) throws IOException {
-        Locale locale = LocaleContextHolder.getLocale();
-        String lotNo = pictureQo.getLotNo();
-        String machineNo = pictureQo.getMachineNo();
-        String materialNo = pictureQo.getMaterialNo();
-        String modelNo = pictureQo.getModelNo();
-        String machineTypeNo = pictureQo.getMachineTypeNo();
-        String craftItemName = pictureQo.getCraftItemName();
-        Optional<PictureEntity> pictureEntity2 = pictureDao.selectPicture(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName);
-        if (pictureEntity2.isPresent()) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "请勿重复添加!", locale);
-        }
-        String file = ExcelUploadUtil.memoryFile(pictureFile, 2);
-        PictureEntity pictureEntity1 = new PictureEntity();
-        pictureEntity1.setLotNo(lotNo);
-        pictureEntity1.setMachineNo(machineNo);
-        pictureEntity1.setMaterialNo(materialNo);
-        pictureEntity1.setModelNo(modelNo);
-        pictureEntity1.setMachineTypeNo(machineTypeNo);
-        pictureEntity1.setCraftItemName(craftItemName);
-        pictureEntity1.setPicturePath(file);
-        pictureDao.save(pictureEntity1);
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
-    }
-}

src/main/java/com/xkrs/service/impl/QcItemServiceImpl.java

@@ -0,0 +1,96 @@
+package com.xkrs.service.impl;
+
+import com.xkrs.dao.QcItemDao;
+import com.xkrs.encapsulation.PromptMessageEnum;
+import com.xkrs.model.entity.QcItemEntity;
+import com.xkrs.model.qo.QcItemQoDelete;
+import com.xkrs.model.qo.QcItemQoInsert;
+import com.xkrs.model.qo.QcItemQoUpdate;
+import com.xkrs.service.QcItemService;
+import com.xkrs.util.LocalDateUtils;
+import com.xkrs.util.LocalStringUtils;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.transaction.Transactional;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
+
+@Service
+public class QcItemServiceImpl implements QcItemService {
+
+    private Locale locale = LocaleContextHolder.getLocale();
+
+    @Resource
+    private QcItemDao qcItemDao;
+
+    /**
+     * 添加检验项目
+     */
+    @Override
+    public String insertQcItem(QcItemQoInsert insertQo) {
+        String no = insertQo.getNo();
+        String name = insertQo.getName();
+        String type = insertQo.getType();
+        Optional<QcItemEntity> entityByNo = qcItemDao.findByNo(no);
+        if (entityByNo.isPresent()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "该检验项目已存在，请勿重复添加！", locale);
+        }
+        QcItemEntity entity = new QcItemEntity();
+        entity.setCreateTime(LocalDateUtils.getCurrentSecond());
+        entity.setUpdateTime("");
+        entity.setNo(LocalStringUtils.formatEmptyValue(no));
+        entity.setName(LocalStringUtils.formatEmptyValue(name));
+        entity.setType(LocalStringUtils.formatEmptyValue(type));
+        qcItemDao.save(entity);
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
+    }
+
+    /**
+     * 删除检验项目
+     */
+    @Transactional(rollbackOn = Exception.class)
+    @Override
+    public String deleteQcItem(QcItemQoDelete deleteQo) {
+        Integer id = deleteQo.getId();
+        Optional<QcItemEntity> entityById = qcItemDao.findById(id);
+        if (entityById.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验项目，请先添加检验项目！", locale);
+        }
+        qcItemDao.deleteById(id);
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "删除成功！", locale);
+    }
+
+    /**
+     * 更新检验项目名称
+     */
+    @Transactional(rollbackOn = Exception.class)
+    @Override
+    public String updateQcItem(QcItemQoUpdate updateQo) {
+        Integer id = updateQo.getId();
+        String name = updateQo.getName();
+        Optional<QcItemEntity> entityById = qcItemDao.findById(id);
+        if (entityById.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验项目，请先添加检验项目！", locale);
+        }
+        qcItemDao.updateNameById(id, LocalDateUtils.getCurrentSecond(), LocalStringUtils.formatEmptyValue(name));
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "更新成功！", locale);
+    }
+
+    /**
+     * 查询检验项目
+     */
+    @Override
+    public String queryQcItem(String no, String name) {
+        List<Map<String, Object>> resultList = qcItemDao.queryQcItem(LocalStringUtils.formatEmptyValue(no), LocalStringUtils.formatEmptyValue(name));
+        if (resultList == null || resultList.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该检验项目的信息！", locale);
+        }
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, resultList, locale);
+    }
+}

src/main/java/com/xkrs/service/impl/QcSourceServiceImpl.java

@@ -0,0 +1,217 @@
+package com.xkrs.service.impl;
+
+import com.xkrs.dao.QcItemDao;
+import com.xkrs.dao.QcSourceDao;
+import com.xkrs.dao.QcSpecDao;
+import com.xkrs.encapsulation.PromptMessageEnum;
+import com.xkrs.model.entity.QcItemEntity;
+import com.xkrs.model.entity.QcSourceEntity;
+import com.xkrs.model.entity.QcSpecEntity;
+import com.xkrs.model.qo.QcSourceQoDelete;
+import com.xkrs.model.qo.QcSourceQoInsert;
+import com.xkrs.service.QcSourceService;
+import com.xkrs.util.Constant;
+import com.xkrs.util.ExcelUploadUtil;
+import com.xkrs.util.LocalDateUtils;
+import com.xkrs.util.LocalStringUtils;
+import org.apache.http.util.TextUtils;
+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.*;
+
+import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
+
+@Service
+public class QcSourceServiceImpl implements QcSourceService {
+
+    private Locale locale = LocaleContextHolder.getLocale();
+
+    @Resource
+    private QcItemDao qcItemDao;
+
+    @Resource
+    private QcSourceDao qcSourceDao;
+
+    @Resource
+    private QcSpecDao qcSpecDao;
+
+    /**
+     * 添加检验数据
+     */
+    @Override
+    public String insertQcSource(QcSourceQoInsert insertQo, MultipartFile picture) {
+        String batchNo = insertQo.getBatchNo();
+        String machineNo = insertQo.getMachineNo();
+        String materialNo = insertQo.getMaterialNo();
+        String mouldNo = insertQo.getMouldNo();
+        String varietyNo = insertQo.getVarietyNo();
+        String qcItemNo = insertQo.getQcItemNo();
+        String qcValue = insertQo.getQcValue();
+        Optional<QcItemEntity> qcItemEntityByNo = qcItemDao.findByNo(qcItemNo);
+        if (qcItemEntityByNo.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验项目，请先添加检验项目！", locale);
+        }
+        if (Constant.QC_ITEM_TYPE_STRING.equals(qcItemEntityByNo.get().getType())) {
+            QcSourceEntity entity = new QcSourceEntity();
+            entity.setCreateTime(LocalDateUtils.getCurrentSecond());
+            entity.setBatchNo(LocalStringUtils.formatEmptyValue(batchNo));
+            entity.setMachineNo(LocalStringUtils.formatEmptyValue(machineNo));
+            entity.setMaterialNo(LocalStringUtils.formatEmptyValue(materialNo));
+            entity.setMouldNo(LocalStringUtils.formatEmptyValue(mouldNo));
+            entity.setVarietyNo(LocalStringUtils.formatEmptyValue(varietyNo));
+            entity.setQcItemNo(LocalStringUtils.formatEmptyValue(qcItemNo));
+            entity.setQcValue(LocalStringUtils.formatEmptyValue(qcValue));
+            qcSourceDao.save(entity);
+            return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
+        }
+        if (Constant.QC_ITEM_TYPE_PICTURE.equals(qcItemEntityByNo.get().getType())) {
+            if (picture == null) {
+                return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "上传图片不能为空！", locale);
+            }
+            String picturePath;
+            try {
+                picturePath = ExcelUploadUtil.memoryFile(picture, 2);
+            } catch (IOException e) {
+                e.printStackTrace();
+                return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "上传图片失败！", locale);
+            }
+            QcSourceEntity entity = new QcSourceEntity();
+            entity.setCreateTime(LocalDateUtils.getCurrentSecond());
+            entity.setBatchNo(LocalStringUtils.formatEmptyValue(batchNo));
+            entity.setMachineNo(LocalStringUtils.formatEmptyValue(machineNo));
+            entity.setMaterialNo(LocalStringUtils.formatEmptyValue(materialNo));
+            entity.setMouldNo(LocalStringUtils.formatEmptyValue(mouldNo));
+            entity.setVarietyNo(LocalStringUtils.formatEmptyValue(varietyNo));
+            entity.setQcItemNo(LocalStringUtils.formatEmptyValue(qcItemNo));
+            entity.setQcValue(LocalStringUtils.formatEmptyValue(picturePath));
+            qcSourceDao.save(entity);
+            return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
+        }
+        return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "添加失败！", locale);
+    }
+
+    /**
+     * 删除检验数据
+     */
+    @Transactional(rollbackOn = Exception.class)
+    @Override
+    public String deleteQcSource(QcSourceQoDelete deleteQo) {
+        Integer id = deleteQo.getId();
+        Optional<QcSourceEntity> entityById = qcSourceDao.findById(id);
+        if (entityById.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验数据，请先添加检验数据！", locale);
+        }
+        qcSourceDao.deleteById(id);
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "删除成功！", locale);
+    }
+
+    /**
+     * 查询检验数据
+     */
+    @Override
+    public String queryQcSource(String batchNo, String machineNo, String materialNo, String mouldNo, String varietyNo) {
+        List<QcItemEntity> qcItemList = qcItemDao.findAll();
+        if (qcItemList.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "未添加检验项目，请先添加检验项目！", locale);
+        }
+        List<Map<String, Object>> sourceList = qcSourceDao.queryQcSource(LocalStringUtils.formatEmptyValue(batchNo), LocalStringUtils.formatEmptyValue(machineNo), LocalStringUtils.formatEmptyValue(materialNo), LocalStringUtils.formatEmptyValue(mouldNo), LocalStringUtils.formatEmptyValue(varietyNo));
+        List<Map<String, Object>> resultList = generateResultList(sourceList);
+        if (resultList.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该检验数据的信息！", locale);
+        }
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, resultList, locale);
+    }
+
+    /**
+     * 生成返回结果
+     */
+    private List<Map<String, Object>> generateResultList(List<Map<String, Object>> sourceList) {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        if (sourceList == null || sourceList.isEmpty()) {
+            return resultList;
+        }
+        for (Map<String, Object> source : sourceList) {
+            String batchNo = (String) source.getOrDefault("batchNo", "");
+            String machineNo = (String) source.getOrDefault("machineNo", "");
+            String materialNo = (String) source.getOrDefault("materialNo", "");
+            String mouldNo = (String) source.getOrDefault("mouldNo", "");
+            String varietyNo = (String) source.getOrDefault("varietyNo", "");
+            String qcItemNo = (String) source.getOrDefault("qcItemNo", "");
+            String qcValue = (String) source.getOrDefault("qcValue", "");
+            if (TextUtils.isEmpty(qcItemNo) || TextUtils.isEmpty(qcValue)) {
+                continue;
+            }
+            String formatValue = getFormatValue(varietyNo, qcItemNo, qcValue);
+            Map<String, Object> emptyRoom = findEmptyRoom(resultList, batchNo, qcItemNo);
+            if (emptyRoom == null) {
+                Map<String, Object> newRoom = new HashMap<>();
+                newRoom.put("batchNo", batchNo);
+                newRoom.put("machineNo", machineNo);
+                newRoom.put("materialNo", materialNo);
+                newRoom.put("mouldNo", mouldNo);
+                newRoom.put("varietyNo", varietyNo);
+                newRoom.put(qcItemNo, formatValue);
+                resultList.add(newRoom);
+            } else {
+                emptyRoom.put(qcItemNo, formatValue);
+            }
+        }
+        return resultList;
+    }
+
+    /**
+     * 获取添加了 ##H 或 ##L 后缀的测量值（如果可能的话）
+     */
+    private String getFormatValue(String varietyNo, String qcItemNo, String qcValue) {
+        Optional<QcSpecEntity> entityByVarietyNoAndQcItemNo = qcSpecDao.findByVarietyNoAndQcItemNo(varietyNo, qcItemNo);
+        if (entityByVarietyNoAndQcItemNo.isEmpty()) {
+            return qcValue;
+        }
+        QcSpecEntity qcSpec = entityByVarietyNoAndQcItemNo.get();
+        double valueMax = stringToDouble(qcSpec.getMax());
+        double valueMin = stringToDouble(qcSpec.getMin());
+        double value = stringToDouble(qcValue);
+        if (valueMax >= 0 && value >= 0 && value >= valueMax) {
+            return qcValue + "##H";
+        }
+        if (valueMin >= 0 && value >= 0 && value <= valueMin) {
+            return qcValue + "##L";
+        }
+        return qcValue;
+    }
+
+    /**
+     * 格式化字符串为Double
+     */
+    private Double stringToDouble(String stringValue) {
+        try {
+            return Double.parseDouble(stringValue);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return -1D;
+        }
+    }
+
+    /**
+     * 尝试找到一个qcItemNo有空位置的Map
+     */
+    private Map<String, Object> findEmptyRoom(List<Map<String, Object>> mapList, String batchNo, String qcItemNo) {
+        if (mapList == null || mapList.isEmpty() || TextUtils.isEmpty(batchNo) || TextUtils.isEmpty(qcItemNo)) {
+            return null;
+        }
+        for (Map<String, Object> room : mapList) {
+            if (room.getOrDefault("batchNo", "").equals(batchNo)) {
+                if (!room.containsKey(qcItemNo)) {
+                    return room;
+                }
+            }
+        }
+        return null;
+    }
+
+}

src/main/java/com/xkrs/service/impl/QcSpecServiceImpl.java

@@ -0,0 +1,131 @@
+package com.xkrs.service.impl;
+
+import com.xkrs.dao.QcItemDao;
+import com.xkrs.dao.QcSpecDao;
+import com.xkrs.encapsulation.PromptMessageEnum;
+import com.xkrs.model.entity.QcItemEntity;
+import com.xkrs.model.entity.QcSpecEntity;
+import com.xkrs.model.qo.QcSpecQoDelete;
+import com.xkrs.model.qo.QcSpecQoInsert;
+import com.xkrs.model.qo.QcSpecQoUpdate;
+import com.xkrs.service.QcSpecService;
+import com.xkrs.util.LocalDateUtils;
+import com.xkrs.util.LocalStringUtils;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.transaction.Transactional;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
+
+@Service
+public class QcSpecServiceImpl implements QcSpecService {
+
+    private Locale locale = LocaleContextHolder.getLocale();
+
+    @Resource
+    private QcItemDao qcItemDao;
+
+    @Resource
+    private QcSpecDao qcSpecDao;
+
+    /**
+     * 添加检验规格
+     */
+    @Override
+    public String insertQcSpec(QcSpecQoInsert insertQo) {
+
+        String varietyNo = insertQo.getVarietyNo();
+        String qcItemNo = insertQo.getQcItemNo();
+        String max = insertQo.getMax();
+        String mean = insertQo.getMean();
+        String min = insertQo.getMin();
+        String unit = insertQo.getUnit();
+        String method = insertQo.getMethod();
+        String standard = insertQo.getStandard();
+        String remark = insertQo.getRemark();
+
+        Optional<QcItemEntity> entityByNo = qcItemDao.findByNo(qcItemNo);
+        if (entityByNo.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验项目，请先添加检验项目！", locale);
+        }
+
+        Optional<QcSpecEntity> entityByVarietyNoAndQcItemNo = qcSpecDao.findByVarietyNoAndQcItemNo(varietyNo, qcItemNo);
+        if (entityByVarietyNoAndQcItemNo.isPresent()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "该检验规格已存在，请勿重复添加！", locale);
+        }
+        QcSpecEntity entity = new QcSpecEntity();
+        entity.setCreateTime(LocalDateUtils.getCurrentSecond());
+        entity.setUpdateTime("");
+        entity.setVarietyNo(LocalStringUtils.formatEmptyValue(varietyNo));
+        entity.setQcItemNo(LocalStringUtils.formatEmptyValue(qcItemNo));
+        entity.setMax(LocalStringUtils.formatEmptyValue(max));
+        entity.setMean(LocalStringUtils.formatEmptyValue(mean));
+        entity.setMin(LocalStringUtils.formatEmptyValue(min));
+        entity.setUnit(LocalStringUtils.formatEmptyValue(unit));
+        entity.setMethod(LocalStringUtils.formatEmptyValue(method));
+        entity.setStandard(LocalStringUtils.formatEmptyValue(standard));
+        entity.setRemark(LocalStringUtils.formatEmptyValue(remark));
+        qcSpecDao.save(entity);
+
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
+    }
+
+    /**
+     * 删除检验规格
+     */
+    @Transactional(rollbackOn = Exception.class)
+    @Override
+    public String deleteQcSpec(QcSpecQoDelete deleteQo) {
+        Integer id = deleteQo.getId();
+        Optional<QcSpecEntity> entityById = qcSpecDao.findById(id);
+        if (entityById.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验规格，请先添加检验规格！", locale);
+        }
+        qcSpecDao.deleteById(id);
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "删除成功！", locale);
+    }
+
+    /**
+     * 更新检验规格
+     */
+    @Transactional(rollbackOn = Exception.class)
+    @Override
+    public String updateQcSpec(QcSpecQoUpdate updateQo) {
+
+        Integer id = updateQo.getId();
+        String max = updateQo.getMax();
+        String mean = updateQo.getMean();
+        String min = updateQo.getMin();
+        String unit = updateQo.getUnit();
+        String method = updateQo.getMethod();
+        String standard = updateQo.getStandard();
+        String remark = updateQo.getRemark();
+
+        Optional<QcSpecEntity> entityById = qcSpecDao.findById(id);
+        if (entityById.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验规格，请先添加检验规格！", locale);
+        }
+
+        qcSpecDao.updateQcSpecById(id, LocalDateUtils.getCurrentSecond(), LocalStringUtils.formatEmptyValue(max), LocalStringUtils.formatEmptyValue(mean), LocalStringUtils.formatEmptyValue(min), LocalStringUtils.formatEmptyValue(unit), LocalStringUtils.formatEmptyValue(method), LocalStringUtils.formatEmptyValue(standard), LocalStringUtils.formatEmptyValue(remark));
+
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "修改成功！", locale);
+    }
+
+    /**
+     * 查询检验规格
+     */
+    @Override
+    public String queryQcSpec(String varietyNo, String qcItemNo) {
+        List<Map<String, Object>> resultList = qcSpecDao.queryQcSpec(LocalStringUtils.formatEmptyValue(varietyNo), LocalStringUtils.formatEmptyValue(qcItemNo));
+        if (resultList == null || resultList.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该检验规格的信息！", locale);
+        }
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, resultList, locale);
+    }
+}

src/main/java/com/xkrs/service/impl/SpecServiceImpl.java

@@ -1,48 +0,0 @@
-package com.xkrs.service.impl;
-
-import com.xkrs.dao.SpecDao;
-import com.xkrs.encapsulation.PromptMessageEnum;
-import com.xkrs.model.entity.SpecEntity;
-import com.xkrs.model.qo.SpecQo;
-import com.xkrs.service.SpecService;
-import com.xkrs.util.SpecQuery;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Locale;
-
-import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-@Service
-public class SpecServiceImpl implements SpecService {
-
-    @Resource
-    private SpecQuery specQuery;
-
-    @Resource
-    private SpecDao specDao;
-
-    @Override
-    public String insertSpec(SpecQo specQo) {
-        Locale locale = LocaleContextHolder.getLocale();
-        List<SpecEntity> specEntities = specQuery.selectSpec(specQo.getMachineTypeNo(), specQo.getInspectionItemCode(),specQo.getCraftItemName());
-        if (!specEntities.isEmpty()) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "已存在该测量规格!", locale);
-        }
-        SpecEntity specEntity1 = new SpecEntity();
-        specEntity1.setMachineTypeNo(specQo.getMachineTypeNo());
-        specEntity1.setInspectionItemCode(specQo.getInspectionItemCode());
-        specEntity1.setCraftItemName(specQo.getCraftItemName());
-        specEntity1.setMax(specQo.getMax());
-        specEntity1.setMean(specQo.getMean());
-        specEntity1.setMin(specQo.getMin());
-        specEntity1.setUnit(specQo.getUnit());
-        specEntity1.setInspectionMethod(specQo.getInspectionMethod());
-        specEntity1.setInspectionStandard(specQo.getInspectionStandard());
-        specEntity1.setRemark(specQo.getRemark());
-        specDao.save(specEntity1);
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
-    }
-}

src/main/java/com/xkrs/util/Constant.java

@@ -0,0 +1,14 @@
+package com.xkrs.util;
+
+public interface Constant {
+
+    /**
+     * 检验项目类型：文本
+     */
+    String QC_ITEM_TYPE_STRING = "0";
+
+    /**
+     * 检验项目类型：图片
+     */
+    String QC_ITEM_TYPE_PICTURE = "1";
+}

src/main/java/com/xkrs/util/DataDictQuery.java

@@ -1,42 +0,0 @@
-package com.xkrs.util;
-
-import com.xkrs.dao.DataDictDao;
-import com.xkrs.model.entity.DataDict;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 13:56
- */
-@Component
-public class DataDictQuery {
-
-    @Resource
-    private DataDictDao dataDictDao;
-
-    /**
-     * 动态多条件查询字典信息
-     *
-     * @return
-     */
-    public List<DataDict> selectDataDict(String inspectionItemName, String inspectionItemCode) {
-        Specification<DataDict> specification = (root, criteriaQuery, criteriaBuilder) -> {
-            List<Predicate> list = new ArrayList<>();
-            if (inspectionItemName != null && !"".equals(inspectionItemName)) {
-                list.add(criteriaBuilder.equal(root.get("inspectionItemName").as(String.class), inspectionItemName));
-            }
-            if (inspectionItemCode != null && !"".equals(inspectionItemCode)) {
-                list.add(criteriaBuilder.equal(root.get("inspectionItemCode").as(String.class), inspectionItemCode));
-            }
-            Predicate[] predicates = new Predicate[list.size()];
-            return criteriaBuilder.and(list.toArray(predicates));
-        };
-        return dataDictDao.findAll(specification);
-    }
-}

src/main/java/com/xkrs/util/DataSourceQuery.java

@@ -1,55 +0,0 @@
-package com.xkrs.util;
-
-import com.xkrs.dao.DataSourceDao;
-import com.xkrs.model.entity.DataSource;
-import org.apache.http.util.TextUtils;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 13:56
- */
-@Component
-public class DataSourceQuery {
-
-    @Resource
-    private DataSourceDao dataSourceDao;
-
-    /**
-     * 动态多条件查询采集数据信息
-     *
-     * @return
-     */
-    public List<DataSource> selectDataSource(String lotNo, String machineNo, String materialNo, String modelNo, String machineTypeNo, String craftItemName) {
-        Specification<DataSource> specification = (root, criteriaQuery, criteriaBuilder) -> {
-            List<Predicate> list = new ArrayList<>();
-            if (!TextUtils.isEmpty(lotNo)) {
-                list.add(criteriaBuilder.equal(root.get("lotNo").as(String.class), lotNo));
-            }
-            if (!TextUtils.isEmpty(machineNo)) {
-                list.add(criteriaBuilder.equal(root.get("machineNo").as(String.class), machineNo));
-            }
-            if (!TextUtils.isEmpty(materialNo)) {
-                list.add(criteriaBuilder.equal(root.get("materialNo").as(String.class), materialNo));
-            }
-            if (!TextUtils.isEmpty(modelNo)) {
-                list.add(criteriaBuilder.equal(root.get("modelNo").as(String.class), modelNo));
-            }
-            if (!TextUtils.isEmpty(machineTypeNo)) {
-                list.add(criteriaBuilder.equal(root.get("machineTypeNo").as(String.class), machineTypeNo));
-            }
-            if (!TextUtils.isEmpty(craftItemName)) {
-                list.add(criteriaBuilder.equal(root.get("craftItemName").as(String.class), craftItemName));
-            }
-            Predicate[] predicates = new Predicate[list.size()];
-            return criteriaBuilder.and(list.toArray(predicates));
-        };
-        return dataSourceDao.findAll(specification);
-    }
-}

src/main/java/com/xkrs/util/ExcelUploadUtil.java

@@ -48,7 +48,8 @@ public class ExcelUploadUtil {
             String path = "/home/sxy/server/industrial_measurement/" + subDir + newName;
             //实现上传
             fileInput.transferTo(new File(path));
-            return "http://118.24.27.47:2088/" + subDir + newName;
+//            return path;
+            return subDir + newName;
         }
         return null;
     }
@@ -94,31 +95,23 @@ public class ExcelUploadUtil {
         return fireTaskPhotos;
     }*/
 
-
     /**
      * 删除本地或服务器储存的图片
-     *
-     * @param path
-     * @return
      */
-    public static String delFile(String path) {
-        String resultInfo = null;
+    public static String delFile(String path, int subDirType) {
+        String subDir = subDirType == 1 ? "excel/" : "picture/";
         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);
+        String fileName = path.substring(lastIndexOf + 1);
+        String filePath = "/Users/liuchengqian/Desktop/DaJiang/" + subDir + fileName;
+//        String filePath = "/home/sxy/server/industrial_measurement/" + subDir + fileName;
+        File file = new File(filePath);
         if (file.exists()) {
             if (file.delete()) {
-                resultInfo = "删除成功！";
-            } else {
-                resultInfo = "删除失败！";
+                return "删除成功！";
             }
-        } else {
-            resultInfo = "文件不存在";
+            return "删除失败！";
         }
-        return resultInfo;
+        return "文件不存在";
     }
 
     /**

src/main/java/com/xkrs/util/ExportExcel.java

@@ -2,7 +2,8 @@ package com.xkrs.util;
 
 import net.sf.jxls.transformer.XLSTransformer;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import java.io.*;
+
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -39,8 +40,6 @@ public class ExportExcel {
         return "http://118.24.27.47:2088/excel/"+s;
         //return "http://192.168.2.139/"+s;
     }*/
-
-
     public static String exportToProveExcel(Map<String, String> dataMap, String srcFilePath) throws IOException, InvalidFormatException {
         String s = System.currentTimeMillis() + ".xlsx";
         //String path = "E:/shop/"+s;
@@ -51,7 +50,7 @@ public class ExportExcel {
         // 参数：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;
+        return "http://118.24.27.47:2088/excel/" + s;
     }
 
     /*public static void main(String[] args) throws IOException, InvalidFormatException {

src/main/java/com/xkrs/util/LocalDateUtils.java

@@ -0,0 +1,16 @@
+package com.xkrs.util;
+
+import java.util.Date;
+
+public class LocalDateUtils {
+
+    private LocalDateUtils() {
+    }
+
+    public static String getCurrentSecond() {
+
+//        return DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
+        return String.valueOf(new Date().getTime() / 1000L);
+
+    }
+}

src/main/java/com/xkrs/util/LocalStringUtils.java

@@ -0,0 +1,12 @@
+package com.xkrs.util;
+
+public class LocalStringUtils {
+
+    private LocalStringUtils() {
+    }
+
+    public static String formatEmptyValue(String value) {
+        return value == null ? "" : value;
+    }
+
+}

src/main/java/com/xkrs/util/PictureQuery.java

@@ -1,55 +0,0 @@
-package com.xkrs.util;
-
-import com.xkrs.dao.PictureDao;
-import com.xkrs.model.entity.PictureEntity;
-import org.apache.http.util.TextUtils;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 13:56
- */
-@Component
-public class PictureQuery {
-
-    @Resource
-    private PictureDao pictureDao;
-
-    /**
-     * 动态多条件查询图片信息
-     *
-     * @return
-     */
-    public List<PictureEntity> selectPicture(String lotNo, String machineNo, String materialNo, String modelNo, String machineTypeNo, String craftItemName) {
-        Specification<PictureEntity> specification = (root, criteriaQuery, criteriaBuilder) -> {
-            List<Predicate> list = new ArrayList<>();
-            if (!TextUtils.isEmpty(lotNo)) {
-                list.add(criteriaBuilder.equal(root.get("lotNo").as(String.class), lotNo));
-            }
-            if (!TextUtils.isEmpty(machineNo)) {
-                list.add(criteriaBuilder.equal(root.get("machineNo").as(String.class), machineNo));
-            }
-            if (!TextUtils.isEmpty(materialNo)) {
-                list.add(criteriaBuilder.equal(root.get("materialNo").as(String.class), materialNo));
-            }
-            if (!TextUtils.isEmpty(modelNo)) {
-                list.add(criteriaBuilder.equal(root.get("modelNo").as(String.class), modelNo));
-            }
-            if (!TextUtils.isEmpty(machineTypeNo)) {
-                list.add(criteriaBuilder.equal(root.get("machineTypeNo").as(String.class), machineTypeNo));
-            }
-            if (!TextUtils.isEmpty(craftItemName)) {
-                list.add(criteriaBuilder.equal(root.get("craftItemName").as(String.class), craftItemName));
-            }
-            Predicate[] predicates = new Predicate[list.size()];
-            return criteriaBuilder.and(list.toArray(predicates));
-        };
-        return pictureDao.findAll(specification);
-    }
-}

src/main/java/com/xkrs/util/SpecQuery.java

@@ -1,46 +0,0 @@
-package com.xkrs.util;
-
-import com.xkrs.dao.SpecDao;
-import com.xkrs.model.entity.SpecEntity;
-import org.apache.http.util.TextUtils;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 13:56
- */
-@Component
-public class SpecQuery {
-
-    @Resource
-    private SpecDao specDao;
-
-    /**
-     * 动态多条件查询规格信息
-     *
-     * @return
-     */
-    public List<SpecEntity> selectSpec(String machineTypeNo, String inspectionItemCode, String craftItemName) {
-        Specification<SpecEntity> specification = (root, criteriaQuery, criteriaBuilder) -> {
-            List<Predicate> list = new ArrayList<>();
-            if (!TextUtils.isEmpty(machineTypeNo)) {
-                list.add(criteriaBuilder.equal(root.get("machineTypeNo").as(String.class), machineTypeNo));
-            }
-            if (!TextUtils.isEmpty(inspectionItemCode)) {
-                list.add(criteriaBuilder.equal(root.get("inspectionItemCode").as(String.class), inspectionItemCode));
-            }
-            if (!TextUtils.isEmpty(craftItemName)) {
-                list.add(criteriaBuilder.equal(root.get("craftItemName").as(String.class), craftItemName));
-            }
-            Predicate[] predicates = new Predicate[list.size()];
-            return criteriaBuilder.and(list.toArray(predicates));
-        };
-        return specDao.findAll(specification);
-    }
-}