2/2 陈宇

RMS/src/main/java/cn/cslg/report/common/model/dto/AvoidDesignDirectionDTO.java

@@ -0,0 +1,29 @@
+package cn.cslg.report.common.model.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 回避设计方向前端传输DTO类
+ *
+ * @Author chenyu
+ * @Data 2023/2/2
+ */
+@Data
+public class AvoidDesignDirectionDTO implements Serializable {
+    /**
+     * 报告id
+     */
+    private Integer reportId;
+    /**
+     * 特征featureId与回避设计方向littleDirection数据的对象集合
+     */
+    private List<AvoidDesignLittleDirectionDTO> avoidDesignLittleDirectionDTOs;
+    /**
+     * 回避设计总体方向
+     */
+    private String wholeDirection;
+
+}

RMS/src/main/java/cn/cslg/report/common/model/dto/AvoidDesignLittleDirectionDTO.java

@@ -0,0 +1,21 @@
+package cn.cslg.report.common.model.dto;
+
+import java.io.Serializable;
+
+/**
+ * 回避设计方向前端传输DTO类
+ *
+ * @Author chenyu
+ * @Data 2023/2/2
+ */
+public class AvoidDesignLittleDirectionDTO implements Serializable {
+    /**
+     * 特征ID
+     */
+    private Integer featureId;
+    /**
+     * 回避设计方向
+     */
+    private String littleDirection;
+
+}

RMS/src/main/java/cn/cslg/report/entity/AssoAvoidDesignWholeLittleDirection.java

@@ -0,0 +1,30 @@
+package cn.cslg.report.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 回避设计总体方向和方向关联表实体类
+ *
+ * @Author chenyu
+ * @Data 2023/2/2
+ */
+@Accessors(chain = true)
+@Data
+public class AssoAvoidDesignWholeLittleDirection implements Serializable {
+    /**
+     * ID
+     */
+    private Integer id;
+    /**
+     * 回避设计总体方向ID
+     */
+    private Integer avoidDesignWholeDirectionId;
+    /**
+     * 回避设计方向ID
+     */
+    private Integer avoidDesignLittleDirectionId;
+
+}

RMS/src/main/java/cn/cslg/report/entity/AssoProductFile.java

@@ -6,7 +6,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 
 /**
- * 产品文件关联表的实体类
+ * 产品和文件关联表的实体类
  *
  * @Author chenyu
  * @Data 2022/12/20

RMS/src/main/java/cn/cslg/report/entity/AvoidDesignLittleDirection.java

@@ -0,0 +1,30 @@
+package cn.cslg.report.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 回避设计方向表实体类
+ *
+ * @Author chenyu
+ * @Data 2023/2/2
+ */
+@Accessors(chain = true)
+@Data
+public class AvoidDesignLittleDirection implements Serializable {
+    /**
+     * ID
+     */
+    private Integer id;
+    /**
+     * 特征ID
+     */
+    private Integer featureId;
+    /**
+     * 回避设计方向
+     */
+    private String littleDirection;
+
+}

RMS/src/main/java/cn/cslg/report/entity/AvoidDesignWholeDirection.java

@@ -0,0 +1,30 @@
+package cn.cslg.report.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 回避设计总体方向表实体类
+ *
+ * @Author chenyu
+ * @Data 2023/2/2
+ */
+@Accessors(chain = true)
+@Data
+public class AvoidDesignWholeDirection implements Serializable {
+    /**
+     * ID
+     */
+    private Integer id;
+    /**
+     * 报告ID
+     */
+    private Integer reportId;
+    /**
+     * 回避设计总体方向
+     */
+    private String wholeDirection;
+
+}

RMS/src/main/java/cn/cslg/report/mapper/AvoidDesignLittleDirectionMapper.java

@@ -0,0 +1,24 @@
+package cn.cslg.report.mapper;
+
+import cn.cslg.report.entity.AvoidDesignLittleDirection;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 回避设计方向表的Mapper层接口
+ *
+ * @Author chenyu
+ * @Data 2023/2/2
+ */
+@Repository
+public interface AvoidDesignLittleDirectionMapper {
+    /**
+     * 批量插入回避设计方向表数据
+     *
+     * @param avoidDesignLittleDirections 回避设计方向数据对象集合
+     * @return 返回受影响的行数
+     */
+    int insertBatch(List<AvoidDesignLittleDirection> avoidDesignLittleDirections);
+
+}

