Merge remote-tracking branch 'origin/master'

RMS/src/main/java/cn/cslg/report/common/model/vo/CompareScenariosVO.java

@@ -0,0 +1,31 @@
+package cn.cslg.report.common.model.vo;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+@Data
+@Accessors(chain = true)
+public class CompareScenariosVO {
+    private String rightId;
+
+
+    private String right;
+
+    private String reportId;
+
+
+    private String signPatentNo;
+
+
+    private String contrastResult;
+
+//    private int personId;
+    /**
+     * 常识特征id集合
+     */
+    private List<Integer>  featuresIDList;
+    /**
+     * 对比记录id集合,featuresID
+     */
+    private List<Integer> recordIDList;
+}

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

@@ -0,0 +1,32 @@
+package cn.cslg.report.controller;
+
+import cn.cslg.report.common.core.base.Constants;
+import cn.cslg.report.common.model.vo.CompareScenariosVO;
+import cn.cslg.report.service.business.CompareScenariosService;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+import java.util.List;
+
+@Tag(name = "对比方案")
+@RestController
+@RequestMapping(Constants.REPORT_API + "/CompareScenariosController")
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class CompareScenariosController {
+    private final CompareScenariosService compareScenariosService;
+    @PostMapping("/addCompareScenarios")
+    @Operation(summary = "增加对比方案")
+    public String add(@RequestBody CompareScenariosVO compareScenariosVO) throws IOException{
+        return compareScenariosService.add(compareScenariosVO);
+    }
+
+
+}

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

@@ -49,5 +49,5 @@ public class CompareScenarios extends BaseEntity<CompareResults> {
      * 对比人ID
      */
     @TableField(value = "PERSON_ID")
-    private String personId;
+    private Integer personId;
 }

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

@@ -0,0 +1,32 @@
+package cn.cslg.report.entity;
+
+import cn.cslg.report.common.model.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "ASSO_SCENARIOS_RECORDS")
+public class CompareScenariosAndRecords  extends BaseEntity<CompareScenariosAndRecords> {
+    /**
+     * 对比方案id
+     */
+    @TableField(value = "SCENARIOS_ID")
+    public int scenariosID;
+    /**
+     * 对比记录ID
+     */
+    @TableField(value = "RECORD_ID")
+    public int recordID;
+    /**
+     * features特征id
+     */
+    @TableField(value = "FEATURES_ID")
+    public int featuresID;
+
+
+}

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

@@ -0,0 +1,9 @@
+package cn.cslg.report.mapper;
+
+import cn.cslg.report.entity.CompareScenariosAndRecords;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CompareScenariosAndRecordsMapper extends BaseMapper<CompareScenariosAndRecords> {
+}

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

@@ -0,0 +1,9 @@
+package cn.cslg.report.mapper;
+
+import cn.cslg.report.entity.CompareScenarios;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CompareScenariosMapper extends BaseMapper<CompareScenarios> {
+}

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

@@ -381,7 +381,7 @@ public class OutInterfaceService {
         OkHttpClient httpClient = new OkHttpClient.Builder()
                 .pingInterval(40, TimeUnit.SECONDS) // 设置 PING 帧发送间隔
                 .build();
-        String param = new Gson().toJson(taskParams);
+            String param = new Gson().toJson(taskParams);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
         Request request = new Request.Builder()
                 .url(PASUrl + "/api/v2/project/import/sysPatent")

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

@@ -0,0 +1,23 @@
+package cn.cslg.report.service.business;
+
+import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.entity.CompareScenarios;
+import cn.cslg.report.entity.CompareScenariosAndRecords;
+import cn.cslg.report.mapper.CompareScenariosAndRecordsMapper;
+import cn.cslg.report.mapper.CompareScenariosMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class CompareScenariosAndRecordsService extends ServiceImpl<CompareScenariosAndRecordsMapper, CompareScenariosAndRecords> {
+    public  String add(CompareScenariosAndRecords compareScenariosAndRecords){
+        compareScenariosAndRecords.insert();
+        return Response.success();
+    }
+
+}

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

@@ -0,0 +1,67 @@
+package cn.cslg.report.service.business;
+
+import cn.cslg.report.common.model.vo.CompareScenariosVO;
+import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
+import cn.cslg.report.entity.CompareScenarios;
+import cn.cslg.report.entity.CompareScenariosAndRecords;
+import cn.cslg.report.entity.Features;
+import cn.cslg.report.mapper.CompareScenariosMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper, CompareScenarios> {
+    private final CompareScenariosAndRecordsService compareScenariosAndRecordsService;
+    private  final LoginUtils loginUtils;
+    public String add(CompareScenariosVO compareScenariosVO) throws IOException{
+        CompareScenarios compareScenarios = new CompareScenarios();
+        compareScenarios.setContrastResult(compareScenariosVO.getContrastResult());
+        compareScenarios.setReportId(compareScenariosVO.getReportId());
+        compareScenarios.setRight(compareScenariosVO.getRight());
+        compareScenarios.setPersonId(loginUtils.getId());
+        compareScenarios.setRightId(compareScenariosVO.getRightId());
+        compareScenarios.setSignPatentNo(compareScenariosVO.getSignPatentNo());
+        compareScenarios.insert();
+//        LambdaQueryWrapper<CompareScenarios> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(CompareScenarios::getContrastResult,compareScenariosVO.getContrastResult())
+//                .eq(CompareScenarios::getReportId,compareScenariosVO.getReportId())
+//                .eq(CompareScenarios::getRight,compareScenariosVO.getRight())
+//                .eq(CompareScenarios::getPersonId,loginUtils.getId())
+//                .eq(CompareScenarios::getRightId,compareScenariosVO.getRightId())
+//                .eq(CompareScenarios::getSignPatentNo,compareScenariosVO.getSignPatentNo());
+//        List<CompareScenarios> scenarios =this.list(wrapper);
+//        CompareScenarios compareScenarios1 = scenarios.get(0);
+        Integer id = compareScenarios.getId();
+        List<Integer> FeaturesId = compareScenariosVO.getFeaturesIDList();
+        for(Integer integer:FeaturesId){
+            CompareScenariosAndRecords compareScenariosAndRecords = new CompareScenariosAndRecords();
+            compareScenariosAndRecords.setScenariosID(id);
+            compareScenariosAndRecords.setFeaturesID(integer);
+            compareScenariosAndRecordsService.add(compareScenariosAndRecords);
+
+
+        }
+        List<Integer> recordIDList = compareScenariosVO.getRecordIDList();
+        for(Integer integer:recordIDList) {
+            CompareScenariosAndRecords compareScenariosAndRecords = new CompareScenariosAndRecords();
+            compareScenariosAndRecords.setScenariosID(id);
+            compareScenariosAndRecords.setRecordID(integer);
+            compareScenariosAndRecordsService.add(compareScenariosAndRecords);
+        }
+
+       return Response.success();
+
+    }
+
+}