Merge remote-tracking branch 'origin/master'

src/main/java/com/example/xiaoshiweixinback/controller/PatentController.java

@@ -2,23 +2,33 @@ package com.example.xiaoshiweixinback.controller;
 
 import com.example.xiaoshiweixinback.business.common.Constants;
 import com.example.xiaoshiweixinback.business.common.Response;
+import com.example.xiaoshiweixinback.entity.dto.esPicture.EsPatentSearchDTO;
 import com.example.xiaoshiweixinback.entity.dto.patent.ImportTaskAMVO;
+import com.example.xiaoshiweixinback.entity.vo.esPicture.EsPictureVectorVo;
+import com.example.xiaoshiweixinback.service.common.EsDenseVectorService;
 import com.example.xiaoshiweixinback.service.common.FileManagerService;
 import com.example.xiaoshiweixinback.service.importPatent.ImportFromWebToEsService;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 @RequestMapping(Constants.XIAOSHI_WEIXINBACK + "/patent")
 @RestController
 public class PatentController {
+
     @Autowired
     private ImportFromWebToEsService importFromWebToEsService;
+
     @Autowired
     private FileManagerService fileManagerService;
 
-    @Operation(summary = "手机号/账号登录")
+    @Autowired
+    private EsDenseVectorService esDenseVectorService;
+
+    @Operation(summary = "导入专利")
     @GetMapping(value = "/importPatent")
     public Response queryPatent(@RequestBody ImportTaskAMVO importTaskAMVO) {
         try {
@@ -28,4 +38,11 @@ public class PatentController {
         }
         return Response.success("");
     }
+
+    @Operation(summary = "获取检索专利列表--")
+    @PostMapping(value = "/getPatentList")
+    public Response getPatentList(@RequestBody EsPatentSearchDTO searchDTO) throws Exception {
+        List<EsPictureVectorVo> patentList = esDenseVectorService.getPatentList(searchDTO);
+        return Response.success(patentList);
+    }
 }

src/main/java/com/example/xiaoshiweixinback/domain/es/PatentVector.java

@@ -1,12 +1,18 @@
 package com.example.xiaoshiweixinback.domain.es;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
 
+@Component
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class PatentVector {
     /**
      * 专利号

src/main/java/com/example/xiaoshiweixinback/service/LoginService.java

@@ -122,8 +122,8 @@ public class LoginService {
             BeanUtil.copy(person, loginVO);
         }
         loginVO.setToken(jwtTokenUtil.createToken());
-        redisService.set(AppCacheKeyUtil.getUserIdToken(loginVO.getId()),loginVO.getToken());
-        redisService.set(AppCacheKeyUtil.getTokenUserInfo(loginVO.getToken()), loginVO);
+//        redisService.set(AppCacheKeyUtil.getUserIdToken(loginVO.getId()), AppCacheKeyUtil.getTokenUserInfo(loginVO.getToken()));
+        redisService.set(loginVO.getToken(), loginVO.getId());
         LogHelper.log("登陆结束");
         return loginVO;
     }
@@ -191,8 +191,8 @@ public class LoginService {
             }
             wxVO.setToken(jwtTokenUtil.createToken());
             wxVO.setOpenId(jscode2SessionWo.getOpenid());
-            redisService.set(AppCacheKeyUtil.getUserIdToken(wxVO.getId()), wxVO);
-            redisService.set(AppCacheKeyUtil.getTokenUserInfo(wxVO.getToken()), wxVO);
+//            redisService.set(AppCacheKeyUtil.getUserIdToken(wxVO.getId()), AppCacheKeyUtil.getTokenUserInfo(wxVO.getToken()));
+            redisService.set(wxVO.getToken(), wxVO.getId());
         }
         return wxVO;
     }
@@ -261,12 +261,13 @@ public class LoginService {
         if (ToolUtil.isEmpty(token)) {
             throw new BusinessException(ExceptionEnum.THE_LOG_OUT);
         }
-        Object obj = redisService.get(token);
+        String usedToken = token.substring(token.indexOf("=") + 1);
+        Object obj = redisService.get(usedToken);
         if (ToolUtil.isEmpty(obj)) {
             throw new BusinessException(ExceptionEnum.THE_LOG_OUT);
         }
-        LoginVO loginVO = JSONObject.parseObject(obj.toString(), LoginVO.class);
-        Person person = personMapper.selectById(loginVO.getId());
+        Integer id = JSONObject.parseObject(obj.toString(), Integer.class);
+        Person person = personMapper.selectById(id);
         PersonVO personVO = new PersonVO();
         BeanUtil.copy(person, personVO);
         return personVO;
@@ -303,12 +304,13 @@ public class LoginService {
      */
     public boolean logout(PersonIdDTO dto) {
         String token = LoginUtils.getToken();
-        Object obj = redisService.get(AppCacheKeyUtil.getTokenUserInfo(token));
+        String usedToken = token.substring(token.indexOf("=") + 1);
+        Object obj = redisService.get(usedToken);
         if (ToolUtil.isNotEmpty(obj)) {
-            Object object = redisService.get(AppCacheKeyUtil.getTokenUserInfo(token));
-            LoginVO loginVO = JSONObject.parseObject(object.toString(), LoginVO.class);
-            redisService.delete(AppCacheKeyUtil.getUserIdToken(loginVO.getId()));
-            redisService.delete(AppCacheKeyUtil.getTokenUserInfo(token));
+//            Object object = redisService.get(AppCacheKeyUtil.getTokenUserInfo(token));
+//            LoginVO loginVO = JSONObject.parseObject(object.toString(), LoginVO.class);
+//            redisService.delete(AppCacheKeyUtil.getUserIdToken(loginVO.getId()));
+            redisService.delete(usedToken);
         }
         return true;
     }

src/main/java/com/example/xiaoshiweixinback/service/common/EsDenseVectorService.java

@@ -63,9 +63,10 @@ public class EsDenseVectorService {
         //分页
         if (pageNum != null && pageSize != null && pageNum > 0 && pageSize > 0) {
             builder.from((pageNum.intValue() - 1) * pageSize.intValue()).size(pageSize.intValue());
-        } else {
-            builder.from(0).size(99999);
         }
+//        else {
+//            builder.from(0).size(9);
+//        }
 
         SearchResponse<PatentVector> response = client.search(builder.build(), PatentVector.class);
         List<EsPictureVectorVo> vectorVos = new ArrayList<>();

src/main/java/com/example/xiaoshiweixinback/service/importPatent/ImportFromWebToEsService.java

@@ -28,8 +28,9 @@ public class ImportFromWebToEsService {
 
     @Autowired
     private SavePatentToEsService savePatentToEsService;
-@Autowired
-private GetPatentPictureFromWebService getPatentPictureFromWebService;
+    @Autowired
+    private GetPatentPictureFromWebService getPatentPictureFromWebService;
+
     public Boolean ImportTask(ImportTaskAMVO importTaskAMVO) {
 
         return excuteLessThan10000(importTaskAMVO);
@@ -128,8 +129,8 @@ private GetPatentPictureFromWebService getPatentPictureFromWebService;
                         uploadPatentWebDTO.setIndex(index);
                         uploadPatentWebDTO.setHaveSaveCounter(0);
                         getCataloguingFromWebService.loadPatentMessage(uploadPatentWebDTO);
-                         savePatentToEsService.saveOrUpdate(uploadPatentWebDTO);
-                         getPatentPictureFromWebService.getPatentPicture(uploadPatentWebDTO);
+                        savePatentToEsService.saveOrUpdate(uploadPatentWebDTO);
+                        getPatentPictureFromWebService.getPatentPicture(uploadPatentWebDTO);
                         ifHaveGet = true;
                         index += 1;
                     }