RMS/src/main/java/cn/cslg/report/mapper/AvoidDesignWholeDirectionMapper.java

@@ -0,0 +1,29 @@
+package cn.cslg.report.mapper;
+
+import cn.cslg.report.entity.AvoidDesignWholeDirection;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 回避设计总体方向表的Mapper层接口
+ *
+ * @Author chenyu
+ * @Data 2023/2/2
+ */
+@Repository
+public interface AvoidDesignWholeDirectionMapper {
+    /**
+     * 插入回避设计总体方向表数据
+     *
+     * @param avoidDesignWholeDirection 回避设计总体方向数据对象
+     * @return 返回受影响的行数
+     */
+    int insert(AvoidDesignWholeDirection avoidDesignWholeDirection);
+
+//    /**
+//     * 根据报告
+//     * @param reportId
+//     * @return
+//     */
+//    int deleteByReportId(Integer reportId);
+
+}

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

@@ -0,0 +1,21 @@
+package cn.cslg.report.service;
+
+import cn.cslg.report.common.model.dto.AvoidDesignDirectionDTO;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 回避设计方向的Service层接口
+ *
+ * @Author chenyu
+ * @Data 2023/2/2
+ */
+public interface IAvoidDesignDirectionService {
+    /**
+     * 新增回避设计方案
+     *
+     * @param avoidDesignDirectionDTO 回避设计方案数据对象
+     */
+    @Transactional
+    void addAvoidDesignDirection(AvoidDesignDirectionDTO avoidDesignDirectionDTO);
+
+}

RMS/src/main/java/cn/cslg/report/service/business/AssoReportFileService.java

@@ -28,10 +28,10 @@ public class AssoReportFileService extends ServiceImpl<AssoReportFileMapper, Ass
     private final ReportFileService reportFileService;
 
     /**
-     * @function 上传报告报告与文件关联表 对应实体AssoReportFile 0代表上传文件为附件
      * @param reportId 报告id
-     * @param fileIds 文件id
+     * @param fileIds  文件id
      * @return
+     * @function 上传报告报告与文件关联表 对应实体AssoReportFile 0代表上传文件为附件
      */
     public String addAsso(Integer reportId, List<Integer> fileIds) {
         List<AssoReportFile> assoReportFiles = new ArrayList<>();
@@ -42,17 +42,18 @@ public class AssoReportFileService extends ServiceImpl<AssoReportFileMapper, Ass
             assoReportFile.setFileType(0);
             assoReportFiles.add(assoReportFile);
         });
-           this.saveBatch(assoReportFiles);
+        this.saveBatch(assoReportFiles);
         return Response.success();
     }
+
     /**
-     * @function 上传报告报告与文件关联表 对应实体AssoReportFile 1代表上传最终报告
      * @param reportId 报告id
-     * @param fileIds 文件id
+     * @param fileIds  文件id
      * @return
+     * @function 上传报告报告与文件关联表 对应实体AssoReportFile 1代表上传最终报告
      */
 
