配置文件数据库更改，后端页面路径指向

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

@@ -16,6 +16,7 @@ import cn.jyjz.xiaoyao.ocr.service.*;
 import cn.jyjz.xiaoyao.ocr.thread.TaskQueue;
 import cn.jyjz.xiaoyao.ocr.thread.entity.PictureImgToLocalEntity;
 import cn.jyjz.xiaoyao.ocr.util.*;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -51,6 +52,8 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
     @Value("${image.similarityPath}")
     private String similarityPath;
+    @Value("${image.classifyPath}")
+    private String classifyPath;
     @Resource
     private OcrPictureMybatisDao ocrpicturemybatisdao;
 
@@ -394,12 +397,13 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
     @Override
     public Map<String, String> getOcrPictureClassifyAndHash(String img) {
-        JSONObject jsonObjectSimi = ImageClassUtil.getClassify(img,"1","http://127.0.0.1:8000/api/classify/");
+        JSONObject jsonObjectSimi = ImageClassUtil.getClassify(img,"1",classifyPath);
         //返回内容为零，表示成功，否则表示失败
-        if (null != jsonObjectSimi && jsonObjectSimi.getString("code").equals("0")) {
+        if (null != jsonObjectSimi && jsonObjectSimi.getString("code").equals("0") && jsonObjectSimi.get("data")!=null&&jsonObjectSimi.getJSONArray("data").size()>0) {
+            JSONObject data = jsonObjectSimi.getJSONArray("data").getJSONObject(0);
             Map<String,String> map=new HashMap();
-            map.put("classId",jsonObjectSimi.getString("classId"));
+            map.put("classId",data.getString("classId"));
-            map.put("hash",jsonObjectSimi.getString("hash"));
+            map.put("hash",data.getString("hash"));
             return map;
         }else{
             return null;

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureImgToLocalTask.java

@@ -10,6 +10,7 @@ import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.thread.entity.PictureImgToLocalEntity;
 import cn.jyjz.xiaoyao.ocr.util.DownloadImgUtil;
 import cn.jyjz.xiaoyao.ocr.util.ImageClassUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,20 +48,11 @@ public class PictureImgToLocalTask implements Runnable {
             if (ObjectUtil.isNotEmpty(picture)) {
                 picture.setLocalpictrueurl(pictureImgToLocal.getLocalPath());
                 picture.setIsdownload(1);
-                //TODO 接口请求判断重复情况
+                Map<String, String> ocrPictureClassifyAndHash = ocrPictureService.getOcrPictureClassifyAndHash(picture.getLocalpictrueurl());
-                JSONObject jsonObjectSimi = ImageClassUtil.getClassify(picture.getLocalpictrueurl(),"1","http://127.0.0.1:8000/api/classify/");
+                if(ocrPictureClassifyAndHash!=null){
-                System.out.println("responseDataXs   "  +jsonObjectSimi.toJSONString());
+                    picture.setImgHash(ocrPictureClassifyAndHash.get("hash"));
-                System.out.println("responseDataXs--classId = [" + jsonObjectSimi.get("classId") + "]");
+                    picture.setClassificationid(ocrPictureClassifyAndHash.get("classId"));
-                System.out.println("responseDataXs--hash = [" + jsonObjectSimi.get("hash") + "]");
-                String classId = "";
-                String hash="";
-                //返回内容为零，表示成功，否则表示失败
-                if (null != jsonObjectSimi && jsonObjectSimi.getString("code").equals("0")) {
-                    classId = jsonObjectSimi.getString("classId");
-                    hash = jsonObjectSimi.getString("hash");
                 }
-                picture.setImgHash(hash);
-                picture.setClassificationid(classId);
                 ocrPictureService.updateById(picture);
             }
         }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java

@@ -51,7 +51,18 @@ public class ImageClassUtil {
      * https://console-docs.apipost.cn/preview/7add2088a9a191d5/874020cbfba4287b
      * @param imgurl
      * @param taskId
-     * @return
+     * @return  {
+     *   "code": 0,
+     *   "data": [
+     *     {
+     *       "imgs": "/server/data/images/1754716707781476352.jpg",
+     *       "classId": 704,
+     *       "scores": 0.11721831560134888,
+     *       "hash": "0000000000000000110001101111111111100110111011101111110011110000"
+     *     }
+     *   ],
+     *   "taskId": "1"
+     * }
      */
     public static JSONObject getClassify(String imgurl,String taskId,String serverurl){
         if(StringUtils.isBlank(serverurl)){

runstart/src/main/resources/application-pro.yml

@@ -288,3 +288,4 @@ ocr:
       localImagePath: /server/data/images #图片本地存储地址
 image:
   similarityPath: http://127.0.0.1:8000/api/similarity/
+  classifyPath: http://127.0.0.1:8000/api/classify/