解决冲突

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

@@ -60,6 +60,28 @@ public class ApiTestController {
     @Resource
     private OcrPrevailCloudLogService ocrPrevailCloudLogService;
 
+    /**
+     * 拉取无量云全量任务数据，根据业务主体
+     * @param request
+     * @return
+     */
+    @GetMapping("pullPictureAllByAccountNo")
+    public String pullPictureAllByAccountNo(HttpServletRequest request){
+        String beginStr = request.getParameter("beginStr");
+        String endStr = request.getParameter("endStr");
+        String tenantNoStr = request.getParameter("tenantNo");
+        if(StringUtils.isBlank(tenantNoStr)){
+            return "租户不能为空";
+        }
+        String accountNoStr = request.getParameter("accountNo");
+        if(StringUtils.isBlank(accountNoStr)){
+            return "业务主体不能为空";
+        }
+        Long tenantNo = Long.parseLong(request.getParameter("tenantNo"));
+        Long accountNo = Long.parseLong(request.getParameter("accountNo"));
+        return "";
+    }
+
     /**
      * 拉取无量云任务数据，根据单租户、业务主体拉取
      * pull wyl task data
@@ -88,7 +110,7 @@ public class ApiTestController {
         DateTime dateTime = DateUtil.parse(beginStr + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
 //        DateTime dateTime = DateUtil.parse("2024-03-31 07:00:000","yyyy-MM-dd HH:mm:ss");
         Instant binstant = dateTime.toInstant();
-        DateTime dateTime1 = DateUtil.parse(endStr + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        DateTime dateTime1 = DateUtil.parse(endStr+" 23:59:59","yyyy-MM-dd HH:mm:ss");
 //        DateTime dateTime1 = DateUtil.parse("2024-03-31 09:00:00","yyyy-MM-dd HH:mm:ss");
         Instant einstant = dateTime1.toInstant();
         pictureSourceParameter.setStartTime(Date.from(binstant));

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrFrontConf.java

@@ -63,4 +63,9 @@ public class OcrFrontConf implements java.io.Serializable {
      * 默认图片
      */
     private String defaultPictureImg;
+
+    /**
+     * 拉取全量接口数据
+     */
+    private String pictureSourceAllUrl;
 }

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

@@ -332,6 +332,9 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
     @Override
     public OcrPicture getPackagePictureInfo(String checkDuplicateId, String pictureId, UserToken userToken) {
         OcrPicture ocrPicture = pictureMybatisDao.getPackagePictureInfo(checkDuplicateId, pictureId);
+        if(ocrPicture==null){
+            return null;
+        }
         OcrPictureInfo one = ocrPictureInfoService.getOne(new LambdaQueryWrapper<OcrPictureInfo>().eq(OcrPictureInfo::getPictureId, ocrPicture.getId()));
         ocrPicture.setPictureInfo(one);
         if (ObjectUtil.isNotEmpty(one)) {
@@ -561,21 +564,21 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
             }
             ocrPictureDuplicateHisService.remove(new LambdaQueryWrapper<OcrPictureDuplicateHis>().eq(OcrPictureDuplicateHis::getPictureId, id));
         }
-        //查重结果
+        //删除任务包,查重结果
-        OcrCheckDuplicateResult duplicateResult = ocrCheckDuplicateResultService.getOne(new LambdaQueryWrapper<OcrCheckDuplicateResult>().eq(OcrCheckDuplicateResult::getPictureId, id));
+//        OcrCheckDuplicateResult duplicateResult = ocrCheckDuplicateResultService.getOne(new LambdaQueryWrapper<OcrCheckDuplicateResult>().eq(OcrCheckDuplicateResult::getPictureId, id));
-        String compareResultJson = duplicateResult.getCompareResultJson();
+//        String compareResultJson = duplicateResult.getCompareResultJson();
-        if (StringUtils.isNotBlank(compareResultJson)) {
+//        if (StringUtils.isNotBlank(compareResultJson)) {
-            JSONObject jsonObject = JSON.parseObject(compareResultJson);
+//            JSONObject jsonObject = JSON.parseObject(compareResultJson);
-            Set<String> keyList = jsonObject.keySet();
+//            Set<String> keyList = jsonObject.keySet();
-            List<OcrCheckDuplicateResult> list = ocrCheckDuplicateResultService.list(new LambdaQueryWrapper<OcrCheckDuplicateResult>().in(OcrCheckDuplicateResult::getPictureId, keyList));
+//            List<OcrCheckDuplicateResult> list = ocrCheckDuplicateResultService.list(new LambdaQueryWrapper<OcrCheckDuplicateResult>().in(OcrCheckDuplicateResult::getPictureId, keyList));
-            for (OcrCheckDuplicateResult checkDuplicateResult : list) {
+//            for (OcrCheckDuplicateResult checkDuplicateResult : list) {
-                String resultCompareResultJson = checkDuplicateResult.getCompareResultJson();
+//                String resultCompareResultJson = checkDuplicateResult.getCompareResultJson();
-                JSONObject json = JSON.parseObject(resultCompareResultJson);
+//                JSONObject json = JSON.parseObject(resultCompareResultJson);
-                json.remove(id.toString());
+//                json.remove(id.toString());
-                checkDuplicateResult.setCompareResultJson(JSON.toJSONString(json));
+//                checkDuplicateResult.setCompareResultJson(JSON.toJSONString(json));
-            }
+//            }
-            ocrCheckDuplicateResultService.updateBatchById(list);
+//            ocrCheckDuplicateResultService.updateBatchById(list);
-        }
+//        }
         ocrCheckDuplicateResultService.remove(new LambdaQueryWrapper<OcrCheckDuplicateResult>().eq(OcrCheckDuplicateResult::getPictureId, id));
     }