From 8180bc62ad307c1036daf9a28927f24c8bcb2417 Mon Sep 17 00:00:00 2001 From: hansha Date: Fri, 31 May 2024 08:38:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DangAnCollectController.java | 29 +++--- .../java/com/da/dangan/domain/DaCzrkdj.java | 94 +++++++++++-------- .../da/dangan/domain/DaPicturesRecard.java | 16 +++- .../mapper/dangan/DaCzrkdjMapper.xml | 10 +- .../mapper/dangan/DaPicturesRecardMapper.xml | 9 +- 5 files changed, 99 insertions(+), 59 deletions(-) diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java index 7681d6d..cde90c1 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java +++ b/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 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); - } - /** * 测试添加水印 */ diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java index c5f1be9..390f149 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java @@ -10,9 +10,9 @@ 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,97 +58,106 @@ public class DaCzrkdj extends BaseEntity @Excel(name = "身份证号") private String cardId; - /** 档案图片 */ - @Excel(name = "档案图片") + /** 识别的图片 */ + @Excel(name = "识别的图片") private String pictures; - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setMuId(Long muId) + public void setYwType(String ywType) + { + this.ywType = ywType; + } + + public String getYwType() + { + return ywType; + } + public void setMuId(Long muId) { this.muId = muId; } - public Long getMuId() + public Long getMuId() { return muId; } - public void setName(String name) + public void setName(String name) { this.name = name; } - public String getName() + public String getName() { return name; } - public void setHzName(String hzName) + public void setHzName(String hzName) { this.hzName = hzName; } - public String getHzName() + public String getHzName() { return hzName; } - public void setRelation(String relation) + public void setRelation(String relation) { this.relation = relation; } - public String getRelation() + public String getRelation() { return relation; } - public void setBirthday(Date birthday) + public void setBirthday(Date birthday) { this.birthday = birthday; } - public Date getBirthday() + public Date getBirthday() { return birthday; } - public void setAddress(String address) + public void setAddress(String address) { this.address = address; } - public String getAddress() + public String getAddress() { return address; } - public void setJiguan(String jiguan) + public void setJiguan(String jiguan) { this.jiguan = jiguan; } - public String getJiguan() + public String getJiguan() { return jiguan; } - public void setCardId(String cardId) + public void setCardId(String cardId) { this.cardId = cardId; } - public String getCardId() + public String getCardId() { return cardId; } - public void setPictures(String pictures) + public void setPictures(String pictures) { this.pictures = pictures; } - public String getPictures() + public String getPictures() { return pictures; } @@ -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("muId", getMuId()) - .append("name", getName()) - .append("hzName", getHzName()) - .append("relation", getRelation()) - .append("birthday", getBirthday()) - .append("address", getAddress()) - .append("jiguan", getJiguan()) - .append("cardId", getCardId()) - .append("pictures", getPictures()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + .append("id", getId()) + .append("ywType", getYwType()) + .append("muId", getMuId()) + .append("name", getName()) + .append("hzName", getHzName()) + .append("relation", getRelation()) + .append("birthday", getBirthday()) + .append("address", getAddress()) + .append("jiguan", getJiguan()) + .append("cardId", getCardId()) + .append("pictures", getPictures()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); } } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java index f3f5ad8..02a5dae 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java +++ b/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()) diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml index df8ac69..6575310 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -23,12 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 + and yw_type = #{ywType} and mu_id = #{muId} and (name like concat('%', #{name}, '%') @@ -66,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into da_czrkdj + yw_type, mu_id, name, hz_name, @@ -82,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, + #{ywType}, #{muId}, #{name}, #{hzName}, @@ -102,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update da_czrkdj + yw_type = #{ywType}, mu_id = #{muId}, name = #{name}, hz_name = #{hzName}, diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml index d09c49a..821467e 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml @@ -13,6 +13,7 @@ + @@ -22,7 +23,7 @@ - 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