From a992e9c46af2a060bbc08e2b572c1d5c1ae60ec1 Mon Sep 17 00:00:00 2001 From: hansha Date: Thu, 1 Aug 2024 10:16:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=86=E5=88=AB=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E3=80=81=E6=B7=BB=E5=8A=A0flag=E6=8E=92=E7=A9=BA?= =?UTF-8?q?=E6=A0=87=E8=AE=B0=E3=80=81=E4=BB=BB=E5=8A=A1=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=BB=93?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DaPicturesRecardController.java | 146 +++++---------- .../controller/DangAnCollectController.java | 78 ++------ .../java/com/da/dangan/domain/DaBirthDj.java | 13 ++ .../java/com/da/dangan/domain/DaCzrkdj.java | 13 ++ .../da/dangan/domain/DaPicturesRecard.java | 21 ++- .../main/java/com/da/dangan/domain/DaQyz.java | 13 ++ .../java/com/da/dangan/domain/DaTask.java | 171 +++++++++++------- .../java/com/da/dangan/domain/DaYtzm.java | 13 ++ .../java/com/da/dangan/domain/DaZfnyhkcg.java | 13 ++ .../main/java/com/da/dangan/domain/DaZqz.java | 13 ++ .../service/impl/DaBirthDjServiceImpl.java | 29 ++- .../service/impl/DaCzrkdjServiceImpl.java | 69 ++++--- .../dangan/service/impl/DaQyzServiceImpl.java | 30 ++- .../service/impl/DaYtzmServiceImpl.java | 29 ++- .../service/impl/DaZfnyhkcgServiceImpl.java | 35 +++- .../dangan/service/impl/DaZqzServiceImpl.java | 35 +++- .../java/com/da/dangan/timetask/TimeTask.java | 3 +- .../da/dangan/util/CallThirdInterface.java | 2 +- .../mapper/dangan/DaBirthDjMapper.xml | 18 +- .../mapper/dangan/DaCzrkdjMapper.xml | 22 ++- .../resources/mapper/dangan/DaQyzMapper.xml | 7 +- .../resources/mapper/dangan/DaTaskMapper.xml | 9 +- .../resources/mapper/dangan/DaYtzmMapper.xml | 12 +- .../mapper/dangan/DaZfnyhkcgMapper.xml | 2 + .../resources/mapper/dangan/DaZqzMapper.xml | 19 +- 25 files changed, 503 insertions(+), 312 deletions(-) diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java index b168da7..95248b7 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java @@ -1,6 +1,7 @@ package com.da.dangan.controller; import cn.hutool.core.util.URLUtil; +import cn.hutool.http.HttpUtil; import com.da.common.annotation.Log; import com.da.common.core.controller.BaseController; import com.da.common.core.domain.AjaxResult; @@ -22,39 +23,37 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.IOException; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; -import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; /** * 档案图片信息记录Controller - * + * * @author hs * @date 2024-05-13 */ @RestController @RequestMapping("/dangan/pictureRecard") -public class DaPicturesRecardController extends BaseController -{ +public class DaPicturesRecardController extends BaseController { @Autowired private ExecutorService executorService; @Autowired private IDaPicturesRecardService daPicturesRecardService; + /** * 查询档案图片信息记录列表 */ @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:list')") @GetMapping("/list") - public TableDataInfo list(DaPicturesRecard daPicturesRecard) - { + public TableDataInfo list(DaPicturesRecard daPicturesRecard) { // 超管及角色为管理员显示所有目录信息 LoginUser loginUser = getLoginUser(); if (SysUser.isAdmin(getUserId()) || loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { - }else{ + } else { daPicturesRecard.setUserId(getUserId()); } startPage(); @@ -65,10 +64,9 @@ public class DaPicturesRecardController extends BaseController /** * 任务记录查询相关 档案图片信息记录列表 */ - // @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:list')") + // @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:list')") @GetMapping("/listByIds") - public TableDataInfo listByIds(Long[] ids) - { + public TableDataInfo listByIds(Long[] ids) { startPage(); List list = daPicturesRecardService.selectDaPicturesRecardByIds(ids); return getDataTable(list); @@ -80,8 +78,7 @@ public class DaPicturesRecardController extends BaseController @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:export')") @Log(title = "档案图片信息记录", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, DaPicturesRecard daPicturesRecard) - { + public void export(HttpServletResponse response, DaPicturesRecard daPicturesRecard) { List list = daPicturesRecardService.selectDaPicturesRecardList(daPicturesRecard); ExcelUtil util = new ExcelUtil(DaPicturesRecard.class); util.exportExcel(response, list, "档案图片信息记录数据"); @@ -93,12 +90,11 @@ public class DaPicturesRecardController extends BaseController @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:export')") @Log(title = "图片下载", businessType = BusinessType.EXPORT) @PostMapping("/exportImage") - public void export2(HttpServletRequest request,HttpServletResponse response, DaPicturesRecard daPicturesRecard) - { + public void export2(HttpServletRequest request, HttpServletResponse response, DaPicturesRecard daPicturesRecard) { List list = daPicturesRecardService.selectDaPicturesRecardList(daPicturesRecard); - List images = list.stream().map(DaPicturesRecard ::getPicUrl).collect(Collectors.toList()); - //exportImages(request,response,images,"档案图片"); - exportImages1(response,images,"档案图片"); + List images = list.stream().map(DaPicturesRecard::getPicUrl).collect(Collectors.toList()); + exportImages(response,images); + //exportImages1(response, images); } /** @@ -106,8 +102,7 @@ public class DaPicturesRecardController extends BaseController */ @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(daPicturesRecardService.selectDaPicturesRecardById(id)); } @@ -117,8 +112,7 @@ public class DaPicturesRecardController extends BaseController @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:add')") @Log(title = "档案图片信息记录", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody DaPicturesRecard daPicturesRecard) - { + public AjaxResult add(@RequestBody DaPicturesRecard daPicturesRecard) { daPicturesRecard.setCreateBy(getUsername()); return toAjax(daPicturesRecardService.insertDaPicturesRecard(daPicturesRecard)); } @@ -129,8 +123,7 @@ public class DaPicturesRecardController extends BaseController @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:edit')") @Log(title = "档案图片信息记录", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody DaPicturesRecard daPicturesRecard) - { + public AjaxResult edit(@RequestBody DaPicturesRecard daPicturesRecard) { return toAjax(daPicturesRecardService.updateDaPicturesRecard(daPicturesRecard)); } @@ -139,26 +132,25 @@ public class DaPicturesRecardController extends BaseController */ @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:remove')") @Log(title = "档案图片信息记录", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return daPicturesRecardService.deleteDaPicturesRecardByIds(ids); } /** * 使用多线程打包下载 */ - private void exportImages1( HttpServletResponse response, List images, String name) { + private void exportImages1(HttpServletResponse response, List images) { response.setContentType("application/zip"); - response.setHeader("Content-Disposition", "attachment;filename=demo.zip"); + response.setHeader("Content-Disposition", "attachment;filename=image.zip"); ParallelScatterZipCreator parallelScatterZipCreator = new ParallelScatterZipCreator(executorService); try (ZipArchiveOutputStream zipArchiveOutputStream = new ZipArchiveOutputStream(response.getOutputStream())) { zipArchiveOutputStream.setLevel(0); images.forEach(x -> { - ZipArchiveEntry zipArchiveEntry = new ZipArchiveEntry(StringUtils.getFilename(x)); - zipArchiveEntry.setMethod(ZipArchiveEntry.STORED); + ZipArchiveEntry zipEntry = new ZipArchiveEntry(StringUtils.getFilename(x)); + zipEntry.setMethod(ZipArchiveEntry.STORED); InputStreamSupplier inputStreamSupplier = () -> URLUtil.getStream(URLUtil.url(x)); - parallelScatterZipCreator.addArchiveEntry(zipArchiveEntry, inputStreamSupplier); + parallelScatterZipCreator.addArchiveEntry(zipEntry, inputStreamSupplier); }); parallelScatterZipCreator.writeTo(zipArchiveOutputStream); } catch (Exception e) { @@ -166,76 +158,28 @@ public class DaPicturesRecardController extends BaseController } } - private void exportImages(HttpServletRequest request, HttpServletResponse response, List images, String name) { - //响应头的设置 - response.reset(); - response.setCharacterEncoding("utf-8"); - response.setContentType("multipart/form-data"); - //设置压缩包的名字 - //解决不同浏览器压缩包名字含有中文乱码的问题 - String billname ="workerCard"; - String downloadName=name+".zip"; - //返回客户端浏览器的版本号、类型 - String agent = request.getHeader("USER-AGENT"); - try { - //针对IE或者以IE为内核的浏览器处理 - if (agent.contains("MSIE")||agent.contains("Trident")){ - - downloadName=java.net.URLEncoder.encode(downloadName, "UTF-8"); - }else { - downloadName=new String(downloadName.getBytes("UTF-8"),"ISO-8859-1"); - } - }catch (Exception e) { - e.printStackTrace(); - } - response.setHeader("Content-Disposition","attachment;fileName=\"" + downloadName + "\""); - //设置压缩流 - ZipOutputStream zip=null; - - try { - zip=new ZipOutputStream(new BufferedOutputStream(response.getOutputStream())); - //设置压缩方法 - zip.setMethod(ZipOutputStream.DEFLATED); - } catch (IOException e) { - e.printStackTrace(); - } - DataOutputStream os=null; - //从数据库中取出要下载的图片路径 - - for (String image : images) { - File file = new File(image); - if (file.exists()){ - //添加ZipEntry，并ZipEntry中写入文件流 - //这里，加上i是防止要下载的文件有重名的导致下载失败 - try { - zip.putNextEntry(new ZipEntry(file.getName())); - os=new DataOutputStream(zip); - InputStream is = new FileInputStream(file); - byte[]b= new byte [1024]; - int length =0; - while ((length=is.read(b))!=-1){ - os.write(b,0,length); - } - is.close(); - //zip.closeEntry(); - } catch (IOException e) { - e.printStackTrace(); - } - } - //关闭流 - try { - if (os!=null){ - os.flush(); - os.close(); - zip.close(); - }else { - break; + /** + * 单线程打包下载 + */ + private void exportImages(HttpServletResponse response, List images) { + response.setContentType("application/zip"); + response.setHeader("Content-Disposition", "attachment;filename=image.zip"); + try (ZipOutputStream zipOutputStream = new ZipOutputStream(response.getOutputStream())) { + zipOutputStream.setLevel(0); + images.forEach(x -> { + try { + zipOutputStream.putNextEntry(new ZipArchiveEntry(StringUtils.getFilename(x))); + HttpUtil.download(x, zipOutputStream, false); + zipOutputStream.closeEntry(); + } catch (IOException e) { + e.printStackTrace(); } - - } catch (IOException e) { - e.printStackTrace(); - } + }); + zipOutputStream.flush(); + zipOutputStream.finish(); + } catch (Exception e) { + e.printStackTrace(); } - } + } 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 f27225c..1b8b7fc 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 @@ -265,6 +265,7 @@ public class DangAnCollectController extends BaseController { if (picRecards != null && picRecards.size() > 0) { List ids = picRecards.stream().map(DaPicturesRecard::getId).collect(Collectors.toList()); String ywType = picRecards.get(0).getYwType(); + String sbType = picRecards.get(0).getSbType(); Long muId = picRecards.get(0).getMuId(); String muPath = picRecards.get(0).getMuPath(); @@ -276,10 +277,22 @@ public class DangAnCollectController extends BaseController { daTask.setMuId(muId); daTask.setMuPath(muPath); daTask.setYwType(ywType); + if(sbType!=null&&!sbType.trim().equals("")){ + daTask.setSbType(sbType); // 识别模板默认=业务模板 + }else{ + daTask.setSbType(ywType); + } daTask.setNum(picRecards.size()); daTask.setStatus("-1");//默认等待状态 接收成功后修改为1 daTask.setPicIds(StringUtils.join(ids, ","));//逗号分割); daTaskService.insertDaTask(daTask); + + //修改图片识别状态 为识别等待 + for (DaPicturesRecard picRecard : picRecards) { + picRecard.setRecognize("2"); + daPicturesRecardService.updateDaPicturesRecard(picRecard); + } + } else { return AjaxResult.error("识别图片不能为空"); } @@ -374,14 +387,14 @@ public class DangAnCollectController extends BaseController { */ @Log(title = "识别任务", businessType = BusinessType.TASKUP) @PostMapping("/reRecongnize") - public AjaxResult reRecongnize(Long taskId) { + public AjaxResult reRecongnize(Long taskId,String sbType) { try { DaTask daTask = daTaskService.selectDaTaskById(taskId); //修改任务状态 daTask.setStatus("-1");//默认等待状态 daTask.setUpdateTime(new Date());//等待开始时间 + daTask.setSbType(sbType); //按客户要求修改识别模板类型 daTaskService.updateDaTask(daTask); - } catch (Exception e) { e.printStackTrace(); return AjaxResult.error(e.getMessage()); @@ -429,16 +442,6 @@ public class DangAnCollectController extends BaseController { long end = System.currentTimeMillis(); logger.info("CompletableFuture耗时--——————————————————》" + (end - start) + "ms"); - // TODO 根据业务类型存储识别后的信息 - /* - - - - - - - - */ Long dajlId = null; switch (ywType) { case "option1": @@ -503,57 +506,6 @@ public class DangAnCollectController extends BaseController { return AjaxResult.success(); } - /** - * 手动识别--未使用 - */ - /*@PostMapping("/sdrecongnize") - public AjaxResult sdrecognize(@RequestBody DaPicturesRecard picRecard) { - try { - //取所有id的集合 - String ywType = picRecard.getYwType(); - String singleOrDouble = picRecard.getSingelOrDouble(); - // TODO 数据解析 根据业务类型存储识别后的信息 - - switch(ywType){ - case "0" : - - break; - case "1" : - - break; - case "2" : - DaCzrkdj czrkdj = picRecard.getCzrkdj(); - daCzrkdjService.insertDaCzrkdj(czrkdj); - //picRecards.stream().filter(p -> p.getId()==1L || p.getId()==2L).collect(Collectors.toList()); - break; - case "3" : - - break; - case "4" : - - break; - case "5" : - - break; - case "6" : - - break; - case "7" : - DaBirthDj csdj = picRecard.getCsdj(); - daBirthDjService.insertDaBirthDj(csdj); - break; - } - //识别成功图片 ，修改图片信息记录表为已识别 - picRecard.setRecognize("1"); - daPicturesRecardService.updateDaPicturesRecard(picRecard); - - } catch (Exception e) { - e.printStackTrace(); - return AjaxResult.error(e.getMessage()); - } - return AjaxResult.success(); - }*/ - /** * 线程池调用第三方接口 */ diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java index 6ba609a..851c223 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java @@ -228,6 +228,19 @@ public class DaBirthDj extends BaseEntity { */ private Long userId; + /** + * flag=0查看全部,1排除姓名为空的记录 + */ + private String flag; + + public String getFlag() { + return flag; + } + + public void setFlag(String flag) { + this.flag = flag; + } + public Long getUserId() { return userId; } 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 ff1d18f..322244e 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 @@ -242,6 +242,19 @@ public class DaCzrkdj extends BaseEntity { */ private Long userId; + /** + * flag=0查看全部,1排除姓名为空的记录 + */ + private String flag; + + public String getFlag() { + return flag; + } + + public void setFlag(String flag) { + this.flag = flag; + } + public Long getTaskId() { return taskId; } 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 25612fd..41024f6 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 @@ -43,19 +43,23 @@ public class DaPicturesRecard extends BaseEntity private String muPath; /** 业务类型(字典) */ - @Excel(name = "业务类型",dictType = "yw_type") + // @Excel(name = "业务类型",dictType = "yw_type") private String ywType; + /** 业务类型(字典) */ + // @Excel(name = "识别类型",dictType = "sb_type") + private String sbType; + /** 对应档案记录id */ - @Excel(name = "对应档案记录id") + // @Excel(name = "对应档案记录id") private Long daJlId; /** 是否已识别 */ - @Excel(name = "是否已识别(0否1是)") + @Excel(name = "是否已识别",dictType = "recognize") private String recognize; /** 是否纠错(字典0否1是) */ - @Excel(name = "是否纠错(0否1是)") + @Excel(name = "是否纠错",dictType = "error_correct") private String errorCorrect; /** @@ -63,6 +67,14 @@ public class DaPicturesRecard extends BaseEntity */ private Long userId; + public String getSbType() { + return sbType; + } + + public void setSbType(String sbType) { + this.sbType = sbType; + } + public Long getUserId() { return userId; } @@ -212,6 +224,7 @@ public class DaPicturesRecard extends BaseEntity .append("muId", getMuId()) .append("muPath", getMuPath()) .append("ywType", getYwType()) + .append("sbType", getSbType()) .append("daJlId", getDaJlId()) .append("recognize", getRecognize()) .append("errorCorrect", getErrorCorrect()) diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java index cad9cc1..1a1b5e5 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java @@ -228,6 +228,19 @@ public class DaQyz extends BaseEntity { */ private Long userId; + /** + * flag=0查看全部,1排除姓名为空的记录 + */ + private String flag; + + public String getFlag() { + return flag; + } + + public void setFlag(String flag) { + this.flag = flag; + } + public Long getUserId() { return userId; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java index b72c74e..02f7af6 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java @@ -14,76 +14,115 @@ import java.util.Date; * @author hs * @date 2024-07-01 */ -public class DaTask extends BaseEntity -{ +public class DaTask extends BaseEntity { private static final long serialVersionUID = 1L; - /** 任务id */ + /** + * 任务id + */ private Long id; - /** 目录id */ + /** + * 目录id + */ @Excel(name = "目录id") private Long muId; - /** 业务类型 */ + /** + * 业务类型 + */ @Excel(name = "业务类型") private String ywType; - /** 档案目录路径 */ + /** + * 识别模板类型 + */ + @Excel(name = "识别类型") + private String sbType; + + /** + * 档案目录路径 + */ @Excel(name = "档案目录路径") private String muPath; - /** 处理图片数量 */ + /** + * 处理图片数量 + */ @Excel(name = "处理图片数量") private Integer num; - /** 任务图片ids */ + /** + * 任务图片ids + */ @Excel(name = "任务图片ids") private String picIds; - /** 重新识别数量 */ + /** + * 重新识别数量 + */ @Excel(name = "重新识别数量") private Integer lastNum; - /** 任务状态(字典) */ + /** + * 任务状态(字典) + */ @Excel(name = "任务状态(字典)") private String status; - /** 成功数 */ + /** + * 成功数 + */ @Excel(name = "成功数") private Integer successNum; - /** 成功图片ids */ + /** + * 成功图片ids + */ @Excel(name = "成功图片ids") private String successIds; - /** 失败数 */ + /** + * 失败数 + */ @Excel(name = "失败数") private Integer failNum; - /** 失败图片ids */ + /** + * 失败图片ids + */ @Excel(name = "失败图片ids") private String failIds; - /** 返回结果 */ + /** + * 返回结果 + */ @Excel(name = "返回结果") private String resultStr; - /** 上传时长(毫秒) */ + /** + * 上传时长(毫秒) + */ @Excel(name = "上传时长(毫秒)") private Long upDuration; - /** 识别开始时间 */ + /** + * 识别开始时间 + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "识别开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date sbStart; - /** 识别结束时间 */ + /** + * 识别结束时间 + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "识别结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date sbEnd; - /** 处理时长(毫秒) */ + /** + * 处理时长(毫秒) + */ @Excel(name = "处理时长(毫秒)") private Long processDuration; @@ -101,112 +140,107 @@ public class DaTask extends BaseEntity this.userId = userId; } - 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 setMuId(Long muId) { this.muId = muId; } - public Long getMuId() - { + public Long getMuId() { return muId; } - public void setYwType(String ywType) - { + + public void setYwType(String ywType) { this.ywType = ywType; } - public String getYwType() - { + public String getYwType() { return ywType; } - public void setMuPath(String muPath) - { + + public void setMuPath(String muPath) { this.muPath = muPath; } - public String getMuPath() - { + public void setSbType(String sbType) { + this.sbType = sbType; + } + + public String getSbType() { + return sbType; + } + + public String getMuPath() { return muPath; } - public void setNum(Integer num) - { + + public void setNum(Integer num) { this.num = num; } - public Integer getNum() - { + public Integer getNum() { return num; } - public void setPicIds(String picIds) - { + + public void setPicIds(String picIds) { this.picIds = picIds; } - public String getPicIds() - { + public String getPicIds() { return picIds; } - public void setStatus(String status) - { + + public void setStatus(String status) { this.status = status; } - public String getStatus() - { + public String getStatus() { return status; } - public void setSuccessNum(Integer successNum) - { + + public void setSuccessNum(Integer successNum) { this.successNum = successNum; } - public Integer getSuccessNum() - { + public Integer getSuccessNum() { return successNum; } - public void setSuccessIds(String successIds) - { + + public void setSuccessIds(String successIds) { this.successIds = successIds; } - public String getSuccessIds() - { + public String getSuccessIds() { return successIds; } - public void setFailNum(Integer failNum) - { + + public void setFailNum(Integer failNum) { this.failNum = failNum; } - public Integer getFailNum() - { + public Integer getFailNum() { return failNum; } - public void setFailIds(String failIds) - { + + public void setFailIds(String failIds) { this.failIds = failIds; } - public String getFailIds() - { + public String getFailIds() { return failIds; } - public void setResultStr(String resultStr) - { + + public void setResultStr(String resultStr) { this.resultStr = resultStr; } - public String getResultStr() - { + public String getResultStr() { return resultStr; } @@ -252,10 +286,11 @@ public class DaTask extends BaseEntity @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) .append("muId", getMuId()) .append("ywType", getYwType()) + .append("sbType", getSbType()) .append("muPath", getMuPath()) .append("num", getNum()) .append("picIds", getPicIds()) diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java index b3c23a5..68411b2 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java @@ -204,6 +204,19 @@ public class DaYtzm extends BaseEntity { */ private Long userId; + /** + * flag=0查看全部,1排除姓名为空的记录 + */ + private String flag; + + public String getFlag() { + return flag; + } + + public void setFlag(String flag) { + this.flag = flag; + } + public Long getUserId() { return userId; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java index a7e7b01..5baf75f 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java @@ -240,6 +240,19 @@ public class DaZfnyhkcg extends BaseEntity { */ private Long userId; + /** + * flag=0查看全部,1排除姓名为空的记录 + */ + private String flag; + + public String getFlag() { + return flag; + } + + public void setFlag(String flag) { + this.flag = flag; + } + public Long getUserId() { return userId; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java index c6bc18b..13be4ab 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java @@ -207,6 +207,19 @@ public class DaZqz extends BaseEntity */ private Long userId; + /** + * flag=0查看全部,1排除姓名为空的记录 + */ + private String flag; + + public String getFlag() { + return flag; + } + + public void setFlag(String flag) { + this.flag = flag; + } + public Long getUserId() { return userId; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java index 82d94ed..2a92a14 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java @@ -3,14 +3,19 @@ package com.da.dangan.service.impl; import com.da.common.utils.DateUtils; import com.da.dangan.domain.DaBirthDj; import com.da.dangan.domain.DaPicturesRecard; +import com.da.dangan.domain.DaTask; import com.da.dangan.mapper.DaBirthDjMapper; import com.da.dangan.mapper.DaPicturesRecardMapper; +import com.da.dangan.mapper.DaTaskMapper; import com.da.dangan.service.IDaBirthDjService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 出生登记Service业务层处理 @@ -25,6 +30,8 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService private DaBirthDjMapper daBirthDjMapper; @Autowired private DaPicturesRecardMapper daPicturesRecardMapper; + @Autowired + private DaTaskMapper daTaskMapper; /** * 查询出生登记 * @@ -60,14 +67,28 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService public int insertDaBirthDj(DaBirthDj daBirthDj) { //识别图片状态改为已识别 - String[] picIds = daBirthDj.getPicIds().split(","); - if(picIds!=null&&picIds.length>0){ - for(String picid:picIds){ + List picIds = Stream.of(daBirthDj.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + if (picIds != null && picIds.size() > 0) { + for (Long picid : picIds) { DaPicturesRecard picRecard = new DaPicturesRecard(); - picRecard.setId(Long.parseLong(picid)); + picRecard.setId(picid); picRecard.setRecognize("1"); daPicturesRecardMapper.updateDaPicturesRecard(picRecard); } + //手动识别且图片来自于任务，修改任务成功、失败图片 + if (daBirthDj.getTaskId() != null&&daBirthDj.getErrorCorrect().equals("2")) { + DaTask daTask = daTaskMapper.selectDaTaskById(daBirthDj.getTaskId()); + List failIds = Stream.of(daTask.getFailIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + List successIds = Stream.of(daTask.getSuccessIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + //失败减少、成功增加 + if (failIds.removeAll(picIds) && successIds.addAll(picIds)) { + daTask.setSuccessNum(daTask.getSuccessNum() + picIds.size()); + daTask.setFailNum(daTask.getFailNum() - picIds.size()); + daTask.setFailIds(StringUtils.join(failIds)); + daTask.setSuccessIds(StringUtils.join(successIds)); + daTaskMapper.updateDaTask(daTask); + } + } } daBirthDj.setCreateTime(DateUtils.getNowDate()); return daBirthDjMapper.insertDaBirthDj(daBirthDj); diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java index 3808f30..cc081db 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java @@ -3,71 +3,89 @@ package com.da.dangan.service.impl; import com.da.common.utils.DateUtils; import com.da.dangan.domain.DaCzrkdj; import com.da.dangan.domain.DaPicturesRecard; +import com.da.dangan.domain.DaTask; import com.da.dangan.mapper.DaCzrkdjMapper; import com.da.dangan.mapper.DaPicturesRecardMapper; +import com.da.dangan.mapper.DaTaskMapper; import com.da.dangan.service.IDaCzrkdjService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 常住人口登记Service业务层处理 - * + * * @author hs * @date 2024-05-08 */ @Service -public class DaCzrkdjServiceImpl implements IDaCzrkdjService -{ +public class DaCzrkdjServiceImpl implements IDaCzrkdjService { @Resource private DaCzrkdjMapper daCzrkdjMapper; @Resource private DaPicturesRecardMapper daPicturesRecardMapper; + @Resource + private DaTaskMapper daTaskMapper; + /** * 查询常住人口登记 - * + * * @param id 常住人口登记主键 * @return 常住人口登记 */ @Override - public DaCzrkdj selectDaCzrkdjById(Long id) - { + public DaCzrkdj selectDaCzrkdjById(Long id) { return daCzrkdjMapper.selectDaCzrkdjById(id); } /** * 查询常住人口登记列表 - * + * * @param daCzrkdj 常住人口登记 * @return 常住人口登记 */ @Override - public List selectDaCzrkdjList(DaCzrkdj daCzrkdj) - { + public List selectDaCzrkdjList(DaCzrkdj daCzrkdj) { return daCzrkdjMapper.selectDaCzrkdjList(daCzrkdj); } /** * 新增常住人口登记 - * + * * @param daCzrkdj 常住人口登记 * @return 结果 */ @Override @Transactional - public int insertDaCzrkdj(DaCzrkdj daCzrkdj) - { + public int insertDaCzrkdj(DaCzrkdj daCzrkdj) { //识别图片状态改为已识别 - String[] picIds = daCzrkdj.getPicIds().split(","); - if (picIds != null && picIds.length > 0) { - for (String picid : picIds) { + List picIds = Stream.of(daCzrkdj.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + if (picIds != null && picIds.size() > 0) { + for (Long picid : picIds) { DaPicturesRecard picRecard = new DaPicturesRecard(); - picRecard.setId(Long.parseLong(picid)); + picRecard.setId(picid); picRecard.setRecognize("1"); daPicturesRecardMapper.updateDaPicturesRecard(picRecard); } + //手动识别且图片来自于任务，修改任务成功、失败图片 + if (daCzrkdj.getTaskId() != null&&daCzrkdj.getErrorCorrect().equals("2")) { + DaTask daTask = daTaskMapper.selectDaTaskById(daCzrkdj.getTaskId()); + List failIds = Stream.of(daTask.getFailIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + List successIds = Stream.of(daTask.getSuccessIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + //失败减少、成功增加 + if (failIds.removeAll(picIds) && successIds.addAll(picIds)) { + daTask.setSuccessNum(daTask.getSuccessNum() + picIds.size()); + daTask.setFailNum(daTask.getFailNum() - picIds.size()); + daTask.setFailIds(StringUtils.join(failIds)); + daTask.setSuccessIds(StringUtils.join(successIds)); + daTaskMapper.updateDaTask(daTask); + } + } } daCzrkdj.setCreateTime(DateUtils.getNowDate()); return daCzrkdjMapper.insertDaCzrkdj(daCzrkdj); @@ -75,18 +93,17 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService /** * 修改常住人口登记 - * + * * @param daCzrkdj 常住人口登记 * @return 结果 */ @Override @Transactional - public int updateDaCzrkdj(DaCzrkdj daCzrkdj) - { //修改纠错时 同步修改对应识别图片的纠错标识 - if(daCzrkdj.getErrorCorrect().equals("1")){ + public int updateDaCzrkdj(DaCzrkdj daCzrkdj) { //修改纠错时 同步修改对应识别图片的纠错标识 + if (daCzrkdj.getErrorCorrect().equals("1")) { String picIds = daCzrkdj.getPicIds(); String[] split = picIds.split(","); - for(String picId :split){ + for (String picId : split) { Long picid = Long.parseLong(picId); DaPicturesRecard picturesRecard = new DaPicturesRecard(); picturesRecard.setId(picid); @@ -100,25 +117,23 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService /** * 批量删除常住人口登记 - * + * * @param ids 需要删除的常住人口登记主键 * @return 结果 */ @Override - public int deleteDaCzrkdjByIds(Long[] ids) - { + public int deleteDaCzrkdjByIds(Long[] ids) { return daCzrkdjMapper.deleteDaCzrkdjByIds(ids); } /** * 删除常住人口登记信息 - * + * * @param id 常住人口登记主键 * @return 结果 */ @Override - public int deleteDaCzrkdjById(Long id) - { + public int deleteDaCzrkdjById(Long id) { return daCzrkdjMapper.deleteDaCzrkdjById(id); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java index 803c364..f026b69 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java @@ -3,14 +3,19 @@ package com.da.dangan.service.impl; import com.da.common.utils.DateUtils; import com.da.dangan.domain.DaPicturesRecard; import com.da.dangan.domain.DaQyz; +import com.da.dangan.domain.DaTask; import com.da.dangan.mapper.DaPicturesRecardMapper; import com.da.dangan.mapper.DaQyzMapper; +import com.da.dangan.mapper.DaTaskMapper; import com.da.dangan.service.IDaQyzService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 迁移证Service业务层处理 @@ -25,6 +30,8 @@ public class DaQyzServiceImpl implements IDaQyzService private DaQyzMapper daQyzMapper; @Resource private DaPicturesRecardMapper daPicturesRecardMapper; + @Resource + private DaTaskMapper daTaskMapper; /** * 查询迁移证 * @@ -60,15 +67,30 @@ public class DaQyzServiceImpl implements IDaQyzService public int insertDaQyz(DaQyz daQyz) { //识别图片状态改为已识别 - String[] picIds = daQyz.getPicIds().split(","); - if (picIds != null && picIds.length > 0) { - for (String picid : picIds) { + List picIds = Stream.of(daQyz.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + if (picIds != null && picIds.size() > 0) { + for (Long picid : picIds) { DaPicturesRecard picRecard = new DaPicturesRecard(); - picRecard.setId(Long.parseLong(picid)); + picRecard.setId(picid); picRecard.setRecognize("1"); daPicturesRecardMapper.updateDaPicturesRecard(picRecard); } + //手动识别且图片来自于任务，修改任务成功、失败图片 + if (daQyz.getTaskId() != null&&daQyz.getErrorCorrect().equals("2")) { + DaTask daTask = daTaskMapper.selectDaTaskById(daQyz.getTaskId()); + List failIds = Stream.of(daTask.getFailIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + List successIds = Stream.of(daTask.getSuccessIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + //失败减少、成功增加 + if (failIds.removeAll(picIds) && successIds.addAll(picIds)) { + daTask.setSuccessNum(daTask.getSuccessNum() + picIds.size()); + daTask.setFailNum(daTask.getFailNum() - picIds.size()); + daTask.setFailIds(StringUtils.join(failIds)); + daTask.setSuccessIds(StringUtils.join(successIds)); + daTaskMapper.updateDaTask(daTask); + } + } } + daQyz.setCreateTime(DateUtils.getNowDate()); return daQyzMapper.insertDaQyz(daQyz); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java index 513139c..01f0b2f 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java @@ -2,15 +2,20 @@ package com.da.dangan.service.impl; import com.da.common.utils.DateUtils; import com.da.dangan.domain.DaPicturesRecard; +import com.da.dangan.domain.DaTask; import com.da.dangan.domain.DaYtzm; import com.da.dangan.mapper.DaPicturesRecardMapper; +import com.da.dangan.mapper.DaTaskMapper; import com.da.dangan.mapper.DaYtzmMapper; import com.da.dangan.service.IDaYtzmService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 一胎证明Service业务层处理 @@ -25,6 +30,8 @@ public class DaYtzmServiceImpl implements IDaYtzmService private DaYtzmMapper daYtzmMapper; @Resource private DaPicturesRecardMapper daPicturesRecardMapper; + @Resource + private DaTaskMapper daTaskMapper; /** * 查询一胎证明 * @@ -60,14 +67,28 @@ public class DaYtzmServiceImpl implements IDaYtzmService public int insertDaYtzm(DaYtzm daYtzm) { //识别图片状态改为已识别 - String[] picIds = daYtzm.getPicIds().split(","); - if (picIds != null && picIds.length > 0) { - for (String picid : picIds) { + List picIds = Stream.of(daYtzm.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + if (picIds != null && picIds.size() > 0) { + for (Long picid : picIds) { DaPicturesRecard picRecard = new DaPicturesRecard(); - picRecard.setId(Long.parseLong(picid)); + picRecard.setId(picid); picRecard.setRecognize("1"); daPicturesRecardMapper.updateDaPicturesRecard(picRecard); } + //手动识别且图片来自于任务，修改任务成功、失败图片 + if (daYtzm.getTaskId() != null&&daYtzm.getErrorCorrect().equals("2")) { + DaTask daTask = daTaskMapper.selectDaTaskById(daYtzm.getTaskId()); + List failIds = Stream.of(daTask.getFailIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + List successIds = Stream.of(daTask.getSuccessIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + //失败减少、成功增加 + if (failIds.removeAll(picIds) && successIds.addAll(picIds)) { + daTask.setSuccessNum(daTask.getSuccessNum() + picIds.size()); + daTask.setFailNum(daTask.getFailNum() - picIds.size()); + daTask.setFailIds(StringUtils.join(failIds)); + daTask.setSuccessIds(StringUtils.join(successIds)); + daTaskMapper.updateDaTask(daTask); + } + } } daYtzm.setCreateTime(DateUtils.getNowDate()); return daYtzmMapper.insertDaYtzm(daYtzm); diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java index d77741d..4afda7a 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java @@ -2,15 +2,20 @@ package com.da.dangan.service.impl; import com.da.common.utils.DateUtils; import com.da.dangan.domain.DaPicturesRecard; +import com.da.dangan.domain.DaTask; import com.da.dangan.domain.DaZfnyhkcg; import com.da.dangan.mapper.DaPicturesRecardMapper; +import com.da.dangan.mapper.DaTaskMapper; import com.da.dangan.mapper.DaZfnyhkcgMapper; import com.da.dangan.service.IDaZfnyhkcgService; -import org.springframework.beans.factory.annotation.Autowired; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 转非农业人口批复存根Service业务层处理 @@ -21,10 +26,12 @@ import java.util.List; @Service public class DaZfnyhkcgServiceImpl implements IDaZfnyhkcgService { - @Autowired + @Resource private DaZfnyhkcgMapper daZfnyhkcgMapper; - @Autowired + @Resource private DaPicturesRecardMapper daPicturesRecardMapper; + @Resource + private DaTaskMapper daTaskMapper; /** * 查询转非农业人口批复存根 * @@ -60,14 +67,28 @@ public class DaZfnyhkcgServiceImpl implements IDaZfnyhkcgService public int insertDaZfnyhkcg(DaZfnyhkcg daZfnyhkcg) { //识别图片状态改为已识别 - String[] picIds = daZfnyhkcg.getPicIds().split(","); - if (picIds != null && picIds.length > 0) { - for (String picid : picIds) { + List picIds = Stream.of(daZfnyhkcg.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + if (picIds != null && picIds.size() > 0) { + for (Long picid : picIds) { DaPicturesRecard picRecard = new DaPicturesRecard(); - picRecard.setId(Long.parseLong(picid)); + picRecard.setId(picid); picRecard.setRecognize("1"); daPicturesRecardMapper.updateDaPicturesRecard(picRecard); } + //手动识别且图片来自于任务，修改任务成功、失败图片 + if (daZfnyhkcg.getTaskId() != null&&daZfnyhkcg.getErrorCorrect().equals("2")) { + DaTask daTask = daTaskMapper.selectDaTaskById(daZfnyhkcg.getTaskId()); + List failIds = Stream.of(daTask.getFailIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + List successIds = Stream.of(daTask.getSuccessIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + //失败减少、成功增加 + if (failIds.removeAll(picIds) && successIds.addAll(picIds)) { + daTask.setSuccessNum(daTask.getSuccessNum() + picIds.size()); + daTask.setFailNum(daTask.getFailNum() - picIds.size()); + daTask.setFailIds(StringUtils.join(failIds)); + daTask.setSuccessIds(StringUtils.join(successIds)); + daTaskMapper.updateDaTask(daTask); + } + } } daZfnyhkcg.setCreateTime(DateUtils.getNowDate()); return daZfnyhkcgMapper.insertDaZfnyhkcg(daZfnyhkcg); diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java index b1d9a12..93191d8 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java @@ -2,15 +2,20 @@ package com.da.dangan.service.impl; import com.da.common.utils.DateUtils; import com.da.dangan.domain.DaPicturesRecard; +import com.da.dangan.domain.DaTask; import com.da.dangan.domain.DaZqz; import com.da.dangan.mapper.DaPicturesRecardMapper; +import com.da.dangan.mapper.DaTaskMapper; import com.da.dangan.mapper.DaZqzMapper; import com.da.dangan.service.IDaZqzService; -import org.springframework.beans.factory.annotation.Autowired; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 准迁证Service业务层处理 @@ -21,10 +26,12 @@ import java.util.List; @Service public class DaZqzServiceImpl implements IDaZqzService { - @Autowired + @Resource private DaZqzMapper daZqzMapper; - @Autowired + @Resource private DaPicturesRecardMapper daPicturesRecardMapper; + @Resource + private DaTaskMapper daTaskMapper; /** * 查询准迁证 * @@ -60,14 +67,28 @@ public class DaZqzServiceImpl implements IDaZqzService public int insertDaZqz(DaZqz daZqz) { //识别图片状态改为已识别 - String[] picIds = daZqz.getPicIds().split(","); - if (picIds != null && picIds.length > 0) { - for (String picid : picIds) { + List picIds = Stream.of(daZqz.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + if (picIds != null && picIds.size() > 0) { + for (Long picid : picIds) { DaPicturesRecard picRecard = new DaPicturesRecard(); - picRecard.setId(Long.parseLong(picid)); + picRecard.setId(picid); picRecard.setRecognize("1"); daPicturesRecardMapper.updateDaPicturesRecard(picRecard); } + //手动识别且图片来自于任务，修改任务成功、失败图片 + if (daZqz.getTaskId() != null&&daZqz.getErrorCorrect().equals("2")) { + DaTask daTask = daTaskMapper.selectDaTaskById(daZqz.getTaskId()); + List failIds = Stream.of(daTask.getFailIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + List successIds = Stream.of(daTask.getSuccessIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + //失败减少、成功增加 + if (failIds.removeAll(picIds) && successIds.addAll(picIds)) { + daTask.setSuccessNum(daTask.getSuccessNum() + picIds.size()); + daTask.setFailNum(daTask.getFailNum() - picIds.size()); + daTask.setFailIds(StringUtils.join(failIds)); + daTask.setSuccessIds(StringUtils.join(successIds)); + daTaskMapper.updateDaTask(daTask); + } + } } daZqz.setCreateTime(DateUtils.getNowDate()); return daZqzMapper.insertDaZqz(daZqz); diff --git a/dangan-dangan/src/main/java/com/da/dangan/timetask/TimeTask.java b/dangan-dangan/src/main/java/com/da/dangan/timetask/TimeTask.java index a50ab82..a931a94 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/timetask/TimeTask.java +++ b/dangan-dangan/src/main/java/com/da/dangan/timetask/TimeTask.java @@ -422,7 +422,8 @@ public class TimeTask { files.add(file); } Long start = System.currentTimeMillis(); - result = CallThirdInterface.callThirdInterfaceUpload(url1, files, daTask.getYwType(), ids, daTask.getId()); + //调用第三方上传接口，模板类型使用识别模板字段 + result = CallThirdInterface.callThirdInterfaceUpload(url1, files, daTask.getSbType(), ids, daTask.getId()); Long end = System.currentTimeMillis(); //! 解析JSON字符串,获取键对应的值 JSONObject jsonobject = null; diff --git a/dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java b/dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java index 70f9aa9..d2387f9 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java +++ b/dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java @@ -120,7 +120,7 @@ public class CallThirdInterface { // 1. 创建HttpRequest对象 - 指定好 url 地址 HttpRequest httpRequest = new HttpRequest(url1); // 2. 设置请求方式，默认是GET请求 - httpRequest.timeout(300000).setMethod(Method.POST); //设置3min超时 + httpRequest.timeout(2000000).setMethod(Method.POST); //设置3min超时 // 3. 设置请求参数 可通过 form表单方法 设置 可以是文件类型 // form方法有很多重载方法,可以一个一个参数设置，也可以将参数封装进一个map集合然后一块儿 // File file = new File("C:\\Users\\hssym\\Downloads\\UBQ.png"); diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml index 1405f47..170e893 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml @@ -55,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and uc.user_id = #{userId} and task_id = #{taskId} + + and m_name !='无' and yw_type = #{ywType} and b.mu_id = #{muId} and mu_path = #{muPath} @@ -65,14 +67,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" or f_name like concat('%', #{name}, '%') ) - and birthday like concat('%', #{birthday}, '%') + + and birthday like concat('%', #{birthday}, '%') + + + and (m_card_id like concat('%', #{mCardId}, '%') + or f_card_id like concat('%', #{mCardId}, '%') + ) + and sex = #{sex} and born_address like concat('%', #{bornAddress}, '%') and m_name like concat('%', #{mName}, '%') and m_age = #{mAge} and m_gj = #{mGj} and m_nation = #{mNation} - and m_card_id = #{mCardId} and f_name like concat('%', #{fName}, '%') and f_age = #{fAge} and f_gj = #{fGj} @@ -95,12 +103,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by id desc - + - + insert into da_birth_dj @@ -235,7 +243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from da_birth_dj where id in + delete from da_birth_dj where id in #{id} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml index 986358e..60f8768 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml @@ -76,6 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and uc.user_id = #{userId} and task_id = #{taskId} + + and name !='无' and yw_type = #{ywType} and c.mu_id = #{muId} and mu_path = #{muPath} @@ -89,6 +91,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" or jhr2 like concat('%', #{name}, '%') ) + + and birthday like concat('%', #{birthday}, '%') + + + and card_id like concat('%', #{cardId}, '%') + and other_name like concat('%', #{otherName}, '%') and used_name like concat('%', #{usedName}, '%') and sex = #{sex} @@ -97,8 +105,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and jhr2 = #{jhr2} and jhgx2 = #{jhgx2} and gmcszqfrq = #{gmcszqfrq} - - and birthday like concat('%', #{birthday}, '%') and address = #{address} and yj = #{yj} and nation like concat('%', #{nation}, '%') @@ -128,7 +134,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sljmsfzqm = #{sljmsfzqm} and qfyj = #{qfyj} and yxrq = #{yxrq} - and card_id concat('%', #{cardId}, '%') and pic_ids = #{picIds} and pictures = #{pictures} and all_pic_ids = #{allPicIds} @@ -148,6 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and uc.user_id = #{userId} and task_id = #{taskId} + + and name !='无' and yw_type = #{ywType} and c.mu_id = #{muId} and mu_path = #{muPath} @@ -161,6 +168,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" or jhr2 like concat('%', #{name}, '%') ) + + and birthday like concat('%', #{birthday}, '%') + + + and card_id like concat('%', #{cardId}, '%') + and other_name like concat('%', #{otherName}, '%') and used_name like concat('%', #{usedName}, '%') and sex = #{sex} @@ -169,8 +182,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and jhr2 like concat('%', #{jhr2}, '%') and jhgx2 = #{jhgx2} and gmcszqfrq = #{gmcszqfrq} - - and birthday like concat('%', #{birthday}, '%') and address = #{address} and yj = #{yj} and nation like concat('%', #{nation}, '%') @@ -200,7 +211,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sljmsfzqm = #{sljmsfzqm} and qfyj = #{qfyj} and yxrq = #{yxrq} - and card_id concat('%', #{cardId}, '%') and pic_ids = #{picIds} and pictures = #{pictures} and all_pic_ids = #{allPicIds} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml index 3b93aad..7afeaf2 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml @@ -56,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and uc.user_id = #{userId} and task_id = #{taskId} + + and name1 !='无' and yw_type = #{ywType} and q.mu_id = #{muId} and mu_path = #{muPath} @@ -70,12 +72,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sex1 = #{sex1} - /*and (card_id1 like concat('%', #{cardId1}, '%') + and (card_id1 like concat('%', #{cardId1}, '%') or cardId2 like concat('%', #{cardId1}, '%') or cardId3 like concat('%', #{cardId1}, '%') or cardId4 like concat('%', #{cardId1}, '%') - )*/ - and card_id1 like concat('%', #{cardId1}, '%') + ) and name2 = #{name2} and sex2 = #{sex2} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml index b6a2ce8..c658c55 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml @@ -8,6 +8,7 @@ + @@ -17,7 +18,7 @@ - + @@ -30,7 +31,7 @@ - select id, mu_id, yw_type, mu_path, num, pic_ids, last_num, status, success_num, success_ids, fail_num, fail_ids, result_str, remark, up_duration, sb_start, sb_end, process_duration, create_by, create_time, update_by, update_time from da_task + select id, mu_id, yw_type, sb_type, mu_path, num, pic_ids, last_num, status, success_num, success_ids, fail_num, fail_ids, result_str, remark, up_duration, sb_start, sb_end, process_duration, create_by, create_time, update_by, update_time from da_task