yaoshuli
/
ocr-activity-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 联调

Browse Source
feature/task-zhanglin
Vincent 21 hours ago
parent ebad8e0000
commit 604263da89
7 changed files with 7 additions and 46 deletions
Show Stats Download Patch File Download Diff File

1
jeecg-module-custom/src/main/java/org/jeecg/module/custom/ocr/api/entity/FormRecord.java
Unescape View File

@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
import lombok.Data; import lombok.Data;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
@Data @Data

2
jeecg-module-custom/src/main/java/org/jeecg/module/custom/ocr/api/thread/tasks/PictureImgToLocalTask.java
Unescape View File

@ -98,7 +98,7 @@ public class PictureImgToLocalTask implements Runnable {
taskService.updateById(task); taskService.updateById(task);
logger.info("图片本地化，回写数据完成!"); logger.info("图片本地化，回写数据完成!");
logger.info("开启获取图片信息操作!"); logger.info("开启获取图片信息操作!");
ocrPictureService.savePicturesInfo(task, livePhoto.getFileUrl(), type); ocrPictureService.savePicturesInfo(task, livePhoto.getFileName(), livePhoto.getFileUrl(), type);
logger.info("获取图片信息操作,结束!"); logger.info("获取图片信息操作,结束!");
} }
} }

1
jeecg-module-custom/src/main/java/org/jeecg/module/custom/ocr/controller/dto/enc/DuplicateTaskEncRequest.java
Unescape View File

