Merge remote-tracking branch 'origin/master'

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

@@ -7,6 +7,7 @@ import cn.cslg.report.service.business.AssoTaskPersonelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
@@ -17,9 +18,8 @@ import java.io.IOException;
 @RequestMapping(Constants.REPORT_API + "/AssoTaskPersonel")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class AssoTaskPersonelController {
-
     public final AssoTaskPersonelService assoTaskPersonelService;
-    private  final LoginUtils loginUtils;
+    private final LoginUtils loginUtils;
     @GetMapping("/getPartClient")
     @Operation(summary = "分页获取对比专利")
     public String getPagination( int  state, int taskId,int location)throws IOException{

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

@@ -10,6 +10,6 @@ import java.util.List;
 @Mapper
 public interface AssoTaskPersonelMapper extends BaseMapper<AssoTaskPersonel> {
 
-//    public List<String> getPatentNumber(@Param("personelId")int personelId ,@Param("state")int  state,@Param("taskId")int taskId);
+  public List<String> getPatentNumber(@Param("personelId")int personelId ,@Param("state")int  state,@Param("taskId")int taskId);
 
 }

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

@@ -4,6 +4,7 @@ import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.model.vo.PatentVO;
 import cn.cslg.report.common.utils.LogExceptionUtil;
 import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.report.entity.SysDictItem;
 import cn.cslg.report.entity.asso.AssoTaskPersonel;
 import cn.cslg.report.mapper.AssoTaskPersonelMapper;
@@ -36,7 +37,8 @@ import java.util.Objects;
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper, AssoTaskPersonel> {
-//   public final  AssoTaskPersonelMapper assoTaskPersonelMapper ;
+  public final  AssoTaskPersonelMapper assoTaskPersonelMapper ;
+//  public final LoginUtils loginUtils;
     public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
     @Value("${PCSUrl}")
     private String PCSUrl;
@@ -51,19 +53,19 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
         return Response.success();
     }
     public String pagination(int personelId , int  state, int taskId,int location)throws IOException{
-        return null;
-//        List<String> patentNumber = assoTaskPersonelMapper.getPatentNumber(personelId, state, taskId);
-//   Map<String,Object> map =new HashMap<>();
-////   map.put("patentNos",patentNumber);
-//   map.put("startNumber",location);
-//        JSONObject json = new JSONObject(map);
-//           RequestBody requestBody =RequestBody.create(JSON,String.valueOf(json));
-//        OkHttpClient okHttpClient = new OkHttpClient();
-//        Request request = new Request.Builder()
-//                .url(PASUrl + "/api/v2/patent/getPagination")
-//                .post(requestBody)
-//                .build();
-//        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+
+        List<String> patentNumber = assoTaskPersonelMapper.getPatentNumber(personelId, state, taskId);
+   Map<String,Object> map =new HashMap<>();
+   map.put("patentNos",patentNumber);
+   map.put("startNumber",location);
+        JSONObject json = new JSONObject(map);
+           RequestBody requestBody =RequestBody.create(JSON,String.valueOf(json));
+        OkHttpClient okHttpClient = new OkHttpClient();
+        Request request = new Request.Builder()
+                .url(PASUrl + "/api/v2/patent/getPagination")
+                .post(requestBody)
+                .build();
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
 
     }
 

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

@@ -1,9 +1,8 @@
 <?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.AssoTaskPersonelMapper">
-<!--     public List<String> getPatentNumber(@Param("personelId")int personelId ,@Param("state")int  state,@Param("taskId")int taskId);;-->
-    <select id="getPatentNumber" resultType="String">
-        select PATENT_NO as patentNo from ASSO_TASK_PERSONEL
+    <select id="getPatentNumber" resultType="java.lang.String">
+        select PATENT_NO  from ASSO_TASK_PERSONEL
        where PERSON_ID=#{personelId} and STATE=#{state} and TASK_ID=#{taskId}
     </select>
 

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

@@ -1,7 +1,7 @@
 <?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.CompareFilesMapper">
-    <select id="patentNos" >
+    <select id="patentNos">
         select DISTINCT PATENT_NO from COMPARE_FILES where
         <where>
             <if test="params.createName != '' and params.createName != null">
@@ -22,7 +22,7 @@
         </where>
         order by a.ctime ${params.order}
     </select>
-    <select id="selectedTotal" resultType="int">
+    <select id="selectedTotal" resultType="java.lang.Integer">
         select  count(*) from COMPARE_FILES where REPORT_ID=#{id}
     </select>
 </mapper>