Merge pull request 'fix:修改可疑文件夹相似度排序字段名，适配前端，同时修改apifox，新增下载图片监测接口，该接口暂不完善，还需要调整' (#83) from fix/Download_image_interface_added into test

Reviewed-on: #83

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java

@@ -27,4 +27,10 @@ public interface PrevailCloudApi {
      * @param tenantNo
      */
     void pullAccountInfo(long tenantNo) throws Exception;
+
+    /**
+     * 图片下载监测
+     */
+    boolean startImageDownloadMonitoring(String localImagePath) throws Exception;
+
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java

@@ -2,17 +2,23 @@ package cn.jyjz.xiaoyao.ocr.api.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONUtil;
+import cn.jyjz.xiaoyao.common.base.util.SpringUtils;
 import cn.jyjz.xiaoyao.ocr.api.PrevailCloudApi;
 import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceParameter;
 import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult;
 import cn.jyjz.xiaoyao.ocr.api.utils.*;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
+import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.thread.TaskQueue;
+import cn.jyjz.xiaoyao.ocr.thread.entity.PictureImgToLocalEntity;
 import cn.jyjz.xiaoyao.ocr.util.httputil.HttpClient;
 import cn.jyjz.xiaoyao.ocr.util.httputil.HttpMethod;
 import cn.jyjz.xiaoyao.ocr.util.httputil.HttpParamers;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import liquibase.pro.packaged.S;
+import lombok.SneakyThrows;
 import org.apache.commons.collections.SequencedHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -166,4 +172,50 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
         }
     }
 
+    /**
+     * 启动任务 图片下载监测
+     *
+     * @return
+     */
+    @Override
+    public boolean startImageDownloadMonitoring(String localImagePath) {
+        Runnable runnable = new Runnable() {
+            @SneakyThrows
+            @Override
+            public void run() {
+                OcrPictureService ocrPictureService = SpringUtils.getBean("ocrPictureService");
+                logger.debug("图片下载监测中...");
+                // 查询数据库中local_picture_url字段为null的图片数据
+                LambdaQueryWrapper<OcrPicture> ocrPictureLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                ocrPictureLambdaQueryWrapper.isNull(OcrPicture::getLocalpictrueurl);
+                List<OcrPicture> ocrPictureList = new ArrayList<>();
+                ocrPictureList = ocrPictureService.list(ocrPictureLambdaQueryWrapper);
+                logger.debug("待执行下载图片数量:{}",ocrPictureList.size());
+                for (OcrPicture pictureOne : ocrPictureList) {
+                    // 创建 PictureImgToLocalEntity 对象并赋值
+                    PictureImgToLocalEntity entity = new PictureImgToLocalEntity();
+                    entity.setPictureId(pictureOne.getId());
+                    entity.setImgUrl(pictureOne.getImgurl());
+                    String imgurl = pictureOne.getImgurl();
+                    entity.setLocalPath(localImagePath + imgurl.substring(imgurl.lastIndexOf("/")));
+                    //本地调试下载地址
+//                            entity.setLocalPath("D:\\server\\data\\images" + imgurl.substring(imgurl.lastIndexOf("/")));
+                    // 将对象添加到下载图片队列中
+                    boolean isAddedToQueue = false;
+                    while (!isAddedToQueue) {
+                        isAddedToQueue  =TaskQueue.pictureImgToLocalPushData(entity);
+                        if (!isAddedToQueue) {
+                            logger.info("图片下载监测-添加队列失败，等待五秒后继续进行添加,图片id:{}",entity.getPictureId());
+                            Thread.sleep(5000);
+                        }
+                    }
+                }
+            }
+        };
+        Thread thread = new Thread(runnable);
+        thread.start();
+        return true;
+    }
+    
+
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java

@@ -7,9 +7,11 @@ import cn.jyjz.xiaoyao.ocr.api.PrevailCloudApi;
 import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceParameter;
 import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult;
 import cn.jyjz.xiaoyao.ocr.api.utils.ApiPage;
