11/29 upat

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

@@ -1,4 +1,6 @@
 package cn.cslg.report.common.model.vo;
+import cn.cslg.report.entity.CompareRecords;
+import cn.cslg.report.entity.Features;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -31,4 +33,6 @@ public class CompareScenariosVO {
      * 对比记录id集合,featuresID
      */
     private List<Integer> recordIDList;
+    private List<CompareRecords> compareRecords;
+    private List<Features> features;
 }

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

@@ -38,12 +38,12 @@ public class CompareController {
         return res;
     }
 
-    @RequestMapping(value = "/getSureCompareFile", method = RequestMethod.POST)
-    @Operation(summary = "获得已确定的对比文件详情(分页）")
-    public String getSureCompareFile(@RequestBody PatentVO patentVO) throws IOException {
-        String res = compareFilesService.getSureCompareFile(patentVO);
-        return res;
-    }
+//    @RequestMapping(value = "/getSureCompareFile", method = RequestMethod.POST)
+//    @Operation(summary = "获得已确定的对比文件详情(分页）")
+//    public String getSureCompareFile(@RequestBody PatentVO patentVO) throws IOException {
+//        String res = compareFilesService.getSureCompareFile(patentVO);
+//        return res;
+//    }
 
     @RequestMapping(value = "/getCompareNos", method = RequestMethod.GET)
     @Operation(summary = "获得对比专利号")

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

@@ -0,0 +1,40 @@
+package cn.cslg.report.controller;
+
+import cn.cslg.report.common.core.base.Constants;
+import cn.cslg.report.entity.CompareFiles;
+import cn.cslg.report.service.business.CompareFilesService;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+@Tag(name = "初选")
+@RestController
+@RequestMapping(Constants.REPORT_API + "/CompareFiles")
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class CompareFilesController {
+    private final CompareFilesService compareFilesService;
+   @GetMapping("/add")
+    @Operation(summary = "初选保存")
+    public String add(int reportId,String patentNo,int patentFiledID)throws IOException{
+       return compareFilesService.add(reportId,patentNo,patentFiledID);
+   }
+    @GetMapping("/delete")
+    @Operation(summary = "删除")
+    public  String delete(Integer id)throws IOException{
+       return compareFilesService.dele(id);
+
+    }
+    public String update(CompareFiles a) throws IOException{
+       return compareFilesService.update(a);
+    }
+
+
+
+}

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

@@ -8,13 +8,10 @@ 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 org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
-import java.util.List;
+
 
 @Tag(name = "对比方案")
 @RestController
@@ -22,11 +19,17 @@ import java.util.List;
 @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);
     }
+    @GetMapping("/select")
+    @Operation(summary = "查询对比方案")
+    public String select(int reportID)throws IOException{
+        return compareScenariosService.select(reportID);
+    }
 
 
 }

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

@@ -0,0 +1,24 @@
+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 AssoScenarIOS extends BaseEntity<AssoScenarIOS> {
+    @TableField(value = "ID")
+    private Integer id;
+    @TableField(value = "SCENARIOS_ID")
+    private Integer scenariosID;
+    @TableField(value = "RECORD_ID")
+   private Integer recordID;
+    @TableField(value = "FEATURES_ID")
+    private Integer featuresID;
+
+}

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

@@ -37,5 +37,8 @@ public class CompareFiles extends BaseEntity<CompareFiles> {
      */
     @TableField(value = "STATE")
     private String state;
+    @TableField(value = "PATENT_FILED_ID")
+    private int patentFiledID;
+
 
 }

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

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

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

@@ -0,0 +1,29 @@
+package cn.cslg.report.service.business;
+
+import cn.cslg.report.entity.AssoScenarIOS;
+import cn.cslg.report.entity.CompareScenarios;
+import cn.cslg.report.mapper.AssoScenarIOSMapper;
+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.util.List;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class AssoScenarIOSService extends ServiceImpl<AssoScenarIOSMapper, AssoScenarIOS> {
+    public List<AssoScenarIOS> select(int scenariosID){
+        LambdaQueryWrapper<AssoScenarIOS> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AssoScenarIOS::getScenariosID,scenariosID);
+        List<AssoScenarIOS> assoScenarIOS=this.list(wrapper);
+        return assoScenarIOS;
+    }
+
+
+
+}

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

