12.21 陈宇

RMS/src/main/java/cn/cslg/report/controller/ProductController.java

@@ -10,6 +10,7 @@ import cn.cslg.report.web.ServiceCode;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,39 +31,35 @@ import java.util.List;
 @Slf4j
 @RestController
 @RequestMapping(Constants.REPORT_API + "/product")
+@RequiredArgsConstructor
 public class ProductController {
-
-    @Autowired
     private ProductServiceImpl productService;
 
     @Operation(summary = "新增产品")
     @PostMapping("/addProduct")
-    public String addProduct(String jsons, List<MultipartFile> files) {
+    public JsonResult addProduct(String jsons, List<MultipartFile> files) {
         log.info("开始处理【新增产品】的请求，参数为：{}, {}", jsons, files);
         if (jsons != null) {
             ProductDTO productDTO = JSONObject.parseObject(jsons, ProductDTO.class);
             productService.addProduct(productDTO, files);
-            return Response.success("产品新增成功");
+            return JsonResult.ok("产品新增成功");
         } else {
-            return Response.error("产品信息不能为空");
+            return JsonResult.fail("产品信息不能为空");
         }
     }
 
     @Operation(summary = "根据报告id查询产品数据信息")
     @GetMapping("/getProduct")
-    public String getProduct(Integer reportId) {
+    public JsonResult getProduct(Integer reportId) {
         log.info("开始处理【根据报告id查询产品数据信息】的请求，参数为：{}", reportId);
         if (reportId != null) {
             ProductStandardVO queryResult = productService.getProduct(reportId);
             if (queryResult == null) {
-                //return JsonResult.fail(ServiceCode.ERROR_NOT_FOUND, "产品不存在");
-                return Response.error("报告id对应产品不存在");
+                return JsonResult.fail("产品不存在");
             }
-            //return JsonResult.ok(queryResult);
-            return Response.success(queryResult);
+            return JsonResult.ok(queryResult);
         } else {
-            //return JsonResult.fail(ServiceCode.ERROR_BAD_REQUEST, "报告id不能为空");
-            return Response.error("报告id不能为空");
+            return JsonResult.fail("报告id不能为空");
         }
 
     }

RMS/src/main/java/cn/cslg/report/service/IProductService.java

@@ -13,7 +13,7 @@ import java.util.List;
 public interface IProductService {
     /**
      * 新增产品的业务层方法
-     * @param productDTO 前端新增产品数据对象
+     * @param productDTO 产品数据对象
      */
     @Transactional(rollbackFor = Exception.class)
     void addProduct(ProductDTO productDTO, List<MultipartFile> files);

RMS/src/main/java/cn/cslg/report/service/impl/AssoProductFileServiceImpl.java

@@ -3,6 +3,7 @@ package cn.cslg.report.service.impl;
 import cn.cslg.report.entity.AssoProductFile;
 import cn.cslg.report.mapper.AssoProductFileMapper;
 import cn.cslg.report.service.IAssoProductFileService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,9 +17,9 @@ import java.util.List;
  * @Data 2022/12/20 14:13
  */
 @Service
+@RequiredArgsConstructor
 public class AssoProductFileServiceImpl implements IAssoProductFileService {
-    @Autowired
-    private AssoProductFileMapper assoProductFileMapper;
+    private final AssoProductFileMapper assoProductFileMapper;
 
     /**
      * 插入产品与文件关联表数据 对应实体AssoProductFile 0代表上传文件为附件

RMS/src/main/java/cn/cslg/report/service/impl/ProductServiceImpl.java

@@ -6,6 +6,7 @@ import cn.cslg.report.entity.Product;
 import cn.cslg.report.common.model.vo.ProductStandardVO;
 import cn.cslg.report.service.IProductService;
 import cn.cslg.report.service.business.ReportFileService;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,12 +23,10 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@RequiredArgsConstructor
 public class ProductServiceImpl implements IProductService {
-    @Autowired
     private ProductMapper productMapper;
-    @Autowired
     private ReportFileService reportFileService;
-    @Autowired
     private AssoProductFileServiceImpl assoProductFileService;
 
     /**

RMS/target/classes/mapper/ProductMapper.xml

@@ -87,7 +87,7 @@
         where REPORT_ID = #{report_Id}
     </select>
 
-    <resultMap id="getStandardByReportIdResultMap" type="cn.cslg.report.pojo.vo.ProductStandardVO">
+    <resultMap id="getStandardByReportIdResultMap" type="cn.cslg.report.common.model.vo.ProductStandardVO">
         <result column="PRODUCT_NAME" property="productName"/>
         <result column="PRODUCT_IDENTIFY" property="productIdentify"/>
         <result column="PRODUCT_DESCRIPTION" property="productDescription"/>
@@ -99,7 +99,7 @@
         <result column="REPORT_ID" property="reportId"/>
         <result column="CREATE_PERSON_NAME" property="createPersonName"/>
         <result column="CREATE_PERSON_ID" property="create_person_id"/>
-        <collection property="reportFiles" ofType="cn.cslg.report.pojo.vo.ReportFileStandardVO">
+        <collection property="reportFiles" ofType="cn.cslg.report.common.model.vo.ReportFileStandardVO">
             <result column="NAME" property="name"/>
             <result column="ADDRESS" property="address"/>
             <result column="ZID" property="zid"/>