-    public String add(Integer reportId, List<Integer> fileIds){
+    public String add(Integer reportId, List<Integer> fileIds) {
         List<AssoReportFile> assoReportFiles = new ArrayList<>();
         fileIds.forEach(item -> {
             AssoReportFile assoReportFile = new AssoReportFile();
@@ -67,18 +68,18 @@ public class AssoReportFileService extends ServiceImpl<AssoReportFileMapper, Ass
 
 
     /**
-     * @function 根据报告id 查询上传报告报告与文件关联表
      * @param reportIds 报告id
      * @return 查询上传报告报告与文件关联表 对应实体AssoReportFile
+     * @function 根据报告id 查询上传报告报告与文件关联表
      */
-    public List<AssoReportFile> queryFileByReportId(List<Integer> reportIds){
-        if(reportIds.size()==0){
-            List<AssoReportFile> files=new ArrayList<>();
+    public List<AssoReportFile> queryFileByReportId(List<Integer> reportIds) {
+        if (reportIds.size() == 0) {
+            List<AssoReportFile> files = new ArrayList<>();
             return files;
         }
-        LambdaQueryWrapper<AssoReportFile> wrapper =new LambdaQueryWrapper<>();
-        wrapper.in(AssoReportFile::getReportId,reportIds);
-        List<AssoReportFile> assoReportFiles =this.list(wrapper);
+        LambdaQueryWrapper<AssoReportFile> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(AssoReportFile::getReportId, reportIds);
+        List<AssoReportFile> assoReportFiles = this.list(wrapper);
         return assoReportFiles;
     }
 

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

@@ -0,0 +1,100 @@
+package cn.cslg.report.service.impl;
+
+import cn.cslg.report.common.model.dto.AvoidDesignDirectionDTO;
+import cn.cslg.report.common.model.dto.AvoidDesignLittleDirectionDTO;
+import cn.cslg.report.entity.AssoAvoidDesignWholeLittleDirection;
+import cn.cslg.report.entity.AvoidDesignLittleDirection;
+import cn.cslg.report.entity.AvoidDesignWholeDirection;
+import cn.cslg.report.exception.XiaoShiException;
+import cn.cslg.report.mapper.AssoAvoidDesignWholeLittleDirectionMapper;
+import cn.cslg.report.mapper.AvoidDesignLittleDirectionMapper;
+import cn.cslg.report.mapper.AvoidDesignWholeDirectionMapper;
+import cn.cslg.report.service.IAvoidDesignDirectionService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 回避设计方向的Service层接口实现类
+ *
+ * @Author chenyu
+ * @Data 2023/2/2
+ */
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class AvoidDesignDirectionServiceImpl implements IAvoidDesignDirectionService {
+    private final AvoidDesignWholeDirectionMapper avoidDesignWholeDirectionMapper;
+    private final AvoidDesignLittleDirectionMapper avoidDesignLittleDirectionMapper;
+    private final AssoAvoidDesignWholeLittleDirectionMapper assoAvoidDesignWholeLittleDirectionMapper;
+
+    /**
+     * 新增回避设计方案
+     *
+     * @param avoidDesignDirectionDTO 回避设计方案数据对象
+     */
+    @Override
+    public void addAvoidDesignDirection(AvoidDesignDirectionDTO avoidDesignDirectionDTO) {
+        log.info("开始处理【新增回避设计方案】的业务，参数为：{}", avoidDesignDirectionDTO);
+
+        //1.从回避设计方案中获取报告reportId和回避设计总体方向wholeDirection，将它们插入回避设计总体方向表
+        Integer reportId = avoidDesignDirectionDTO.getReportId();
+        String wholeDirection = avoidDesignDirectionDTO.getWholeDirection();
+        //将获取到的报告reportId与回避设计总体方向wholeDirection数据赋值给实体类后再插入表
+        AvoidDesignWholeDirection avoidDesignWholeDirection = new AvoidDesignWholeDirection()
+                .setReportId(reportId)
+                .setWholeDirection(wholeDirection);
+        log.info("将数据插入回避设计总体方向表，数据为：{}", avoidDesignWholeDirection);
+        int rows = avoidDesignWholeDirectionMapper.insert(avoidDesignWholeDirection);
+        if (rows != 1) {
+            String message = "数据插入回避设计总体方向表失败，新增回避设计方案失败(数据已回滚)，服务器忙请稍后再次尝试";
+            log.info("{}", message);
+            throw new XiaoShiException(message);
+        }
+
+        //2.从回避设计方案中获取特征featureId与回避设计方向littleDirection的对象集合，将它们插入回避设计方向表
+        List<AvoidDesignLittleDirectionDTO> avoidDesignLittleDirectionDTOs = avoidDesignDirectionDTO.getAvoidDesignLittleDirectionDTOs();
+        ArrayList<AvoidDesignLittleDirection> avoidDesignLittleDirections = new ArrayList<>();
+        //将获取到的特征featureId与回避设计方向littleDirection的DTO对象集合转换成实体类对象集合后再插入表
+        BeanUtils.copyProperties(avoidDesignLittleDirectionDTOs, avoidDesignLittleDirections);
+        log.info("将数据插入回避设计方向表，数据为：{}", avoidDesignLittleDirections);
+        rows = avoidDesignLittleDirectionMapper.insertBatch(avoidDesignLittleDirections);
+        if (rows != avoidDesignLittleDirections.size()) {
+            String message = "数据插入回避设计方向表失败，新增回避设计方案失败(数据已回滚)，服务器忙请稍后再次尝试";
+            log.info("{}", message);
+            throw new XiaoShiException(message);
+        }
+
+        //3.以上两个数据成功插入两张表后，分别取出各自的id，将两个id(回避设计总体方向数据avoidDesignWholeDirectionId、回避设计方向数据avoidDesignLittleDirectionId)插入回避设计总体方向和回避设计方向关联表
+        Integer avoidDesignWholeDirectionId = avoidDesignWholeDirection.getId();
+        ArrayList<Integer> avoidDesignLittleDirectionIds = new ArrayList<>();
+        for (AvoidDesignLittleDirection avoidDesignLittleDirection : avoidDesignLittleDirections) {
+            Integer avoidDesignLittleDirectionId = avoidDesignLittleDirection.getId();
+            avoidDesignLittleDirectionIds.add(avoidDesignLittleDirectionId);
+        }
+
+        ArrayList<AssoAvoidDesignWholeLittleDirection> assoAvoidDesignWholeLittleDirections = new ArrayList<>();
+        for (Integer avoidDesignLittleDirectionId : avoidDesignLittleDirectionIds) {
+            AssoAvoidDesignWholeLittleDirection assoAvoidDesignWholeLittleDirection = new AssoAvoidDesignWholeLittleDirection()
+                    .setAvoidDesignWholeDirectionId(avoidDesignWholeDirectionId)
+                    .setAvoidDesignLittleDirectionId(avoidDesignLittleDirectionId);
+            assoAvoidDesignWholeLittleDirections.add(assoAvoidDesignWholeLittleDirection);
+        }
+
+        log.info("将数据插入回避设计总体方向和回避设计方向关联表，数据为：{}", assoAvoidDesignWholeLittleDirections);
+        rows = assoAvoidDesignWholeLittleDirectionMapper.insertBatch(assoAvoidDesignWholeLittleDirections);
+        if (rows != assoAvoidDesignWholeLittleDirections.size()) {
+            String message = "数据插入回避设计总体方向和回避设计方向关联表失败，新增回避设计方案失败(数据已回滚)，服务器忙请稍后再次尝试";
+            log.info("{}", message);
+            throw new XiaoShiException(message);
+        }
+
+        log.info("新增回避设计方案完成");
+
+    }
+
+}

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

@@ -60,7 +60,7 @@ public class ProductServiceImpl implements IProductService {
         Integer reportId = product.getReportId();
         int count = productMapper.countByReportId(reportId);
         if (count > 0) {
-            String message = "新增产品失败，当前报告产品已存在";
+            String message = "新增产品失败，当前报告产品已创建";
             log.info("{}", message);
             throw new XiaoShiException(message);
         }

RMS/src/main/resources/mapper/AvoidDesignLittleDirectionMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
+<mapper namespace="cn.cslg.report.mapper.AvoidDesignLittleDirectionMapper">
+    <!--批量插入回避设计方向表数据-->
+    <!--int insertBatch(List<AvoidDesignLittleDirection> avoidDesignLittleDirections);-->
+    <insert id="insertBatch" useGeneratedKeys="true" keyProperty="id">
+        insert into AVOIDDESIGN_LITTLE_DIRECTION (FEATURE_ID, LITTLE_DIRECTION)
+        VALUES
+        <foreach collection="list" item="n" separator=",">
+            (#{n.featureId}, #{n.littleDirection})
+        </foreach>
+    </insert>
+
+</mapper>

RMS/src/main/resources/mapper/AvoidDesignWholeDirectionMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
+<mapper namespace="cn.cslg.report.mapper.AvoidDesignWholeDirectionMapper">
+    <!--插入回避设计总体方向表数据-->
+    <!--int insert(AvoidDesignWholeDirection avoidDesignWholeDirection);-->
+    <insert id="insert" useGeneratedKeys="true" keyProperty="id">
+        insert into AVOIDDESIGN_WHOLE_DIRECTION (REPORT_ID, WHOLE_DIRECTION)
+        values (#{reportId}, #{wholeDirection});
+    </insert>
+
+</mapper>

RMS/src/test/java/cn/cslg/report/mapper/AvoidDesignLittleDirectionMapperTests.java

@@ -0,0 +1,44 @@
+package cn.cslg.report.mapper;
+
+import cn.cslg.report.entity.AvoidDesignLittleDirection;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.ArrayList;
+
+/**
+ * 回避设计方向表的Mapper层接口测试类
+ *
+ * @Author chenyu
+ * @Data 2023/2/2
+ */
+@Slf4j
+@SpringBootTest
+public class AvoidDesignLittleDirectionMapperTests {
+
+    @Autowired
+    private AvoidDesignLittleDirectionMapper avoidDesignLittleDirectionMapper;
+
+    @Test
+    void insertBatch() {
+        ArrayList<AvoidDesignLittleDirection> avoidDesignLittleDirections = new ArrayList<>();
+        log.info("批量插入前数据为：");
+        for (int i = 0; i < 5; i++) {
+            AvoidDesignLittleDirection avoidDesignLittleDirection = new AvoidDesignLittleDirection()
+                    .setFeatureId(i + 1)
+                    .setLittleDirection("回避设计方向" + (i + 1));
+            log.info("{}", avoidDesignLittleDirection);
+            avoidDesignLittleDirections.add(avoidDesignLittleDirection);
+        }
+        int rows = avoidDesignLittleDirectionMapper.insertBatch(avoidDesignLittleDirections);
+        log.info("批量插入数据完成，受影响的行数为：{}", rows);
+        log.info("批量插入前数据为：");
+        for (AvoidDesignLittleDirection avoidDesignLittleDirection : avoidDesignLittleDirections) {
+            log.info("{}", avoidDesignLittleDirection);
+        }
+
+    }
+
+}

RMS/src/test/java/cn/cslg/report/mapper/AvoidDesignWholeDirectionMapperTests.java

@@ -0,0 +1,33 @@
+package cn.cslg.report.mapper;
+
+import cn.cslg.report.entity.AvoidDesignWholeDirection;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ * 回避设计总体方向表的Mapper层接口测试类
+ *
+ * @Author chenyu
+ * @Data 2023/2/2
+ */
+@Slf4j
+@SpringBootTest
+public class AvoidDesignWholeDirectionMapperTests {
+
+    @Autowired
+    private AvoidDesignWholeDirectionMapper avoidDesignWholeDirectionMapper;
+
+    @Test
+    void insert() {
+        AvoidDesignWholeDirection avoidDesignWholeDirection = new AvoidDesignWholeDirection()
+                .setReportId(410)
+                .setWholeDirection("回避设计总体方向内容");
+        log.info("插入前数据为：{}", avoidDesignWholeDirection);
+        int rows = avoidDesignWholeDirectionMapper.insert(avoidDesignWholeDirection);
+        log.info("插入数据完成，受影响的行数为：{}", rows);
+        log.info("插入后数据为：{}", avoidDesignWholeDirection);
+    }
+
+}

RMS/target/classes/mapper/AvoidDesignLittleDirectionMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
+<mapper namespace="cn.cslg.report.mapper.AvoidDesignLittleDirectionMapper">
+    <!--批量插入回避设计方向表数据-->
+    <!--int insertBatch(List<AvoidDesignLittleDirection> avoidDesignLittleDirections);-->
+    <insert id="insertBatch" useGeneratedKeys="true" keyProperty="id">
+        insert into AVOIDDESIGN_LITTLE_DIRECTION (FEATURE_ID, LITTLE_DIRECTION)
+        VALUES
+        <foreach collection="list" item="n" separator=",">
+            (#{n.featureId}, #{n.littleDirection})
+        </foreach>
+    </insert>
+
+</mapper>

RMS/target/classes/mapper/AvoidDesignWholeDirectionMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
+<mapper namespace="cn.cslg.report.mapper.AvoidDesignWholeDirectionMapper">
+    <!--插入回避设计总体方向表数据-->
+    <!--int insert(AvoidDesignWholeDirection avoidDesignWholeDirection);-->
+    <insert id="insert" useGeneratedKeys="true" keyProperty="id">
+        insert into AVOIDDESIGN_WHOLE_DIRECTION (REPORT_ID, WHOLE_DIRECTION)
+        values (#{reportId}, #{wholeDirection});
+    </insert>
+
+</mapper>