From fe9ac432e7979c9f7558a101241f39245eddcc24 Mon Sep 17 00:00:00 2001
From: LILI <707464720@qq.com>
Date: Tue, 2 Apr 2024 15:49:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8F=AF=E7=96=91=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E9=9D=9E?=
 =?UTF-8?q?=E7=A9=BA=E5=88=A4=E6=96=AD,=E6=B7=BB=E5=8A=A0API=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OcrTaskchildDubiousFileController.java           | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java
index cdc22016..dc28900c 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java
@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -31,11 +33,12 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * ocr控制器
+ * ocr可疑文件控制器
  *
  * @author 你的肉
  * @Date 2024-03-21 19:00:57
  */
+@Api(tags="ocr可疑文件控制器")
 @RestController
 @RequestMapping("/ocr/dubiousfile")
 public class OcrTaskchildDubiousFileController  {
@@ -58,8 +61,9 @@ public class OcrTaskchildDubiousFileController  {
      * @param request
      * @return
      */
+    @ApiOperation(value="可疑文件列表查询", notes="可疑文件列表查询")
     @RequestMapping(value = "/dubiousfilelist", method = RequestMethod.GET)
-    public ResultVo dubiousfilelist(HttpServletRequest request,
+    public ResultVo<Page<OcrTaskChildPictureVo>> dubiousfilelist(HttpServletRequest request,
                                   @RequestParam(value = "pageNo", required = false, defaultValue = "0") Integer pageNo,
                                   @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
                                     @RequestParam(value = "orderbyname", required = true, defaultValue = "asc") String orderbyname) {
@@ -103,6 +107,7 @@ public class OcrTaskchildDubiousFileController  {
      * @param request
      * @return
      */
+    @ApiOperation(value="可疑文件列表移除", notes="可疑文件列表移除")
     @RequestMapping(value = "/dubiousfileyc", method = RequestMethod.GET)
     public ResultVo dubiousfileyc(HttpServletRequest request, @RequestParam(value = "pictureid", required = true) String pictureid) {
 
@@ -114,9 +119,11 @@ public class OcrTaskchildDubiousFileController  {
         List<OcrTaskchildDubiousFile> fileList = new ArrayList<>();
         for (String childpictureid : cps) {
             OcrPicture ocrPicture = ocrpictureservice.selectDtoById(Long.parseLong(childpictureid));
+            if(ocrPicture != null){
                 ocrPicture.setSuspiciousfile(0);
                 ocrPicture.setUpdateTime(System.currentTimeMillis());
                 saveList.add(ocrPicture);
+            }
 
             QueryWrapper<OcrTaskchildDubiousFile> dubiouswrapper = new QueryWrapper<>();
             dubiouswrapper.eq("userid",userToken.getUserid()).eq("picture_id",childpictureid);
@@ -136,6 +143,7 @@ public class OcrTaskchildDubiousFileController  {
      * @param request
      * @return
      */
+    @ApiOperation(value="可疑文件列表添加", notes="可疑文件列表添加")
     @RequestMapping(value = "/dubiousfileyd", method = RequestMethod.GET)
     public ResultVo dubiousfileyd(HttpServletRequest request, @RequestParam(value = "pictureid", required = true) String pictureid) {