From 85bb5c8679ae9a4fc6f17719a0863caf47bbff90 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Fri, 19 Apr 2024 09:44:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=BB=93?= =?UTF-8?q?=E6=9F=A5=E9=87=8D=E6=B7=BB=E5=8A=A0=E6=9F=A5=E9=87=8D=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataDao/OcrCheckDescribeHisMapper.java | 13 ++++++ .../ocr/dataobject/OcrCheckDescribeHis.java | 42 +++++++++++++++++++ .../service/OcrCheckDescribeHisService.java | 14 +++++++ .../impl/OcrCheckDescribeHisServiceImpl.java | 19 +++++++++ .../mapper/oa/OcrCheckDescribeHisMapper.xml | 16 +++++++ 5 files changed, 104 insertions(+) create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrCheckDescribeHisMapper.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDescribeHis.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrCheckDescribeHisService.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDescribeHisServiceImpl.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrCheckDescribeHisMapper.xml diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrCheckDescribeHisMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrCheckDescribeHisMapper.java new file mode 100644 index 00000000..f6e6b5ac --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrCheckDescribeHisMapper.java @@ -0,0 +1,13 @@ +package cn.jyjz.xiaoyao.ocr.dataDao; + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDescribeHis; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * ClassName： $className$.java + * Description: + * Author： scl. + * Date： 2024/4/18 22:57 + */ +public interface OcrCheckDescribeHisMapper extends BaseMapper { +} \ No newline at end of file diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDescribeHis.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDescribeHis.java new file mode 100644 index 00000000..0e8a9e80 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDescribeHis.java @@ -0,0 +1,42 @@ +package cn.jyjz.xiaoyao.ocr.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * ClassName： $className$.java + * Description: + * Author： scl. + * Date： 2024/4/18 22:57 + */ +@TableName(value = "ocr_check_describe_his") +@Data +public class OcrCheckDescribeHis { + /** + * 主键id + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 图片id + */ + @TableField(value = "pictureId") + private String pictureId; + + /** + * 小结查重结果 + */ + @TableField(value = "checkResult") + private String checkResult; + + /** + * 小结查重内容 + */ + @TableField(value = "`describe`") + private String describe; + +} \ No newline at end of file diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrCheckDescribeHisService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrCheckDescribeHisService.java new file mode 100644 index 00000000..86d78861 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrCheckDescribeHisService.java @@ -0,0 +1,14 @@ +package cn.jyjz.xiaoyao.ocr.service; + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDescribeHis; +import com.baomidou.mybatisplus.extension.service.IService; + /** + * ClassName： $className$.java + * Description: + * Author： scl. + * Date： 2024/4/18 22:57 + */ +public interface OcrCheckDescribeHisService extends IService{ + + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDescribeHisServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDescribeHisServiceImpl.java new file mode 100644 index 00000000..e64a52cc --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDescribeHisServiceImpl.java @@ -0,0 +1,19 @@ +package cn.jyjz.xiaoyao.ocr.service.impl; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.jyjz.xiaoyao.ocr.dataDao.OcrCheckDescribeHisMapper; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDescribeHis; +import cn.jyjz.xiaoyao.ocr.service.OcrCheckDescribeHisService; +/** + * ClassName： $className$.java + * Description: + * Author： scl. + * Date： 2024/4/18 22:57 + */ +@Service +public class OcrCheckDescribeHisServiceImpl extends ServiceImpl implements OcrCheckDescribeHisService{ + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrCheckDescribeHisMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrCheckDescribeHisMapper.xml new file mode 100644 index 00000000..cfcb4974 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrCheckDescribeHisMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + id, pictureId, checkResult, `describe` + + \ No newline at end of file From b0edc74a4cc60af3911a28bc2763a949b0019b27 Mon Sep 17 00:00:00 2001 From: shuliYao <1397940314@qq.com> Date: Fri, 19 Apr 2024 10:23:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E5=AE=9A=E4=BD=8D=E5=9C=B0?= =?UTF-8?q?=E5=9D=80map=E4=B8=BA=E7=A9=BA=EF=BC=8Cjson=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E4=B8=BA=E4=BA=86=20=E2=80=9Cnull=E2=80=9D=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java index a01af1cd..6d40aa3b 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java @@ -66,7 +66,10 @@ public class PictureDisposeTask implements Runnable{ // } //不为空开始组装参数 入库 OcrPicture picture = new OcrPicture(); - picture.setLocation(JSONObject.toJSONString(pictureSourceResult.getLocation())); + //定位信息 + if(pictureSourceResult.getLocation()!=null){ + picture.setLocation(JSONObject.toJSONString(pictureSourceResult.getLocation())); + } //业务主体 picture.setTenantId(pictureSourceResult.getAccountNo()); //业务主体名称