+import cn.jyjz.xiaoyao.ocr.thread.ImageDownloadMonitoring;
 import cn.jyjz.xiaoyao.ocr.thread.TaskQueue;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,6 +32,10 @@ import java.util.List;
 @RestController
 @RequestMapping("/test/api")
 public class ApiTestController {
+
+    @Value("${ocr.api.wly.localImagePath}")
+    private String localImagePath;
+
     @Autowired
     private PrevailCloudApi prevailCloudApi;
 
@@ -181,5 +187,22 @@ public class ApiTestController {
         thread.start();
         return "开启入库";
     }
+
+    @GetMapping("downloadImageMonitor")
+    public String downloadImageMonitor(HttpServletRequest request) {
+        String message;
+        try {
+            boolean result = prevailCloudApi.startImageDownloadMonitoring(localImagePath);
+            if (result) {
+                message = "操作成功";
+            } else {
+                message = "操作失败";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            message = "操作失败，发生异常：" + e.getMessage();
+        }
+        return message;
+    }
 }
 

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java

@@ -68,7 +68,7 @@ public class OcrTaskchildDubiousFileController  {
                                                                  @RequestParam(value = "pageNo", required = false, defaultValue = "0") Integer pageNo,
                                                                  @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
                                                                  @RequestParam(value = "orderByUptime",required = false) String orderByUptime,
-                                                                 @RequestParam(value = "orderBysimilarity",required = false) String orderBysimilarity) {
+                                                                 @RequestParam(value = "orderBySimilarity",required = false) String orderBySimilarity) {
 
 
         String tenantId = request.getHeader("X-Tenant-Id");
@@ -98,7 +98,7 @@ public class OcrTaskchildDubiousFileController  {
 //
 //        //IPage<OcrPicture> page = ocrpictureservice.page(iPage, wrapper);
 
-        Page<OcrTaskChildPictureVo>  page = ocrTaskchildDubiousFileService.dubiousfilelist(pageNo,pageSize,orderByUptime,orderBysimilarity,userToken,tenantId);
+        Page<OcrTaskChildPictureVo>  page = ocrTaskchildDubiousFileService.dubiousfilelist(pageNo,pageSize,orderByUptime,orderBySimilarity,userToken,tenantId);
 
         return ResultVoUtil.success(page);
     }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskchildDubiousFileService.java

@@ -17,6 +17,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IOcrTaskchildDubiousFileService extends IService<OcrTaskchildDubiousFile> {
 
-    Page<OcrTaskChildPictureVo> dubiousfilelist(Integer pageNo, Integer pageSize,String orderByUptime,String orderBysimilarity,UserToken userToken, String tenantId);
+    Page<OcrTaskChildPictureVo> dubiousfilelist(Integer pageNo, Integer pageSize,String orderByUptime,String orderBySimilarity,UserToken userToken, String tenantId);
 
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java

@@ -49,13 +49,13 @@ public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl<OcrTaskchild
      * @param pageNo
      * @param pageSize
      * @param orderByUptime
-     * @param orderBysimilarity
+     * @param orderBySimilarity
      * @param userToken
      * @param tenantId
      * @return
      */
     @Override
-    public Page<OcrTaskChildPictureVo> dubiousfilelist(Integer pageNo, Integer pageSize,String orderByUptime,String orderBysimilarity,UserToken userToken, String tenantId) {
+    public Page<OcrTaskChildPictureVo> dubiousfilelist(Integer pageNo, Integer pageSize,String orderByUptime,String orderBySimilarity,UserToken userToken, String tenantId) {
 
         Page<OcrTaskChildPictureVo> objectPage = new Page<>(Integer.valueOf(pageNo), Integer.valueOf(pageSize));
 
@@ -89,11 +89,11 @@ public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl<OcrTaskchild
             }
 
             // 判断 orderBysimilarity 是否不为空
-            if (orderBysimilarity != null && StringUtils.isNotEmpty(orderBysimilarity)) {
+            if (orderBySimilarity != null && StringUtils.isNotEmpty(orderBySimilarity)) {
                 Comparator<OcrTaskChildPictureVo> similarityComparator = null;
-                if ("asc".equals(orderBysimilarity)) {
+                if ("asc".equals(orderBySimilarity)) {
                     similarityComparator = Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore);
-                } else if ("desc".equals(orderBysimilarity)) {
+                } else if ("desc".equals(orderBySimilarity)) {
                     similarityComparator = Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore).reversed();
                 }