Merge pull request 'fix:可疑文件删除接口增加非空判断,添加API文档注释' (#57) from fix/userSearch_0402 into test

Reviewed-on: #57

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) {