Merge remote-tracking branch 'origin/master'

master
wanglei 2 years ago
commit 62143bb4a0

@ -3,12 +3,14 @@ package com.da;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.scheduling.annotation.EnableAsync;
/** /**
* *
* *
* @author ruoyi * @author ruoyi
*/ */
@EnableAsync
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class RuoYiApplication public class RuoYiApplication
{ {

@ -0,0 +1,104 @@
package com.da.dangan.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.da.common.annotation.Log;
import com.da.common.core.controller.BaseController;
import com.da.common.core.domain.AjaxResult;
import com.da.common.enums.BusinessType;
import com.da.dangan.domain.DaBirthDj;
import com.da.dangan.service.IDaBirthDjService;
import com.da.common.utils.poi.ExcelUtil;
import com.da.common.core.page.TableDataInfo;
/**
* Controller
*
* @author hs
* @date 2024-06-05
*/
@RestController
@RequestMapping("/dangan/birthDJ")
public class DaBirthDjController extends BaseController
{
@Autowired
private IDaBirthDjService daBirthDjService;
/**
*
*/
@PreAuthorize("@ss.hasPermi('dangan:birthDJ:list')")
@GetMapping("/list")
public TableDataInfo list(DaBirthDj daBirthDj)
{
startPage();
List<DaBirthDj> list = daBirthDjService.selectDaBirthDjList(daBirthDj);
return getDataTable(list);
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('dangan:birthDJ:export')")
@Log(title = "出生登记", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, DaBirthDj daBirthDj)
{
List<DaBirthDj> list = daBirthDjService.selectDaBirthDjList(daBirthDj);
ExcelUtil<DaBirthDj> util = new ExcelUtil<DaBirthDj>(DaBirthDj.class);
util.exportExcel(response, list, "出生登记数据");
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('dangan:birthDJ:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(daBirthDjService.selectDaBirthDjById(id));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('dangan:birthDJ:add')")
@Log(title = "出生登记", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody DaBirthDj daBirthDj)
{
return toAjax(daBirthDjService.insertDaBirthDj(daBirthDj));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('dangan:birthDJ:edit')")
@Log(title = "出生登记", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody DaBirthDj daBirthDj)
{
return toAjax(daBirthDjService.updateDaBirthDj(daBirthDj));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('dangan:birthDJ:remove')")
@Log(title = "出生登记", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(daBirthDjService.deleteDaBirthDjByIds(ids));
}
}

@ -6,6 +6,7 @@ import com.da.common.core.domain.AjaxResult;
import com.da.common.utils.file.FileUploadUtils; import com.da.common.utils.file.FileUploadUtils;
import com.da.common.utils.file.FileUtils; import com.da.common.utils.file.FileUtils;
import com.da.dangan.domain.DaPicturesRecard; import com.da.dangan.domain.DaPicturesRecard;
import com.da.dangan.domain.vo.PicParams;
import com.da.dangan.service.IDaCzrkdjService; import com.da.dangan.service.IDaCzrkdjService;
import com.da.dangan.service.IDaPicturesRecardService; import com.da.dangan.service.IDaPicturesRecardService;
import com.da.dangan.util.CallThirdInterface; import com.da.dangan.util.CallThirdInterface;
@ -24,6 +25,7 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.stream.Collectors;
/** /**
* Controller * Controller
@ -101,12 +103,15 @@ public class DangAnCollectController extends BaseController {
} }
/** /**
* ocr * ocr/
*/ */
@PostMapping("/recongnize") @PostMapping("/recongnize")
public AjaxResult recognize(@RequestBody DaPicturesRecard[] picRecards) { public AjaxResult recognize(@RequestBody List<DaPicturesRecard> picRecards) {
try { try {
String ywType = picRecards[0].getYwType(); //取所有id的集合
List<Long> ids = picRecards.stream().map(DaPicturesRecard::getId).collect(Collectors.toList());
String ywType = picRecards.get(0).getYwType();
String singleOrDouble = picRecards.get(0).getSingelOrDouble();
//获取所有的文件 //获取所有的文件
List<File> files = new ArrayList<>(); List<File> files = new ArrayList<>();
for (DaPicturesRecard picRecard : picRecards) { for (DaPicturesRecard picRecard : picRecards) {
@ -132,12 +137,13 @@ public class DangAnCollectController extends BaseController {
logger.info("CompletableFuture耗时--——————————————————》"+ (end-start)+"ms");*/ logger.info("CompletableFuture耗时--——————————————————》"+ (end-start)+"ms");*/
//不使用循环调用接口 直接传递数组 //不使用循环调用接口 直接传递数组
// String result = CallThirdInterface.callThirdInterface(url, files, ywType,singeOrDouble,ids);
String result = CallThirdInterface.callThirdInterface(url, files, ywType); String result = CallThirdInterface.callThirdInterface(url, files, ywType);
System.out.println(result); System.out.println(result);
long end =System.currentTimeMillis(); long end =System.currentTimeMillis();
logger.info("CompletableFuture耗时--——————————————————》"+ (end-start)+"ms"); logger.info("CompletableFuture耗时--——————————————————》"+ (end-start)+"ms");
// TODO 根据业务类型存储识别后的信息 // TODO 数据解析 根据业务类型存储识别后的信息
switch(ywType){ switch(ywType){
case "0" : case "0" :
@ -148,6 +154,7 @@ public class DangAnCollectController extends BaseController {
break; break;
case "2" : case "2" :
//daCzrkdjService.insertDaCzrkdj(); //daCzrkdjService.insertDaCzrkdj();
//picRecards.stream().filter(p -> p.getId()==1L || p.getId()==2L).collect(Collectors.toList());
break; break;
case "3" : case "3" :
@ -166,10 +173,10 @@ public class DangAnCollectController extends BaseController {
//识别成功的图片 ,修改图片信息记录表为已识别 可以用多线程 //识别成功的图片 ,修改图片信息记录表为已识别 可以用多线程
/*for (DaPicturesRecard picRecard : picRecards) { for (DaPicturesRecard picRecard : picRecards) {
picRecard.setRecognize("1"); picRecard.setRecognize("1");
daPicturesRecardService.updateDaPicturesRecard(picRecard); daPicturesRecardService.updateDaPicturesRecard(picRecard);
}*/ }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return AjaxResult.error(e.getMessage()); return AjaxResult.error(e.getMessage());
@ -178,63 +185,102 @@ public class DangAnCollectController extends BaseController {
} }
/** /**
* ocr N * ocr N
*/ */
@PostMapping("/recongnize2") @PostMapping("/recongnizeZu")
public AjaxResult recognize2(@RequestBody DaPicturesRecard chekedRecard[],@RequestBody DaPicturesRecard[] unchekedRecards) { public AjaxResult recongnizeZu(@RequestBody PicParams params) {
try { List<DaPicturesRecard> checked = params.getChecked();
String ywType = chekedRecard[0].getYwType(); List<DaPicturesRecard> uncheked = params.getUnchecked();
//获取所有的文件 String singleOrDouble = params.getSingeOrDouble();
List<File> files = new ArrayList<>(); //拼接所有的图片
for (DaPicturesRecard picRecard : chekedRecard) { List<DaPicturesRecard> listAll =checked;
String path = getPath(picRecard.getPicUrl()); if(uncheked!=null&&uncheked.size()>0){
File file = new File(path); listAll.addAll(uncheked);
files.add(file); }
} //参数checked id的集合
// TODO————————多线程循环调用第三方接口 List<Long> ids = checked.stream().map(DaPicturesRecard::getId).collect(Collectors.toList());
long start =System.currentTimeMillis();
String result = CallThirdInterface.callThirdInterface(url, files, ywType); //all id的集合
System.out.println(result); List<Long> allIds = listAll.stream().map(DaPicturesRecard::getId).collect(Collectors.toList());
long end =System.currentTimeMillis(); List<String> allPics = listAll.stream().map(DaPicturesRecard::getPicUrl).collect(Collectors.toList());
logger.info("CompletableFuture耗时--——————————————————》"+ (end-start)+"ms");
System.out.println(allIds.toString());
// TODO 根据业务类型存储识别后的信息
if(checked!=null&&checked.size()>0){
switch(ywType){ try {
case "0" : String ywType = checked.get(0).getYwType();
//获取所有的文件
break; List<File> files = new ArrayList<>();
case "1" : for (DaPicturesRecard picRecard : checked) {
String path = getPath(picRecard.getPicUrl());
break; File file = new File(path);
case "2" : files.add(file);
//daCzrkdjService.insertDaCzrkdj(); }
break; // TODO————————多线程循环调用第三方接口
case "3" : long start =System.currentTimeMillis();
//参数:地址、文件、业务类型、单双面: 1单面 2双面
break; //String result = CallThirdInterface.callThirdInterface(url, files, ywType,singleOrDouble,ids);
case "4" : String result = CallThirdInterface.callThirdInterface(url, files, ywType);
System.out.println(result);
break; long end =System.currentTimeMillis();
case "5" : logger.info("CompletableFuture耗时--——————————————————》"+ (end-start)+"ms");
break; // TODO 根据业务类型存储识别后的信息
case "6" : Long dajlId=null;
switch(ywType){
break; case "0" :
}
break;
case "1" :
break;
case "2" :
/*DaCzrkdj daCzrkdj = new DaCzrkdj();
daCzrkdj.setAllPicIds(picIds);
daCzrkdj.setAllPics();
daCzrkdj.setPicIds();
daCzrkdj.setPictures();
daCzrkdjService.insertDaCzrkdj();
//将插入后的id反写回来
dajlid=daCzrkdj.getId();*/
break;
case "3" :
break;
case "4" :
break;
case "5" :
break;
case "6" :
break;
}
//识别成功的图片 ,修改图片信息记录表为已识别 可以用多线程 //识别成功的图片 ,修改图片信息记录表为已识别 可以用多线程
/*for (DaPicturesRecard picRecard : picRecards) { for (DaPicturesRecard picRecard : checked) {
picRecard.setRecognize("1"); picRecard.setRecognize("1");
daPicturesRecardService.updateDaPicturesRecard(picRecard); daPicturesRecardService.updateDaPicturesRecard(picRecard);
}
/*if(uncheked!=null&&uncheked.size()>0){
for (DaPicturesRecard picRecard : uncheked) {
//todo 存储记录的对应id存到未识别图片中 以便将来通过档案记录id查找相关图片
//修改为记录存储图片信息 图片不做信息保存
picRecard.setDaJlId(dajlId);
daPicturesRecardService.updateDaPicturesRecard(picRecard);
}
}*/ }*/
} catch (Exception e) {
e.printStackTrace(); } catch (Exception e) {
return AjaxResult.error(e.getMessage()); e.printStackTrace();
return AjaxResult.error(e.getMessage());
}
}else{
return AjaxResult.error("请选择需要识别的图片");
} }
return AjaxResult.success(); return AjaxResult.success();
} }

@ -0,0 +1,480 @@
package com.da.dangan.domain;
import com.da.common.annotation.Excel;
import com.da.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* da_birth_dj
*
* @author hs
* @date 2024-06-05
*/
public class DaBirthDj extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private Long id;
/** 业务类型(字典) */
@Excel(name = "业务类型(字典)")
private String ywType;
/** 目录id */
@Excel(name = "目录id")
private Long muId;
/** 出生证编号 */
@Excel(name = "出生证编号")
private String birthNum;
/** 婴儿姓名 */
@Excel(name = "婴儿姓名")
private String name;
/** 出生时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "出生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date birthday;
/** 性别 */
@Excel(name = "性别")
private String sex;
/** 出生地点 */
@Excel(name = "出生地点")
private String bornAddress;
/** 母亲姓名 */
@Excel(name = "母亲姓名")
private String mName;
/** 母亲年龄 */
@Excel(name = "母亲年龄")
private String mAge;
/** 母亲国籍 */
@Excel(name = "母亲国籍")
private String mGj;
/** 母亲民族 */
@Excel(name = "母亲民族")
private String mNation;
/** 母亲身份证号 */
@Excel(name = "母亲身份证号")
private String mCardId;
/** 父亲姓名 */
@Excel(name = "父亲姓名")
private String fName;
/** 父亲年龄 */
@Excel(name = "父亲年龄")
private String fAge;
/** 父亲国籍 */
@Excel(name = "父亲国籍")
private String fGj;
/** 父亲民族 */
@Excel(name = "父亲民族")
private String fNation;
/** 父亲身份证号 */
@Excel(name = "父亲身份证号")
private String fCardId;
/** 家庭住址 */
@Excel(name = "家庭住址")
private String homeAddress;
/** 婴儿母亲签字 */
@Excel(name = "婴儿母亲签字")
private String momSign;
/** 接生人员签字 */
@Excel(name = "接生人员签字")
private String jsrySign;
/** 接生单位 */
@Excel(name = "接生单位")
private String jsUnit;
/** 出生登记类型(字典) */
@Excel(name = "出生登记类型(字典)")
private String djType;
/** 识别图片id */
@Excel(name = "识别图片id")
private String picIds;
/** 识别图片 */
@Excel(name = "识别图片")
private String pictures;
/** 相关图片id */
@Excel(name = "相关图片id")
private String allPicIds;
/** 相关图片 */
@Excel(name = "相关图片")
private String allPics;
/** 是否纠错(字典0否1是) */
@Excel(name = "是否纠错(字典0否1是)")
private String errorCorrect;
/** 审核状态(字典) */
@Excel(name = "审核状态(字典)")
private String auditStatus;
/** 审核人 */
@Excel(name = "审核人")
private String auditName;
/** 审核结果 */
@Excel(name = "审核结果")
private String auditResult;
/** 审核原由 */
@Excel(name = "审核原由")
private String auditReason;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setYwType(String ywType)
{
this.ywType = ywType;
}
public String getYwType()
{
return ywType;
}
public void setMuId(Long muId)
{
this.muId = muId;
}
public Long getMuId()
{
return muId;
}
public void setBirthNum(String birthNum)
{
this.birthNum = birthNum;
}
public String getBirthNum()
{
return birthNum;
}
public void setName(String name)
{
this.name = name;
}
public String getName()
{
return name;
}
public void setBirthday(Date birthday)
{
this.birthday = birthday;
}
public Date getBirthday()
{
return birthday;
}
public void setSex(String sex)
{
this.sex = sex;
}
public String getSex()
{
return sex;
}
public void setBornAddress(String bornAddress)
{
this.bornAddress = bornAddress;
}
public String getBornAddress()
{
return bornAddress;
}
public void setmName(String mName)
{
this.mName = mName;
}
public String getmName()
{
return mName;
}
public void setmAge(String mAge)
{
this.mAge = mAge;
}
public String getmAge()
{
return mAge;
}
public void setmGj(String mGj)
{
this.mGj = mGj;
}
public String getmGj()
{
return mGj;
}
public void setmNation(String mNation)
{
this.mNation = mNation;
}
public String getmNation()
{
return mNation;
}
public void setmCardId(String mCardId)
{
this.mCardId = mCardId;
}
public String getmCardId()
{
return mCardId;
}
public void setfName(String fName)
{
this.fName = fName;
}
public String getfName()
{
return fName;
}
public void setfAge(String fAge)
{
this.fAge = fAge;
}
public String getfAge()
{
return fAge;
}
public void setfGj(String fGj)
{
this.fGj = fGj;
}
public String getfGj()
{
return fGj;
}
public void setfNation(String fNation)
{
this.fNation = fNation;
}
public String getfNation()
{
return fNation;
}
public void setfCardId(String fCardId)
{
this.fCardId = fCardId;
}
public String getfCardId()
{
return fCardId;
}
public void setHomeAddress(String homeAddress)
{
this.homeAddress = homeAddress;
}
public String getHomeAddress()
{
return homeAddress;
}
public void setMomSign(String momSign)
{
this.momSign = momSign;
}
public String getMomSign()
{
return momSign;
}
public void setJsrySign(String jsrySign)
{
this.jsrySign = jsrySign;
}
public String getJsrySign()
{
return jsrySign;
}
public void setJsUnit(String jsUnit)
{
this.jsUnit = jsUnit;
}
public String getJsUnit()
{
return jsUnit;
}
public void setDjType(String djType)
{
this.djType = djType;
}
public String getDjType()
{
return djType;
}
public void setPicIds(String picIds)
{
this.picIds = picIds;
}
public String getPicIds()
{
return picIds;
}
public void setPictures(String pictures)
{
this.pictures = pictures;
}
public String getPictures()
{
return pictures;
}
public void setAllPicIds(String allPicIds)
{
this.allPicIds = allPicIds;
}
public String getAllPicIds()
{
return allPicIds;
}
public void setAllPics(String allPics)
{
this.allPics = allPics;
}
public String getAllPics()
{
return allPics;
}
public void setErrorCorrect(String errorCorrect)
{
this.errorCorrect = errorCorrect;
}
public String getErrorCorrect()
{
return errorCorrect;
}
public void setAuditStatus(String auditStatus)
{
this.auditStatus = auditStatus;
}
public String getAuditStatus()
{
return auditStatus;
}
public void setAuditName(String auditName)
{
this.auditName = auditName;
}
public String getAuditName()
{
return auditName;
}
public void setAuditResult(String auditResult)
{
this.auditResult = auditResult;
}
public String getAuditResult()
{
return auditResult;
}
public void setAuditReason(String auditReason)
{
this.auditReason = auditReason;
}
public String getAuditReason()
{
return auditReason;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("ywType", getYwType())
.append("muId", getMuId())
.append("birthNum", getBirthNum())
.append("name", getName())
.append("birthday", getBirthday())
.append("sex", getSex())
.append("bornAddress", getBornAddress())
.append("mName", getmName())
.append("mAge", getmAge())
.append("mGj", getmGj())
.append("mNation", getmNation())
.append("mCardId", getmCardId())
.append("fName", getfName())
.append("fAge", getfAge())
.append("fGj", getfGj())
.append("fNation", getfNation())
.append("fCardId", getfCardId())
.append("homeAddress", getHomeAddress())
.append("momSign", getMomSign())
.append("jsrySign", getJsrySign())
.append("jsUnit", getJsUnit())
.append("djType", getDjType())
.append("picIds", getPicIds())
.append("pictures", getPictures())
.append("allPicIds", getAllPicIds())
.append("allPics", getAllPics())
.append("errorCorrect", getErrorCorrect())
.append("auditStatus", getAuditStatus())
.append("auditName", getAuditName())
.append("auditResult", getAuditResult())
.append("auditReason", getAuditReason())
.append("remark", getRemark())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

@ -12,7 +12,7 @@ import java.util.Date;
* da_czrkdj * da_czrkdj
* *
* @author hs * @author hs
* @date 2024-05-30 * @date 2024-06-03
*/ */
public class DaCzrkdj extends BaseEntity public class DaCzrkdj extends BaseEntity
{ {
@ -58,10 +58,42 @@ public class DaCzrkdj extends BaseEntity
@Excel(name = "身份证号") @Excel(name = "身份证号")
private String cardId; private String cardId;
/** 识别的图片 */ /** 识别图片id */
@Excel(name = "识别的图片") @Excel(name = "识别图片id")
private String picIds;
/** 识别图片 */
@Excel(name = "识别图片")
private String pictures; private String pictures;
/** 相关图片id */
@Excel(name = "相关图片id")
private String allPicIds;
/** 相关图片 */
@Excel(name = "相关图片")
private String allPics;
/** 是否纠错(字典0否1是) */
@Excel(name = "是否纠错(字典0否1是)")
private String errorCorrect;
/** 审核状态(字典) */
@Excel(name = "审核状态(字典)")
private String auditStatus;
/** 审核人 */
@Excel(name = "审核人")
private String auditName;
/** 审核结果 */
@Excel(name = "审核结果")
private String auditResult;
/** 审核原由 */
@Excel(name = "审核原由")
private String auditReason;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
@ -152,6 +184,15 @@ public class DaCzrkdj extends BaseEntity
{ {
return cardId; return cardId;
} }
public void setPicIds(String picIds)
{
this.picIds = picIds;
}
public String getPicIds()
{
return picIds;
}
public void setPictures(String pictures) public void setPictures(String pictures)
{ {
this.pictures = pictures; this.pictures = pictures;
@ -161,6 +202,69 @@ public class DaCzrkdj extends BaseEntity
{ {
return pictures; return pictures;
} }
public void setAllPicIds(String allPicIds)
{
this.allPicIds = allPicIds;
}
public String getAllPicIds()
{
return allPicIds;
}
public void setAllPics(String allPics)
{
this.allPics = allPics;
}
public String getAllPics()
{
return allPics;
}
public void setErrorCorrect(String errorCorrect)
{
this.errorCorrect = errorCorrect;
}
public String getErrorCorrect()
{
return errorCorrect;
}
public void setAuditStatus(String auditStatus)
{
this.auditStatus = auditStatus;
}
public String getAuditStatus()
{
return auditStatus;
}
public void setAuditName(String auditName)
{
this.auditName = auditName;
}
public String getAuditName()
{
return auditName;
}
public void setAuditResult(String auditResult)
{
this.auditResult = auditResult;
}
public String getAuditResult()
{
return auditResult;
}
public void setAuditReason(String auditReason)
{
this.auditReason = auditReason;
}
public String getAuditReason()
{
return auditReason;
}
@Override @Override
public String toString() { public String toString() {
@ -175,7 +279,15 @@ public class DaCzrkdj extends BaseEntity
.append("address", getAddress()) .append("address", getAddress())
.append("jiguan", getJiguan()) .append("jiguan", getJiguan())
.append("cardId", getCardId()) .append("cardId", getCardId())
.append("picIds", getPicIds())
.append("pictures", getPictures()) .append("pictures", getPictures())
.append("allPicIds", getAllPicIds())
.append("allPics", getAllPics())
.append("errorCorrect", getErrorCorrect())
.append("auditStatus", getAuditStatus())
.append("auditName", getAuditName())
.append("auditResult", getAuditResult())
.append("auditReason", getAuditReason())
.append("remark", getRemark()) .append("remark", getRemark())
.append("createBy", getCreateBy()) .append("createBy", getCreateBy())
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())

@ -54,6 +54,9 @@ public class DaPicturesRecard extends BaseEntity
@Excel(name = "是否已识别") @Excel(name = "是否已识别")
private String recognize; private String recognize;
/**传递参数使用 单双面 0单面 1双面 */
private String singelOrDouble;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
@ -86,6 +89,14 @@ public class DaPicturesRecard extends BaseEntity
this.wlsjId = wlsjId; this.wlsjId = wlsjId;
} }
public String getSingelOrDouble() {
return singelOrDouble;
}
public void setSingelOrDouble(String singelOrDouble) {
this.singelOrDouble = singelOrDouble;
}
public Long getWlsjId() public Long getWlsjId()
{ {
return wlsjId; return wlsjId;
@ -158,6 +169,7 @@ public class DaPicturesRecard extends BaseEntity
.append("ywType", getYwType()) .append("ywType", getYwType())
.append("daJlId", getDaJlId()) .append("daJlId", getDaJlId())
.append("recognize", getRecognize()) .append("recognize", getRecognize())
.append("singeOrDouble", getSingelOrDouble())
.append("remark", getRemark()) .append("remark", getRemark())
.append("createBy", getCreateBy()) .append("createBy", getCreateBy())
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())

@ -0,0 +1,35 @@
package com.da.dangan.domain.vo;
import com.da.dangan.domain.DaPicturesRecard;
import java.util.List;
public class PicParams {
private List<DaPicturesRecard> checked;
private List<DaPicturesRecard> unchecked;
private String singeOrDouble; //单双面 0单面 1双面
public String getSingeOrDouble() {
return singeOrDouble;
}
public void setSingeOrDouble(String singeOrDouble) {
this.singeOrDouble = singeOrDouble;
}
public List<DaPicturesRecard> getChecked() {
return checked;
}
public void setChecked(List<DaPicturesRecard> checked) {
this.checked = checked;
}
public List<DaPicturesRecard> getUnchecked() {
return unchecked;
}
public void setUnchecked(List<DaPicturesRecard> unchecked) {
this.unchecked = unchecked;
}
}

@ -0,0 +1,62 @@
package com.da.dangan.mapper;
import com.da.dangan.domain.DaBirthDj;
import java.util.List;
/**
* Mapper
*
* @author hs
* @date 2024-06-05
*/
public interface DaBirthDjMapper
{
/**
*
*
* @param id
* @return
*/
public DaBirthDj selectDaBirthDjById(Long id);
/**
*
*
* @param daBirthDj
* @return
*/
public List<DaBirthDj> selectDaBirthDjList(DaBirthDj daBirthDj);
/**
*
*
* @param daBirthDj
* @return
*/
public int insertDaBirthDj(DaBirthDj daBirthDj);
/**
*
*
* @param daBirthDj
* @return
*/
public int updateDaBirthDj(DaBirthDj daBirthDj);
/**
*
*
* @param id
* @return
*/
public int deleteDaBirthDjById(Long id);
/**
*
*
* @param ids
* @return
*/
public int deleteDaBirthDjByIds(Long[] ids);
}

@ -0,0 +1,62 @@
package com.da.dangan.service;
import com.da.dangan.domain.DaBirthDj;
import java.util.List;
/**
* Service
*
* @author hs
* @date 2024-06-05
*/
public interface IDaBirthDjService
{
/**
*
*
* @param id
* @return
*/
public DaBirthDj selectDaBirthDjById(Long id);
/**
*
*
* @param daBirthDj
* @return
*/
public List<DaBirthDj> selectDaBirthDjList(DaBirthDj daBirthDj);
/**
*
*
* @param daBirthDj
* @return
*/
public int insertDaBirthDj(DaBirthDj daBirthDj);
/**
*
*
* @param daBirthDj
* @return
*/
public int updateDaBirthDj(DaBirthDj daBirthDj);
/**
*
*
* @param ids
* @return
*/
public int deleteDaBirthDjByIds(Long[] ids);
/**
*
*
* @param id
* @return
*/
public int deleteDaBirthDjById(Long id);
}

@ -0,0 +1,97 @@
package com.da.dangan.service.impl;
import com.da.common.utils.DateUtils;
import com.da.dangan.domain.DaBirthDj;
import com.da.dangan.mapper.DaBirthDjMapper;
import com.da.dangan.service.IDaBirthDjService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Service
*
* @author hs
* @date 2024-06-05
*/
@Service
public class DaBirthDjServiceImpl implements IDaBirthDjService
{
@Autowired
private DaBirthDjMapper daBirthDjMapper;
/**
*
*
* @param id
* @return
*/
@Override
public DaBirthDj selectDaBirthDjById(Long id)
{
return daBirthDjMapper.selectDaBirthDjById(id);
}
/**
*
*
* @param daBirthDj
* @return
*/
@Override
public List<DaBirthDj> selectDaBirthDjList(DaBirthDj daBirthDj)
{
return daBirthDjMapper.selectDaBirthDjList(daBirthDj);
}
/**
*
*
* @param daBirthDj
* @return
*/
@Override
public int insertDaBirthDj(DaBirthDj daBirthDj)
{
daBirthDj.setCreateTime(DateUtils.getNowDate());
return daBirthDjMapper.insertDaBirthDj(daBirthDj);
}
/**
*
*
* @param daBirthDj
* @return
*/
@Override
public int updateDaBirthDj(DaBirthDj daBirthDj)
{
daBirthDj.setUpdateTime(DateUtils.getNowDate());
return daBirthDjMapper.updateDaBirthDj(daBirthDj);
}
/**
*
*
* @param ids
* @return
*/
@Override
public int deleteDaBirthDjByIds(Long[] ids)
{
return daBirthDjMapper.deleteDaBirthDjByIds(ids);
}
/**
*
*
* @param id
* @return
*/
@Override
public int deleteDaBirthDjById(Long id)
{
return daBirthDjMapper.deleteDaBirthDjById(id);
}
}

@ -58,8 +58,10 @@ public class CallThirdInterface {
// File file = new File("C:\\Users\\hssym\\Downloads\\UBQ.png"); // File file = new File("C:\\Users\\hssym\\Downloads\\UBQ.png");
httpRequest.charset(CharsetUtil.CHARSET_UTF_8); httpRequest.charset(CharsetUtil.CHARSET_UTF_8);
httpRequest.form("files[]",files.toArray(new File[0])); httpRequest.form("files[]",files.toArray(new File[files.size()]));
httpRequest.form("fileType",fileType); httpRequest.form("fileType",fileType);
//httpRequest.form("singeOrDouble",);
//httpRequest.form("picIds",ids.toArray(new Long[ids.size()]));
// 4. 设置请求头 // 4. 设置请求头
// 请求头同样可以逐一设置也可以封装到map中再统一设置 // 请求头同样可以逐一设置也可以封装到map中再统一设置

@ -0,0 +1,226 @@
<?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="com.da.dangan.mapper.DaBirthDjMapper">
<resultMap type="DaBirthDj" id="DaBirthDjResult">
<result property="id" column="id" />
<result property="ywType" column="yw_type" />
<result property="muId" column="mu_id" />
<result property="birthNum" column="birth_num" />
<result property="name" column="name" />
<result property="birthday" column="birthday" />
<result property="sex" column="sex" />
<result property="bornAddress" column="born_address" />
<result property="mName" column="m_name" />
<result property="mAge" column="m_age" />
<result property="mGj" column="m_gj" />
<result property="mNation" column="m_nation" />
<result property="mCardId" column="m_card_id" />
<result property="fName" column="f_name" />
<result property="fAge" column="f_age" />
<result property="fGj" column="f_gj" />
<result property="fNation" column="f_nation" />
<result property="fCardId" column="f_card_id" />
<result property="homeAddress" column="home_address" />
<result property="momSign" column="mom_sign" />
<result property="jsrySign" column="jsry_sign" />
<result property="jsUnit" column="js_unit" />
<result property="djType" column="dj_type" />
<result property="picIds" column="pic_ids" />
<result property="pictures" column="pictures" />
<result property="allPicIds" column="all_pic_ids" />
<result property="allPics" column="all_pics" />
<result property="errorCorrect" column="error_correct" />
<result property="auditStatus" column="audit_status" />
<result property="auditName" column="audit_name" />
<result property="auditResult" column="audit_result" />
<result property="auditReason" column="audit_reason" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectDaBirthDjVo">
select id, yw_type, mu_id, birth_num, name, birthday, sex, born_address, m_name, m_age, m_gj, m_nation, m_card_id, f_name, f_age, f_gj, f_nation, f_card_id, home_address, mom_sign, jsry_sign, js_unit, dj_type, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_birth_dj
</sql>
<select id="selectDaBirthDjList" parameterType="DaBirthDj" resultMap="DaBirthDjResult">
<include refid="selectDaBirthDjVo"/>
<where>
<if test="ywType != null and ywType != ''"> and yw_type = #{ywType}</if>
<if test="muId != null "> and mu_id = #{muId}</if>
<if test="birthNum != null and birthNum != ''"> and birth_num = #{birthNum}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="birthday != null "> and birthday = #{birthday}</if>
<if test="sex != null and sex != ''"> and sex = #{sex}</if>
<if test="bornAddress != null and bornAddress != ''"> and born_address = #{bornAddress}</if>
<if test="mName != null and mName != ''"> and m_name like concat('%', #{mName}, '%')</if>
<if test="mAge != null and mAge != ''"> and m_age = #{mAge}</if>
<if test="mGj != null and mGj != ''"> and m_gj = #{mGj}</if>
<if test="mNation != null and mNation != ''"> and m_nation = #{mNation}</if>
<if test="mCardId != null and mCardId != ''"> and m_card_id = #{mCardId}</if>
<if test="fName != null and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>
<if test="fAge != null and fAge != ''"> and f_age = #{fAge}</if>
<if test="fGj != null and fGj != ''"> and f_gj = #{fGj}</if>
<if test="fNation != null and fNation != ''"> and f_nation = #{fNation}</if>
<if test="fCardId != null and fCardId != ''"> and f_card_id = #{fCardId}</if>
<if test="homeAddress != null and homeAddress != ''"> and home_address = #{homeAddress}</if>
<if test="momSign != null and momSign != ''"> and mom_sign = #{momSign}</if>
<if test="jsrySign != null and jsrySign != ''"> and jsry_sign = #{jsrySign}</if>
<if test="jsUnit != null and jsUnit != ''"> and js_unit = #{jsUnit}</if>
<if test="djType != null and djType != ''"> and dj_type = #{djType}</if>
<if test="picIds != null and picIds != ''"> and pic_ids = #{picIds}</if>
<if test="pictures != null and pictures != ''"> and pictures = #{pictures}</if>
<if test="allPicIds != null and allPicIds != ''"> and all_pic_ids = #{allPicIds}</if>
<if test="allPics != null and allPics != ''"> and all_pics = #{allPics}</if>
<if test="errorCorrect != null and errorCorrect != ''"> and error_correct = #{errorCorrect}</if>
<if test="auditStatus != null and auditStatus != ''"> and audit_status = #{auditStatus}</if>
<if test="auditName != null and auditName != ''"> and audit_name like concat('%', #{auditName}, '%')</if>
<if test="auditResult != null and auditResult != ''"> and audit_result = #{auditResult}</if>
<if test="auditReason != null and auditReason != ''"> and audit_reason = #{auditReason}</if>
</where>
</select>
<select id="selectDaBirthDjById" parameterType="Long" resultMap="DaBirthDjResult">
<include refid="selectDaBirthDjVo"/>
where id = #{id}
</select>
<insert id="insertDaBirthDj" parameterType="DaBirthDj" useGeneratedKeys="true" keyProperty="id">
insert into da_birth_dj
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ywType != null">yw_type,</if>
<if test="muId != null">mu_id,</if>
<if test="birthNum != null">birth_num,</if>
<if test="name != null">name,</if>
<if test="birthday != null">birthday,</if>
<if test="sex != null">sex,</if>
<if test="bornAddress != null">born_address,</if>
<if test="mName != null">m_name,</if>
<if test="mAge != null">m_age,</if>
<if test="mGj != null">m_gj,</if>
<if test="mNation != null">m_nation,</if>
<if test="mCardId != null">m_card_id,</if>
<if test="fName != null">f_name,</if>
<if test="fAge != null">f_age,</if>
<if test="fGj != null">f_gj,</if>
<if test="fNation != null">f_nation,</if>
<if test="fCardId != null">f_card_id,</if>
<if test="homeAddress != null">home_address,</if>
<if test="momSign != null">mom_sign,</if>
<if test="jsrySign != null">jsry_sign,</if>
<if test="jsUnit != null">js_unit,</if>
<if test="djType != null">dj_type,</if>
<if test="picIds != null">pic_ids,</if>
<if test="pictures != null">pictures,</if>
<if test="allPicIds != null">all_pic_ids,</if>
<if test="allPics != null">all_pics,</if>
<if test="errorCorrect != null">error_correct,</if>
<if test="auditStatus != null">audit_status,</if>
<if test="auditName != null">audit_name,</if>
<if test="auditResult != null">audit_result,</if>
<if test="auditReason != null">audit_reason,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<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="birthNum != null">#{birthNum},</if>
<if test="name != null">#{name},</if>
<if test="birthday != null">#{birthday},</if>
<if test="sex != null">#{sex},</if>
<if test="bornAddress != null">#{bornAddress},</if>
<if test="mName != null">#{mName},</if>
<if test="mAge != null">#{mAge},</if>
<if test="mGj != null">#{mGj},</if>
<if test="mNation != null">#{mNation},</if>
<if test="mCardId != null">#{mCardId},</if>
<if test="fName != null">#{fName},</if>
<if test="fAge != null">#{fAge},</if>
<if test="fGj != null">#{fGj},</if>
<if test="fNation != null">#{fNation},</if>
<if test="fCardId != null">#{fCardId},</if>
<if test="homeAddress != null">#{homeAddress},</if>
<if test="momSign != null">#{momSign},</if>
<if test="jsrySign != null">#{jsrySign},</if>
<if test="jsUnit != null">#{jsUnit},</if>
<if test="djType != null">#{djType},</if>
<if test="picIds != null">#{picIds},</if>
<if test="pictures != null">#{pictures},</if>
<if test="allPicIds != null">#{allPicIds},</if>
<if test="allPics != null">#{allPics},</if>
<if test="errorCorrect != null">#{errorCorrect},</if>
<if test="auditStatus != null">#{auditStatus},</if>
<if test="auditName != null">#{auditName},</if>
<if test="auditResult != null">#{auditResult},</if>
<if test="auditReason != null">#{auditReason},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateDaBirthDj" parameterType="DaBirthDj">
update da_birth_dj
<trim prefix="SET" suffixOverrides=",">
<if test="ywType != null">yw_type = #{ywType},</if>
<if test="muId != null">mu_id = #{muId},</if>
<if test="birthNum != null">birth_num = #{birthNum},</if>
<if test="name != null">name = #{name},</if>
<if test="birthday != null">birthday = #{birthday},</if>
<if test="sex != null">sex = #{sex},</if>
<if test="bornAddress != null">born_address = #{bornAddress},</if>
<if test="mName != null">m_name = #{mName},</if>
<if test="mAge != null">m_age = #{mAge},</if>
<if test="mGj != null">m_gj = #{mGj},</if>
<if test="mNation != null">m_nation = #{mNation},</if>
<if test="mCardId != null">m_card_id = #{mCardId},</if>
<if test="fName != null">f_name = #{fName},</if>
<if test="fAge != null">f_age = #{fAge},</if>
<if test="fGj != null">f_gj = #{fGj},</if>
<if test="fNation != null">f_nation = #{fNation},</if>
<if test="fCardId != null">f_card_id = #{fCardId},</if>
<if test="homeAddress != null">home_address = #{homeAddress},</if>
<if test="momSign != null">mom_sign = #{momSign},</if>
<if test="jsrySign != null">jsry_sign = #{jsrySign},</if>
<if test="jsUnit != null">js_unit = #{jsUnit},</if>
<if test="djType != null">dj_type = #{djType},</if>
<if test="picIds != null">pic_ids = #{picIds},</if>
<if test="pictures != null">pictures = #{pictures},</if>
<if test="allPicIds != null">all_pic_ids = #{allPicIds},</if>
<if test="allPics != null">all_pics = #{allPics},</if>
<if test="errorCorrect != null">error_correct = #{errorCorrect},</if>
<if test="auditStatus != null">audit_status = #{auditStatus},</if>
<if test="auditName != null">audit_name = #{auditName},</if>
<if test="auditResult != null">audit_result = #{auditResult},</if>
<if test="auditReason != null">audit_reason = #{auditReason},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteDaBirthDjById" parameterType="Long">
delete from da_birth_dj where id = #{id}
</delete>
<delete id="deleteDaBirthDjByIds" parameterType="String">
delete from da_birth_dj where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

@ -15,7 +15,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="address" column="address" /> <result property="address" column="address" />
<result property="jiguan" column="jiguan" /> <result property="jiguan" column="jiguan" />
<result property="cardId" column="card_id" /> <result property="cardId" column="card_id" />
<result property="picIds" column="pic_ids" />
<result property="pictures" column="pictures" /> <result property="pictures" column="pictures" />
<result property="allPicIds" column="all_pic_ids" />
<result property="allPics" column="all_pics" />
<result property="errorCorrect" column="error_correct" />
<result property="auditStatus" column="audit_status" />
<result property="auditName" column="audit_name" />
<result property="auditResult" column="audit_result" />
<result property="auditReason" column="audit_reason" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
@ -24,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectDaCzrkdjVo"> <sql id="selectDaCzrkdjVo">
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 select id,yw_type, mu_id, name, hz_name, relation, birthday, address, jiguan, card_id, pic_ids, pictures, all_pic_ids, all_pics,error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_czrkdj
</sql> </sql>
<select id="selectDaCzrkdjList" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult"> <select id="selectDaCzrkdjList" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
@ -39,7 +47,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="address != null and address != ''"> and address = #{address}</if> <if test="address != null and address != ''"> and address = #{address}</if>
<if test="jiguan != null and jiguan != ''"> and jiguan = #{jiguan}</if> <if test="jiguan != null and jiguan != ''"> and jiguan = #{jiguan}</if>
<if test="cardId != null and cardId != ''"> and card_id = #{cardId}</if> <if test="cardId != null and cardId != ''"> and card_id = #{cardId}</if>
<if test="picIds != null and picIds != ''"> and pic_ids = #{picIds}</if>
<if test="pictures != null and pictures != ''"> and pictures = #{pictures}</if> <if test="pictures != null and pictures != ''"> and pictures = #{pictures}</if>
<if test="allPicIds != null and allPicIds != ''"> and all_pic_ids = #{allPicIds}</if>
<if test="allPics != null and allPics != ''"> and all_pics = #{allPics}</if>
<if test="errorCorrect != null and errorCorrect != ''"> and error_correct = #{errorCorrect}</if>
<if test="auditStatus != null and auditStatus != ''"> and audit_status = #{auditStatus}</if>
<if test="auditName != null and auditName != ''"> and audit_name like concat('%', #{auditName}, '%')</if>
<if test="auditResult != null and auditResult != ''"> and audit_result = #{auditResult}</if>
<if test="auditReason != null and auditReason != ''"> and audit_reason = #{auditReason}</if>
</where> </where>
</select> </select>
@ -57,7 +73,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="address != null and address != ''"> and address = #{address}</if> <if test="address != null and address != ''"> and address = #{address}</if>
<if test="jiguan != null and jiguan != ''"> and jiguan = #{jiguan}</if> <if test="jiguan != null and jiguan != ''"> and jiguan = #{jiguan}</if>
<if test="cardId != null and cardId != ''"> and card_id = #{cardId}</if> <if test="cardId != null and cardId != ''"> and card_id = #{cardId}</if>
<if test="pictures != null and pictures != ''"> and pictures = #{pictures}</if> <if test="picIds != null">pic_ids,</if>
<if test="pictures != null">pictures,</if>
<if test="allPicIds != null">all_pic_ids,</if>
<if test="allPics != null">all_pics,</if>
<if test="errorCorrect != null and errorCorrect != ''"> and error_correct = #{errorCorrect}</if>
<if test="auditStatus != null and auditStatus != ''"> and audit_status = #{auditStatus}</if>
<if test="auditName != null and auditName != ''"> and audit_name like concat('%', #{auditName}, '%')</if>
<if test="auditResult != null and auditResult != ''"> and audit_result = #{auditResult}</if>
<if test="auditReason != null and auditReason != ''"> and audit_reason = #{auditReason}</if>
</where> </where>
</select> </select>
@ -78,7 +102,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="address != null">address,</if> <if test="address != null">address,</if>
<if test="jiguan != null">jiguan,</if> <if test="jiguan != null">jiguan,</if>
<if test="cardId != null">card_id,</if> <if test="cardId != null">card_id,</if>
<if test="picIds != null">pic_ids,</if>
<if test="pictures != null">pictures,</if> <if test="pictures != null">pictures,</if>
<if test="allPicIds != null">all_pic_ids,</if>
<if test="allPics != null">all_pics,</if>
<if test="errorCorrect != null">error_correct,</if>
<if test="auditStatus != null">audit_status,</if>
<if test="auditName != null">audit_name,</if>
<if test="auditResult != null">audit_result,</if>
<if test="auditReason != null">audit_reason,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
@ -95,7 +127,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="address != null">#{address},</if> <if test="address != null">#{address},</if>
<if test="jiguan != null">#{jiguan},</if> <if test="jiguan != null">#{jiguan},</if>
<if test="cardId != null">#{cardId},</if> <if test="cardId != null">#{cardId},</if>
<if test="picIds != null">#{picIds},</if>
<if test="pictures != null">#{pictures},</if> <if test="pictures != null">#{pictures},</if>
<if test="allPicIds != null">#{allPicIds},</if>
<if test="allPics != null">#{allPics},</if>
<if test="errorCorrect != null">#{errorCorrect},</if>
<if test="auditStatus != null">#{auditStatus},</if>
<if test="auditName != null">#{auditName},</if>
<if test="auditResult != null">#{auditResult},</if>
<if test="auditReason != null">#{auditReason},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
@ -116,7 +156,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="address != null">address = #{address},</if> <if test="address != null">address = #{address},</if>
<if test="jiguan != null">jiguan = #{jiguan},</if> <if test="jiguan != null">jiguan = #{jiguan},</if>
<if test="cardId != null">card_id = #{cardId},</if> <if test="cardId != null">card_id = #{cardId},</if>
<if test="picIds != null">pic_ids = #{picIds},</if>
<if test="pictures != null">pictures = #{pictures},</if> <if test="pictures != null">pictures = #{pictures},</if>
<if test="allPicIds != null">all_pic_ids = #{allPicIds},</if>
<if test="allPics != null">all_pics = #{allPics},</if>
<if test="errorCorrect != null">error_correct = #{errorCorrect},</if>
<if test="auditStatus != null">audit_status = #{auditStatus},</if>
<if test="auditName != null">audit_name = #{auditName},</if>
<if test="auditResult != null">audit_result = #{auditResult},</if>
<if test="auditReason != null">audit_reason = #{auditReason},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询出生登记列表
export function listBirthDJ(query) {
return request({
url: '/dangan/birthDJ/list',
method: 'get',
params: query
})
}
// 查询出生登记详细
export function getBirthDJ(id) {
return request({
url: '/dangan/birthDJ/' + id,
method: 'get'
})
}
// 新增出生登记
export function addBirthDJ(data) {
return request({
url: '/dangan/birthDJ',
method: 'post',
data: data
})
}
// 修改出生登记
export function updateBirthDJ(data) {
return request({
url: '/dangan/birthDJ',
method: 'put',
data: data
})
}
// 删除出生登记
export function delBirthDJ(id) {
return request({
url: '/dangan/birthDJ/' + id,
method: 'delete'
})
}

@ -0,0 +1,626 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="目录id" prop="muId">
<el-input
v-model="queryParams.muId"
placeholder="请输入目录id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出生证编号" prop="birthNum">
<el-input
v-model="queryParams.birthNum"
placeholder="请输入出生证编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="婴儿姓名" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入婴儿姓名"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出生时间" prop="birthday">
<el-date-picker clearable
v-model="queryParams.birthday"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择出生时间">
</el-date-picker>
</el-form-item>
<el-form-item label="出生地点" prop="bornAddress">
<el-input
v-model="queryParams.bornAddress"
placeholder="请输入出生地点"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="母亲姓名" prop="mName">
<el-input
v-model="queryParams.mName"
placeholder="请输入母亲姓名"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="母亲年龄" prop="mAge">
<el-input
v-model="queryParams.mAge"
placeholder="请输入母亲年龄"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="母亲国籍" prop="mGj">
<el-input
v-model="queryParams.mGj"
placeholder="请输入母亲国籍"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="母亲民族" prop="mNation">
<el-input
v-model="queryParams.mNation"
placeholder="请输入母亲民族"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="母亲身份证号" prop="mCardId">
<el-input
v-model="queryParams.mCardId"
placeholder="请输入母亲身份证号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="父亲姓名" prop="fName">
<el-input
v-model="queryParams.fName"
placeholder="请输入父亲姓名"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="父亲年龄" prop="fAge">
<el-input
v-model="queryParams.fAge"
placeholder="请输入父亲年龄"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="父亲国籍" prop="fGj">
<el-input
v-model="queryParams.fGj"
placeholder="请输入父亲国籍"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="父亲民族" prop="fNation">
<el-input
v-model="queryParams.fNation"
placeholder="请输入父亲民族"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="父亲身份证号" prop="fCardId">
<el-input
v-model="queryParams.fCardId"
placeholder="请输入父亲身份证号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="家庭住址" prop="homeAddress">
<el-input
v-model="queryParams.homeAddress"
placeholder="请输入家庭住址"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="婴儿母亲签字" prop="momSign">
<el-input
v-model="queryParams.momSign"
placeholder="请输入婴儿母亲签字"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="接生人员签字" prop="jsrySign">
<el-input
v-model="queryParams.jsrySign"
placeholder="请输入接生人员签字"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="接生单位" prop="jsUnit">
<el-input
v-model="queryParams.jsUnit"
placeholder="请输入接生单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="识别图片id" prop="picIds">
<el-input
v-model="queryParams.picIds"
placeholder="请输入识别图片id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="相关图片id" prop="allPicIds">
<el-input
v-model="queryParams.allPicIds"
placeholder="请输入相关图片id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否纠错(字典0否1是)" prop="errorCorrect">
<el-input
v-model="queryParams.errorCorrect"
placeholder="请输入是否纠错(字典0否1是)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核人" prop="auditName">
<el-input
v-model="queryParams.auditName"
placeholder="请输入审核人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核结果" prop="auditResult">
<el-input
v-model="queryParams.auditResult"
placeholder="请输入审核结果"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核原由" prop="auditReason">
<el-input
v-model="queryParams.auditReason"
placeholder="请输入审核原由"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['dangan:birthDJ:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['dangan:birthDJ:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['dangan:birthDJ:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['dangan:birthDJ:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="birthDJList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="业务类型(字典)" align="center" prop="ywType" />
<el-table-column label="目录id" align="center" prop="muId" />
<el-table-column label="出生证编号" align="center" prop="birthNum" />
<el-table-column label="婴儿姓名" align="center" prop="name" />
<el-table-column label="出生时间" align="center" prop="birthday" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="性别" align="center" prop="sex" />
<el-table-column label="出生地点" align="center" prop="bornAddress" />
<el-table-column label="母亲姓名" align="center" prop="mName" />
<el-table-column label="母亲年龄" align="center" prop="mAge" />
<el-table-column label="母亲国籍" align="center" prop="mGj" />
<el-table-column label="母亲民族" align="center" prop="mNation" />
<el-table-column label="母亲身份证号" align="center" prop="mCardId" />
<el-table-column label="父亲姓名" align="center" prop="fName" />
<el-table-column label="父亲年龄" align="center" prop="fAge" />
<el-table-column label="父亲国籍" align="center" prop="fGj" />
<el-table-column label="父亲民族" align="center" prop="fNation" />
<el-table-column label="父亲身份证号" align="center" prop="fCardId" />
<el-table-column label="家庭住址" align="center" prop="homeAddress" />
<el-table-column label="婴儿母亲签字" align="center" prop="momSign" />
<el-table-column label="接生人员签字" align="center" prop="jsrySign" />
<el-table-column label="接生单位" align="center" prop="jsUnit" />
<el-table-column label="出生登记类型(字典)" align="center" prop="djType" />
<el-table-column label="识别图片id" align="center" prop="picIds" />
<el-table-column label="识别图片" align="center" prop="pictures" />
<el-table-column label="相关图片id" align="center" prop="allPicIds" />
<el-table-column label="相关图片" align="center" prop="allPics" />
<el-table-column label="是否纠错(字典0否1是)" align="center" prop="errorCorrect" />
<el-table-column label="审核状态(字典)" align="center" prop="auditStatus" />
<el-table-column label="审核人" align="center" prop="auditName" />
<el-table-column label="审核结果" align="center" prop="auditResult" />
<el-table-column label="审核原由" align="center" prop="auditReason" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['dangan:birthDJ:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['dangan:birthDJ:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改出生登记对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="目录id" prop="muId">
<el-input v-model="form.muId" placeholder="请输入目录id" />
</el-form-item>
<el-form-item label="出生证编号" prop="birthNum">
<el-input v-model="form.birthNum" placeholder="请输入出生证编号" />
</el-form-item>
<el-form-item label="婴儿姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入婴儿姓名" />
</el-form-item>
<el-form-item label="出生时间" prop="birthday">
<el-date-picker clearable
v-model="form.birthday"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择出生时间">
</el-date-picker>
</el-form-item>
<el-form-item label="出生地点" prop="bornAddress">
<el-input v-model="form.bornAddress" placeholder="请输入出生地点" />
</el-form-item>
<el-form-item label="母亲姓名" prop="mName">
<el-input v-model="form.mName" placeholder="请输入母亲姓名" />
</el-form-item>
<el-form-item label="母亲年龄" prop="mAge">
<el-input v-model="form.mAge" placeholder="请输入母亲年龄" />
</el-form-item>
<el-form-item label="母亲国籍" prop="mGj">
<el-input v-model="form.mGj" placeholder="请输入母亲国籍" />
</el-form-item>
<el-form-item label="母亲民族" prop="mNation">
<el-input v-model="form.mNation" placeholder="请输入母亲民族" />
</el-form-item>
<el-form-item label="母亲身份证号" prop="mCardId">
<el-input v-model="form.mCardId" placeholder="请输入母亲身份证号" />
</el-form-item>
<el-form-item label="父亲姓名" prop="fName">
<el-input v-model="form.fName" placeholder="请输入父亲姓名" />
</el-form-item>
<el-form-item label="父亲年龄" prop="fAge">
<el-input v-model="form.fAge" placeholder="请输入父亲年龄" />
</el-form-item>
<el-form-item label="父亲国籍" prop="fGj">
<el-input v-model="form.fGj" placeholder="请输入父亲国籍" />
</el-form-item>
<el-form-item label="父亲民族" prop="fNation">
<el-input v-model="form.fNation" placeholder="请输入父亲民族" />
</el-form-item>
<el-form-item label="父亲身份证号" prop="fCardId">
<el-input v-model="form.fCardId" placeholder="请输入父亲身份证号" />
</el-form-item>
<el-form-item label="家庭住址" prop="homeAddress">
<el-input v-model="form.homeAddress" placeholder="请输入家庭住址" />
</el-form-item>
<el-form-item label="婴儿母亲签字" prop="momSign">
<el-input v-model="form.momSign" placeholder="请输入婴儿母亲签字" />
</el-form-item>
<el-form-item label="接生人员签字" prop="jsrySign">
<el-input v-model="form.jsrySign" placeholder="请输入接生人员签字" />
</el-form-item>
<el-form-item label="接生单位" prop="jsUnit">
<el-input v-model="form.jsUnit" placeholder="请输入接生单位" />
</el-form-item>
<el-form-item label="识别图片id" prop="picIds">
<el-input v-model="form.picIds" placeholder="请输入识别图片id" />
</el-form-item>
<el-form-item label="识别图片" prop="pictures">
<el-input v-model="form.pictures" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="相关图片id" prop="allPicIds">
<el-input v-model="form.allPicIds" placeholder="请输入相关图片id" />
</el-form-item>
<el-form-item label="相关图片" prop="allPics">
<el-input v-model="form.allPics" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="是否纠错(字典0否1是)" prop="errorCorrect">
<el-input v-model="form.errorCorrect" placeholder="请输入是否纠错(字典0否1是)" />
</el-form-item>
<el-form-item label="审核人" prop="auditName">
<el-input v-model="form.auditName" placeholder="请输入审核人" />
</el-form-item>
<el-form-item label="审核结果" prop="auditResult">
<el-input v-model="form.auditResult" placeholder="请输入审核结果" />
</el-form-item>
<el-form-item label="审核原由" prop="auditReason">
<el-input v-model="form.auditReason" placeholder="请输入审核原由" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listBirthDJ, getBirthDJ, delBirthDJ, addBirthDJ, updateBirthDJ } from "@/api/dangan/birthDJ";
export default {
name: "BirthDJ",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
birthDJList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
ywType: null,
muId: null,
birthNum: null,
name: null,
birthday: null,
sex: null,
bornAddress: null,
mName: null,
mAge: null,
mGj: null,
mNation: null,
mCardId: null,
fName: null,
fAge: null,
fGj: null,
fNation: null,
fCardId: null,
homeAddress: null,
momSign: null,
jsrySign: null,
jsUnit: null,
djType: null,
picIds: null,
pictures: null,
allPicIds: null,
allPics: null,
errorCorrect: null,
auditStatus: null,
auditName: null,
auditResult: null,
auditReason: null,
},
//
form: {},
//
rules: {
muId: [
{ required: true, message: "目录id不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询出生登记列表 */
getList() {
this.loading = true;
listBirthDJ(this.queryParams).then(response => {
this.birthDJList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
ywType: null,
muId: null,
birthNum: null,
name: null,
birthday: null,
sex: null,
bornAddress: null,
mName: null,
mAge: null,
mGj: null,
mNation: null,
mCardId: null,
fName: null,
fAge: null,
fGj: null,
fNation: null,
fCardId: null,
homeAddress: null,
momSign: null,
jsrySign: null,
jsUnit: null,
djType: null,
picIds: null,
pictures: null,
allPicIds: null,
allPics: null,
errorCorrect: null,
auditStatus: null,
auditName: null,
auditResult: null,
auditReason: null,
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加出生登记";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getBirthDJ(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改出生登记";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateBirthDJ(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addBirthDJ(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除出生登记编号为"' + ids + '"的数据项?').then(function() {
return delBirthDJ(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('dangan/birthDJ/export', {
...this.queryParams
}, `birthDJ_${new Date().getTime()}.xlsx`)
}
}
};
</script>
Loading…
Cancel
Save