@@ -165,4 +165,27 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         }
         return Response.success();
     }
+    public String add(int reportId,String patentNo,int patentFiledID)throws IOException{
+        CompareFiles compareFiles = new CompareFiles();
+        compareFiles.setPatentNo(patentNo);
+        compareFiles.setPatentFiledID(patentFiledID);
+        compareFiles.setReportId(reportId);
+        compareFiles.insert();
+        return Response.success();
+
+    }
+    public String dele(int id)throws IOException{
+        CompareFiles compareFiles = new CompareFiles();
+        compareFiles.deleteById(id);
+        return Response.success();
+    }
+    public String update(CompareFiles compareFiles)throws IOException{
+        compareFiles.insertOrUpdate();
+        return Response.success();
+    }
+
+
+
+
+
 }

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

@@ -120,5 +120,16 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
         map.put("records",compareRecords);
         return Response.success(map);
     }
+    public CompareRecords get(int id){
+        LambdaQueryWrapper<CompareRecords> lambdaQueryWrapper =new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(CompareRecords::getId,id);
+        List<CompareRecords> list = this.list(lambdaQueryWrapper);
+        if(list.size()==0){
+            return null;
+        }
+        return list.get(0);
+
+    }
+
 
 }

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

@@ -3,27 +3,32 @@ 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.entity.*;
 import cn.cslg.report.mapper.CompareScenariosMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.swagger.v3.oas.models.security.SecurityScheme;
 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;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper, CompareScenarios> {
     private final CompareScenariosAndRecordsService compareScenariosAndRecordsService;
+    private final AssoScenarIOSService assoScenarIOSService;
+    private final CompareFilesService compareFilesService;
     private  final LoginUtils loginUtils;
+    private final CompareRecordsService compareRecordsService;
+    private final FeatureService featureService;
     public String add(CompareScenariosVO compareScenariosVO) throws IOException{
         CompareScenarios compareScenarios = new CompareScenarios();
         compareScenarios.setContrastResult(compareScenariosVO.getContrastResult());
@@ -51,4 +56,32 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
        return Response.success();
     }
 
+    public String select(int reportID)throws IOException{
+       List<CompareScenariosVO> list=new ArrayList<>();
+        LambdaQueryWrapper<CompareScenarios> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CompareScenarios::getReportId, reportID);
+        List<CompareScenarios> CompareScenarios = this.list(wrapper);
+        for (CompareScenarios a:CompareScenarios){
+            CompareScenariosVO compareScenariosVO=new CompareScenariosVO();
+            compareScenariosVO.setRightId(a.getRightId());
+            compareScenariosVO.setContrastResult( a.getContrastResult());
+            compareScenariosVO.setReportId(a.getReportId());
+            compareScenariosVO.setSignPatentNo(  a.getSignPatentNo());
+            compareScenariosVO.setRight(a.getRightName());
+            List<AssoScenarIOS> select = assoScenarIOSService.select(a.getId());
+            List<Integer> recordIds = select.stream().map(AssoScenarIOS::getRecordID).collect(Collectors.toList());
+            LambdaQueryWrapper<CompareRecords> wrapper1 =new LambdaQueryWrapper<>();
+            //获得方案的所有记录
+            List<CompareRecords> compareRecords = compareRecordsService.list(wrapper1);
+           List<Integer> featuresIds =select.stream().filter(item->item.getFeaturesID().equals(0)).map(AssoScenarIOS::getFeaturesID).collect(Collectors.toList());
+            compareScenariosVO.setFeaturesIDList(featuresIds);
+            compareScenariosVO.setCompareRecords(compareRecords);
+            list.add(compareScenariosVO);
+        }
+        return Response.success(list);
+
+    }
+
+
+
 }

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

@@ -350,6 +350,15 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
 
 
     }
+    public Features select(int id){
+        LambdaQueryWrapper<Features> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Features::getId,id);
+        if(this.list(queryWrapper).size()==0){
+            return null;
+        }
+        return this.list(queryWrapper).get(0);
+    }
+
 
 
 }

RMS/src/main/resources/application.yml

@@ -67,6 +67,6 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
   mapper-locations: classpath:mapper/*.xml
-PCSUrl: http://192.168.1.11:8880
-PASUrl: http://192.168.1.11:8879
+PCSUrl: http://192.168.1.17:8880
+PASUrl: http://192.168.1.17:8879