Merge branch 'test' into feat/ocrPictureLog_20240419

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<OcrCheckDescribeHis> {
+}

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;
+
+}

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<OcrCheckDescribeHis>{
+
+
+}

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<OcrCheckDescribeHisMapper, OcrCheckDescribeHis> implements OcrCheckDescribeHisService{
+
+}

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());
                 //业务主体名称

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrCheckDescribeHisMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrCheckDescribeHisMapper">
+  <resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDescribeHis">
+    <!--@mbg.generated-->
+    <!--@Table ocr_check_describe_his-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="pictureId" jdbcType="BIGINT" property="pictureid" />
+    <result column="checkResult" jdbcType="LONGVARCHAR" property="checkresult" />
+    <result column="describe" jdbcType="VARCHAR" property="describe" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, pictureId, checkResult, `describe`
+  </sql>
+</mapper>