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

@@ -159,9 +159,9 @@ public class PictureSourceResult {
      */
     String  companyDepartment;
     /**
-     * 厂商
+     * 生产基地
      */
-    Map<String,Object>  manufacturer;
+    String  manufacturer;
 
     /**
      * 拜访小节

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

@@ -85,8 +85,8 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
 
         //组装请求参数
         String url = apiConfig.getInterfaceDomain()+pictureSourceUrl;
-        String requestBodyJson = JSONObject.toJSONString(requestData);
-//        String requestBodyJson = "{\"accessKey\":\"7390F0221A1A73D8E13F8C8BB96F33B0\",\"data\":\"gzUtN5Mt24_fbDDMK3wLop8Tgu68xLCVy3Wzp9BcXnkxnCiPg_D2TNEXnQ68-Y-GhGYYcD7Iwg8juZTx1m5v4NkDvKvEwdvjQvZnMDTRYbqtHrwgVLAvUGotIMTckDY67yo2Ku52vWedjYpzzDseHwiIGVcIl-u1CljEbyjLzJzIf6oXfD7qKjOYnxKjfjp11k0IlvsPdS-mgNXTHcBei5jOFrYmZrE2y4v9bI5n1QE\",\"signature\":\"0bmIbhhybDcGeyX4ao5gSPZQeaY8G2JRh3nRt7NC7qw\",\"tenantCode\":\"1673196576094806016\",\"timestamp\":1711971774448}";
+//        String requestBodyJson = JSONObject.toJSONString(requestData);
+        String requestBodyJson = "{\"accessKey\":\"7390F0221A1A73D8E13F8C8BB96F33B0\",\"data\":\"gzUtN5Mt24_fbDDMK3wLop8Tgu68xLCVy3Wzp9BcXnkxnCiPg_D2TNEXnQ68-Y-GhGYYcD7Iwg8juZTx1m5v4NkDvKvEwdvjQvZnMDTRYbqtHrwgVLAvUGotIMTckDY67yo2Ku52vWedjYpzzDseHwiIGVcIl-u1CljEbyjLzJzIf6oXfD7qKjOYnxKjfjp11k0IlvsPdS-mgNXTHcBei5jOFrYmZrE2y4v9bI5n1QE\",\"signature\":\"0bmIbhhybDcGeyX4ao5gSPZQeaY8G2JRh3nRt7NC7qw\",\"tenantCode\":\"1673196576094806016\",\"timestamp\":1711971774448}";
         //入参
         System.out.println("入参数据:"+requestBodyJson);
         HttpParamers httpParamers = new HttpParamers(HttpMethod.POST);

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

@@ -37,18 +37,18 @@ public class ApiTestController {
         String pageNo = request.getParameter("pageNo");
 
         PictureSourceParameter pictureSourceParameter = new PictureSourceParameter();
-        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");
+//        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("2024-03-31 09:00:00","yyyy-MM-dd HH:mm:ss");
+//        DateTime dateTime1 = DateUtil.parse(" 00:00:00","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));
         pictureSourceParameter.setEndTime(Date.from(einstant));
         pictureSourceParameter.setPageNo(Integer.parseInt(pageNo));
         pictureSourceParameter.setPageSize(Integer.parseInt(pageSize));
         pictureSourceParameter.setTenantNo(1714548920583360512L);
-        pictureSourceParameter.setAccountNo(1714887674875514880L);
+        pictureSourceParameter.setAccountNo(1714559587755397120L);
         try {
             ApiPage<PictureSourceResult> apiPage  =  prevailCloudApi.pullPictureSource(pictureSourceParameter);
             List<PictureSourceResult> listResult= apiPage.getRecords();

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

@@ -673,7 +673,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
         //2.调整图片地址，补齐域名
         for (OcrPicture picture : ocrPictureList) {
             picture.setCreateTime(System.currentTimeMillis()); //获取创建时间戳
-//            picture.setImgurl(interfaceDomain + picture.getImgurl());
+            picture.setImgurl(interfaceDomain + picture.getImgurl());
         }
 
         boolean saveBatch = this.saveBatch(ocrPictureList);

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

@@ -45,11 +45,7 @@ public class PictureDisposeTask implements Runnable{
 
         //定义新增集合对象
         List<OcrPicture> ocrPictureList = new ArrayList<>();
-        int index =0;
         for (Map<String, Object> map : livePhoto) {
-            if(index>0){
-                continue;
-            }
             //检查图片地址是否为空
             if(map.get("imgUrl")!=null && !StringUtils.isEmpty(map.get("imgUrl").toString())){
                 //判断该任务是否存在，判断依据是任务ID相同，提报时间不同则可以插入
@@ -117,7 +113,7 @@ public class PictureDisposeTask implements Runnable{
                 //所属任务名称
                 picture.setTaskname(pictureSourceResult.getTaskName());
                 //任务来源名称
-                picture.setField4("无量云2.0");
+                picture.setField4(pictureSourceResult.getTaskName());
                 //所属任务状态
                 if(pictureSourceResult.getTenantStatus()!=null) {
                     picture.setTaskstatus(pictureSourceResult.getTenantStatus().toString());
@@ -186,16 +182,10 @@ public class PictureDisposeTask implements Runnable{
                         picture.setField9(pictureSourceResult.getProductName().get("name").toString());
                     }
                 }
-
-                //厂商
-                if(pictureSourceResult.getManufacturer()!=null){
-                    if(pictureSourceResult.getManufacturer().get("name")!=null){
-                        picture.setField5(pictureSourceResult.getManufacturer().get("name").toString());
-                    }
-                }
                 //拜访科室
                 picture.setField7(pictureSourceResult.getCompanyDepartment());
-
+                //生产基地
+                picture.setField5(pictureSourceResult.getManufacturer());
                 //拜访小结
                 picture.setField8(pictureSourceResult.getDiscoveredIssues());
                 //拜访日期
@@ -222,7 +212,6 @@ public class PictureDisposeTask implements Runnable{
                 //默认为创建人为admin
                 picture.setCreateBy("1");
                 ocrPictureList.add(picture);
-                index++;
             }
 
         }