完善图片上传功能

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

@@ -4,7 +4,7 @@ import com.xkrs.dao.QcInspectionDataSourceDao;
 import com.xkrs.encapsulation.PromptMessageEnum;
 import com.xkrs.model.entity.QcInspectionDataSource;
 import com.xkrs.model.qo.QcInspectionDataSourceQo;
-import com.xkrs.service.DataSourceService;
+import com.xkrs.service.QcInspectionDataSourceService;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,10 +22,10 @@ import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObje
  * @Date: 2022/1/19 17:05
  */
 @RestController
-public class DataSourceController {
+public class QcInspectionDataSourceController {
 
     @Resource
-    private DataSourceService dataSourceService;
+    private QcInspectionDataSourceService inspectionDataSourceService;
 
     @Resource
     private QcInspectionDataSourceDao inspectionDataSourceDao;
@@ -38,7 +38,7 @@ public class DataSourceController {
      */
     @PostMapping("/insertDataSource")
     public String insertDataSource(@RequestBody QcInspectionDataSourceQo inspectionDataSourceQo) {
-        return dataSourceService.insertDataSource(inspectionDataSourceQo);
+        return inspectionDataSourceService.insertDataSource(inspectionDataSourceQo);
     }
 
     /**

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

@@ -3,7 +3,7 @@ package com.xkrs.controller;
 import com.xkrs.dao.QcInspectionFileDao;
 import com.xkrs.encapsulation.PromptMessageEnum;
 import com.xkrs.model.qo.QcInspectionFileQo;
-import com.xkrs.service.FileService;
+import com.xkrs.service.QcInspectionFileService;
 import com.xkrs.util.ExcelUploadUtil;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -25,10 +25,10 @@ import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObje
  * @Date: 2022/1/20 16:01
  */
 @RestController
-public class FileController {
+public class QcInspectionFileController {
 
     @Resource
-    private FileService fileService;
+    private QcInspectionFileService inspectionFileService;
 
     @Resource
     private QcInspectionFileDao inspectionFileDao;
@@ -43,7 +43,7 @@ public class FileController {
      */
     @PostMapping("/insertFileExcel")
     public String insertFileExcel(QcInspectionFileQo inspectionFileQo, @RequestParam("fileExcel") MultipartFile fileExcel) throws IOException {
-        return fileService.insertFileExcel(inspectionFileQo, fileExcel);
+        return inspectionFileService.insertFileExcel(inspectionFileQo, fileExcel);
     }
 
     /**
@@ -76,6 +76,6 @@ public class FileController {
      */
     @PostMapping("/exportExcel")
     public String exportExcel(@RequestBody QcInspectionFileQo inspectionFileQo) throws IOException, InvalidFormatException {
-        return fileService.exportExcel(inspectionFileQo);
+        return inspectionFileService.exportExcel(inspectionFileQo);
     }
 }

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

@@ -4,7 +4,7 @@ import com.xkrs.dao.QcInspectionItemDictDao;
 import com.xkrs.encapsulation.PromptMessageEnum;
 import com.xkrs.model.entity.QcInspectionItemDict;
 import com.xkrs.model.qo.QcInspectionItemDictQo;
-import com.xkrs.service.DataDictService;
+import com.xkrs.service.QcInspectionItemDictService;
 import com.xkrs.util.Query;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.*;
@@ -21,10 +21,10 @@ import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObje
  * @Date: 2022/1/19 10:54
  */
 @RestController
-public class DataDictController {
+public class QcInspectionItemDictController {
 
     @Resource
-    private DataDictService dataDictService;
+    private QcInspectionItemDictService inspectionItemDictService;
 
     @Resource
     private QcInspectionItemDictDao inspectionItemDictDao;
@@ -40,7 +40,7 @@ public class DataDictController {
      */
     @PostMapping("/insertDataDict")
     public String insertDataDict(@RequestBody QcInspectionItemDictQo inspectionItemDictQo) {
-        return dataDictService.insertDataDict(inspectionItemDictQo);
+        return inspectionItemDictService.insertDataDict(inspectionItemDictQo);
     }
 
     /**

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

@@ -0,0 +1,32 @@
+package com.xkrs.controller;
+
+import com.xkrs.model.qo.QcInspectionPictureQo;
+import com.xkrs.service.QcInspectionPictureService;
+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;
+
+/**
+ * @Author: XinYi Song
+ * @Date: 2022/1/20 16:01
+ */
+@RestController
+public class QcInspectionPictureController {
+
+    @Resource
+    private QcInspectionPictureService inspectionPictureService;
+
+    /**
+     * 上传图片
+     */
+    @PostMapping("/insertPicture")
+    public String insertPicture(QcInspectionPictureQo inspectionPictureQo, @RequestParam("filePicture") MultipartFile pictureFile) throws IOException {
+        return inspectionPictureService.insertPicture(inspectionPictureQo, pictureFile);
+    }
+
+
+}

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

@@ -0,0 +1,54 @@
+package com.xkrs.controller;
+
+import com.xkrs.dao.QcInspectionSpecDao;
+import com.xkrs.encapsulation.PromptMessageEnum;
+import com.xkrs.model.entity.QcInspectionSpec;
+import com.xkrs.model.qo.QcInspectionSpecQo;
+import com.xkrs.service.QcInspectionSpecService;
+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.RequestBody;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Locale;
+
+import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
+
+public class QcInspectionSpecController {
+
+    @Resource
+    private QcInspectionSpecService inspectionSpecService;
+
+    @Resource
+    private QcInspectionSpecDao inspectionSpecDao;
+
+    /**
+     * 添加规格数据
+     *
+     * @param inspectionSpecQo
+     * @return
+     */
+    @PostMapping("/insertSpec")
+    public String insertSpec(@RequestBody QcInspectionSpecQo inspectionSpecQo) {
+        return inspectionSpecService.insertSpec(inspectionSpecQo);
+    }
+
+    /**
+     * 查询规格信息
+     */
+    @GetMapping("/selectSpec")
+    public String selectSpec(@RequestBody QcInspectionSpecQo inspectionSpecQo) {
+        Locale locale = LocaleContextHolder.getLocale();
+        String partNo = inspectionSpecQo.getPartNo();
+        String inspectionItemCode = inspectionSpecQo.getInspectionItemCode();
+        List<QcInspectionSpec> inspectionSpecs = inspectionSpecDao.findByPartNoAndInspectionItemCode(partNo, inspectionItemCode);
+        if (inspectionSpecs == null || inspectionSpecs.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该零件的规格信息！", locale);
+        }
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, inspectionSpecs.get(0), locale);
+    }
+
+
+}