@ -1,7 +1,6 @@
package org.jeecg.module.custom.ocr.controller.dto.enc; package org.jeecg.module.custom.ocr.controller.dto.enc;
import lombok.Data; import lombok.Data;
import org.jeecg.module.custom.ocr.controller.dto.DuplicateTaskData;
@Data @Data
public class DuplicateTaskEncRequest { public class DuplicateTaskEncRequest {

2
jeecg-module-custom/src/main/java/org/jeecg/module/custom/ocr/service/OcrPictureService.java
Unescape View File

@ -29,5 +29,5 @@ public interface OcrPictureService extends BaseService<OcrPicture> {
OcrPicture getByTaskId(Long taskId); OcrPicture getByTaskId(Long taskId);
void savePicturesInfo(Task task, String fileUrl , String type); void savePicturesInfo(Task task, String fileName, String fileUrl , String type);
} }

4
jeecg-module-custom/src/main/java/org/jeecg/module/custom/ocr/service/impl/OcrPictureServiceImpl.java
Unescape View File

@ -162,12 +162,12 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
} }
@Override @Override
public void savePicturesInfo(Task task, String imageUrl, String type) { public void savePicturesInfo(Task task, String fileName, String imageUrl, String type) {
boolean isConnection = true; boolean isConnection = true;
OcrPictureInfo imageInfo = getImageInfo(imageUrl, isConnection); OcrPictureInfo imageInfo = getImageInfo(imageUrl, isConnection);
imageInfo.setPictureId(task.getId()); imageInfo.setPictureId(task.getId());
imageInfo.setImgName(String.valueOf(task.getImageNo())); imageInfo.setImgName(fileName);
imageInfo.setImageUrl(imageUrl); imageInfo.setImageUrl(imageUrl);
imageInfo.setLocalImageUrl(task.getLocalImageUrl()); imageInfo.setLocalImageUrl(task.getLocalImageUrl());
imageInfo.setImgHash(task.getImgHash()); imageInfo.setImgHash(task.getImgHash());

5
jeecg-module-custom/src/main/java/org/jeecg/module/custom/ocr/utils/ImageClassUtil.java
Unescape View File

@ -71,8 +71,9 @@ public class ImageClassUtil {
jsonObjectVi.put("taskId", taskId); jsonObjectVi.put("taskId", taskId);
JSONArray jsonArrayVi = new JSONArray(); JSONArray jsonArrayVi = new JSONArray();
// TODO: 测试环境可能需要调整本地图片地址路径 // TODO: 测试环境可能需要调整本地图片地址路径
jsonArrayVi.add(imgurl); // jsonArrayVi.add(imgurl);
// jsonArrayVi.add("/server/ocr/data/images/test01.png"); jsonArrayVi.add("/server/ocr/data/images/test01.png");
logger.info("imgurl={}", imgurl);
jsonObjectVi.put("imgUrls", jsonArrayVi); jsonObjectVi.put("imgUrls", jsonArrayVi);
HttpParamers paramersVi = HttpParamers.httpPostParamers(); HttpParamers paramersVi = HttpParamers.httpPostParamers();

38
jeecg-module-custom/src/main/resources/mapper/TaskMapper.xml
Unescape View File

@ -95,42 +95,4 @@
AND JSON_LENGTH(JSON_EXTRACT(t.dynamic_fields, CONCAT('$.', jt.col))) > 0 AND JSON_LENGTH(JSON_EXTRACT(t.dynamic_fields, CONCAT('$.', jt.col))) > 0
) )
</select> </select>
<!-- <select id="selectByAccountNoAndQueryConfig" resultType="org.jeecg.module.custom.ocr.dataobject.Task">-->
<!-- SELECT *-->
<!-- FROM task t-->
<!-- WHERE t.account_no = #{accountNo}-->
<!-- AND JSON_EXTRACT(t.dynamic_fields, CONCAT('$.', JSON_UNQUOTE(JSON_EXTRACT(#{queryConfig}, '$.validateTimeColumn')))) BETWEEN-->
<!-- UNIX_TIMESTAMP(STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(#{queryConfig}, '$.startTime')), '%Y-%m-%d %H:%i:%s.%f')) * 1000-->
<!-- AND-->
<!-- UNIX_TIMESTAMP(STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(#{queryConfig}, '$.endTime')), '%Y-%m-%d %H:%i:%s.%f')) * 1000-->
<!-- AND EXISTS (-->
<!-- SELECT 1-->
<!-- FROM JSON_TABLE(-->
<!-- JSON_EXTRACT(#{queryConfig}, '$.validateColumn'),-->
<!-- '$[*]' COLUMNS (col VARCHAR(255) PATH '$')-->
<!-- ) AS jt-->
<!-- WHERE JSON_EXTRACT(t.dynamic_fields, CONCAT('$.', jt.col)) IS NOT NULL-->
<!-- AND JSON_LENGTH(JSON_EXTRACT(t.dynamic_fields, CONCAT('$.', jt.col))) > 0-->
<!-- )-->
<!-- </select>-->
<!-- <select id="selectByAccountNoAndQueryConfig" resultType="org.jeecg.module.custom.ocr.dataobject.Task">-->
<!-- SELECT *-->
<!-- FROM task t-->
<!-- WHERE t.account_no = #{accountNo}-->
<!-- AND JSON_EXTRACT(t.dynamic_fields, CONCAT('$.', JSON_UNQUOTE(JSON_EXTRACT(#{queryConfig}, '$.validateTimeColumn')))) BETWEEN-->
<!-- UNIX_TIMESTAMP(STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(#{queryConfig}, '$.startTime')), '%Y-%m-%d %H:%i:%s.%f')) * 1000-->
<!-- AND-->
<!-- UNIX_TIMESTAMP(STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(#{queryConfig}, '$.endTime')), '%Y-%m-%d %H:%i:%s.%f')) * 1000-->
<!-- AND EXISTS (-->
<!-- SELECT 1-->
<!-- FROM JSON_TABLE(-->
<!-- JSON_EXTRACT(#{queryConfig}, '$.validateColumn'),-->
<!-- '$[*]' COLUMNS (col VARCHAR(255) PATH '$')-->
<!-- ) AS jt-->
<!-- WHERE JSON_EXTRACT(t.dynamic_fields, CONCAT('$.', jt.col)) IS NOT NULL-->
<!-- AND JSON_LENGTH(JSON_EXTRACT(t.dynamic_fields, CONCAT('$.', jt.col))) > 0-->
<!-- )-->
<!-- </select>-->
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save