字段修改

dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java

@@ -12,6 +12,7 @@ import com.da.dangan.util.CallThirdInterface;
 import com.da.framework.config.ServerConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -108,6 +109,7 @@ public class DangAnCollectController extends BaseController {
                 newPicRecard.setMuPath(picRecard.getMuPath());
                 newPicRecard.setWlsjId(picRecard.getWlsjId());
                 newPicRecard.setWlsjPath(picRecard.getWlsjPath());
+                newPicRecard.setYwType(picRecard.getYwType());
                 daPicturesRecardService.insertDaPicturesRecard(newPicRecard);
                 picRecards.add(newPicRecard);
             }
@@ -124,7 +126,7 @@ public class DangAnCollectController extends BaseController {
     }
 
     /**
-     * 调用ocr识别接口
+     * 调用ocr识别接口——识别单张图片为一条记录
      */
     @PostMapping("/recongnize")
     public AjaxResult recognize(@RequestBody DaPicturesRecard[] picRecards) {
@@ -144,7 +146,7 @@ public class DangAnCollectController extends BaseController {
             // TODO 根据业务类型存储识别后的信息
             //daCzrkdjService.insertDaCzrkdj();
 
-            //修改图片信息记录表为已识别
+            //识别成功的图片 ，修改图片信息记录表为已识别
             for (DaPicturesRecard picRecard : picRecards) {
                 picRecard.setRecognize("1");
                 daPicturesRecardService.updateDaPicturesRecard(picRecard);
@@ -156,6 +158,17 @@ public class DangAnCollectController extends BaseController {
         return AjaxResult.success();
     }
 
+    /**
+     *   图片批量识别处理进度
+     */
+    @GetMapping("/progress")
+    public ResponseEntity<Double> getProgress() {
+
+        //调用第三方进度条接口
+
+        // 返回进度值，例如：0.5代表50%
+        return ResponseEntity.ok(0.5);
+    }
 
     /**
      * 测试第三方接口
@@ -173,18 +186,6 @@ public class DangAnCollectController extends BaseController {
         return result;
     }
 
-    /**
-     * 测试访问本地接口
-     *
-     * @param url
-     * @return
-     * @throws Exception
-     */
-    @PostMapping("/test2")
-    public String test(String url) throws Exception {
-        return CallThirdInterface.callThirdInterface1(url);
-    }
-
     /**
      * 测试添加水印
      */

dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 常住人口登记对象 da_czrkdj
  *
  * @author hs
- * @date 2024-05-08
+ * @date 2024-05-30
  */
 public class DaCzrkdj extends BaseEntity
 {
@@ -21,6 +21,10 @@ public class DaCzrkdj extends BaseEntity
     /** id */
     private Long id;
 
+    /** 业务类型(字典) */
+    @Excel(name = "业务类型(字典)")
+    private String ywType;
+
     /** 目录id */
     @Excel(name = "目录id")
     private Long muId;
@@ -54,8 +58,8 @@ public class DaCzrkdj extends BaseEntity
     @Excel(name = "身份证号")
     private String cardId;
 
-    /** 档案图片 */
+    /** 识别的图片 */
-    @Excel(name = "档案图片")
+    @Excel(name = "识别的图片")
     private String pictures;
 
     public void setId(Long id)
@@ -67,6 +71,15 @@ public class DaCzrkdj extends BaseEntity
     {
         return id;
     }
+    public void setYwType(String ywType)
+    {
+        this.ywType = ywType;
+    }
+
+    public String getYwType()
+    {
+        return ywType;
+    }
     public void setMuId(Long muId)
     {
         this.muId = muId;
@@ -152,21 +165,22 @@ public class DaCzrkdj extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
+                .append("id", getId())
-            .append("muId", getMuId())
+                .append("ywType", getYwType())
-            .append("name", getName())
+                .append("muId", getMuId())
-            .append("hzName", getHzName())
+                .append("name", getName())
-            .append("relation", getRelation())
+                .append("hzName", getHzName())
-            .append("birthday", getBirthday())
+                .append("relation", getRelation())
-            .append("address", getAddress())
+                .append("birthday", getBirthday())
-            .append("jiguan", getJiguan())
+                .append("address", getAddress())
-            .append("cardId", getCardId())
+                .append("jiguan", getJiguan())
-            .append("pictures", getPictures())
+                .append("cardId", getCardId())
-            .append("remark", getRemark())
+                .append("pictures", getPictures())
-            .append("createBy", getCreateBy())
+                .append("remark", getRemark())
-            .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy())
-            .append("updateBy", getUpdateBy())
+                .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
+                .append("updateBy", getUpdateBy())
-            .toString();
+                .append("updateTime", getUpdateTime())
+                .toString();
     }
 }

dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java

@@ -9,7 +9,7 @@ import com.da.common.core.domain.BaseEntity;
  * 档案图片信息记录对象 da_pictures_recard
  *
  * @author hs
- * @date 2024-05-15
+ * @date 2024-05-30
  */
 public class DaPicturesRecard extends BaseEntity
 {
@@ -46,6 +46,10 @@ public class DaPicturesRecard extends BaseEntity
     @Excel(name = "业务类型(字典)")
     private String ywType;
 
+    /** 对应档案记录id */
+    @Excel(name = "对应档案记录id")
+    private Long daJlId;
+
     /** 是否已识别 */
     @Excel(name = "是否已识别")
     private String recognize;
@@ -122,6 +126,15 @@ public class DaPicturesRecard extends BaseEntity
     {
         return ywType;
     }
+    public void setDaJlId(Long daJlId)
+    {
+        this.daJlId = daJlId;
+    }
+
+    public Long getDaJlId()
+    {
+        return daJlId;
+    }
     public void setRecognize(String recognize)
     {
         this.recognize = recognize;
@@ -143,6 +156,7 @@ public class DaPicturesRecard extends BaseEntity
                 .append("muId", getMuId())
                 .append("muPath", getMuPath())
                 .append("ywType", getYwType())
+                .append("daJlId", getDaJlId())
                 .append("recognize", getRecognize())
                 .append("remark", getRemark())
                 .append("createBy", getCreateBy())

dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="DaCzrkdj" id="DaCzrkdjResult">
         <result property="id"    column="id"    />
+        <result property="ywType"    column="yw_type"    />
         <result property="muId"    column="mu_id"    />
         <result property="name"    column="name"    />
         <result property="hzName"    column="hz_name"    />
@@ -23,12 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDaCzrkdjVo">
-        select id, mu_id, name, hz_name, relation, birthday, address, jiguan, card_id, pictures, remark, create_by, create_time, update_by, update_time from da_czrkdj
+        select id,yw_type, mu_id, name, hz_name, relation, birthday, address, jiguan, card_id, pictures, remark, create_by, create_time, update_by, update_time from da_czrkdj
     </sql>
 
     <select id="selectDaCzrkdjList" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
         <include refid="selectDaCzrkdjVo"/>
         <where>
+            <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and mu_id = #{muId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="hzName != null  and hzName != ''"> and hz_name like concat('%', #{hzName}, '%')</if>
@@ -44,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDaCzrkdjList1" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
         <include refid="selectDaCzrkdjVo"/>
         <where>
+            <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and mu_id = #{muId}</if>
             <if test="name != null  and name != ''">
              and (name like concat('%', #{name}, '%')
@@ -66,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertDaCzrkdj" parameterType="DaCzrkdj" useGeneratedKeys="true" keyProperty="id">
         insert into da_czrkdj
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="ywType != null">yw_type,</if>
             <if test="muId != null">mu_id,</if>
             <if test="name != null">name,</if>
             <if test="hzName != null">hz_name,</if>
@@ -82,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="ywType != null">#{ywType},</if>
             <if test="muId != null">#{muId},</if>
             <if test="name != null">#{name},</if>
             <if test="hzName != null">#{hzName},</if>
@@ -102,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateDaCzrkdj" parameterType="DaCzrkdj">
         update da_czrkdj
         <trim prefix="SET" suffixOverrides=",">
+            <if test="ywType != null">yw_type = #{ywType},</if>
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="name != null">name = #{name},</if>
             <if test="hzName != null">hz_name = #{hzName},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml

@@ -13,6 +13,7 @@
         <result property="muId"    column="mu_id"    />
         <result property="muPath"    column="mu_path"    />
         <result property="ywType"    column="yw_type"    />
+        <result property="daJlId"    column="da_jl_id"    />
         <result property="recognize"    column="recognize"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
@@ -22,7 +23,7 @@
     </resultMap>
 
     <sql id="selectDaPicturesRecardVo">
-        select id, pic_name, pic_url, wlsj_id, wlsj_path, mu_id, mu_path, yw_type, recognize, remark, create_by, create_time, update_by, update_time from da_pictures_recard
+        select id, pic_name, pic_url, wlsj_id, wlsj_path, mu_id, mu_path, yw_type,da_jl_id, recognize, remark, create_by, create_time, update_by, update_time from da_pictures_recard
     </sql>
 
     <select id="selectDaPicturesRecardList" parameterType="DaPicturesRecard" resultMap="DaPicturesRecardResult">
@@ -34,10 +35,11 @@
             <if test="wlsjPath != null  and wlsjPath != ''"> and wlsj_path = #{wlsjPath}</if>
             <if test="muId != null "> and mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
+            <if test="daJlId != null "> and da_jl_id = #{daJlId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="recognize != null  and recognize != ''"> and recognize = #{recognize}</if>
         </where>
-            order by create_time DESC
+            order by id DESC
     </select>
 
     <select id="selectDaPicturesRecardById" parameterType="Long" resultMap="DaPicturesRecardResult">
@@ -55,6 +57,7 @@
             <if test="muId != null">mu_id,</if>
             <if test="muPath != null">mu_path,</if>
             <if test="ywType != null">yw_type,</if>
+            <if test="daJlId != null">da_jl_id,</if>
             <if test="recognize != null">recognize,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
@@ -70,6 +73,7 @@
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
             <if test="ywType != null">#{ywType},</if>
+            <if test="daJlId != null">#{daJlId},</if>
             <if test="recognize != null">#{recognize},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -89,6 +93,7 @@
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="muPath != null">mu_path = #{muPath},</if>
             <if test="ywType != null">yw_type = #{ywType},</if>
+            <if test="daJlId != null">da_jl_id = #{daJlId},</if>
             <if test="recognize != null">recognize = #{recognize},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>