From f1f6de6427ce4fa287d7dc4633640238e4a4e869 Mon Sep 17 00:00:00 2001 From: lijingtao <18301674552@163.COM> Date: Fri, 22 Mar 2024 22:34:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E7=96=91=E6=96=87=E4=BB=B6=E6=8E=92?= =?UTF-8?q?=E6=9F=A5=E4=BF=AE=E6=94=B9=20=E9=83=BD=E7=94=A8=E5=9B=BE?= =?UTF-8?q?=E7=89=87id=20=E5=B9=B6=E4=B8=94=E9=99=90=E5=88=B6=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0=E8=BF=87=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0=20=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A2=84=E9=98=B2=E7=A9=BA=E5=80=BC=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OcrTaskchildDubiousFileController.java | 50 +++++++++++++------ 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java index 469738ac..28a63487 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java @@ -68,13 +68,9 @@ public class OcrTaskchildDubiousFileController { QueryWrapper dubiouswrapper = new QueryWrapper<>(); dubiouswrapper.eq("userid",userToken.getUserid()); List list = ocrTaskchildDubiousFileService.list(dubiouswrapper); - - - -// for (OcrTaskchildDubiousFile ocrtaskchilddubiousfile:list){ -// ocrtaskchilddubiousfile.getPictureId() -// } - + if(list.size()==0){ + return ResultVoUtil.success(); + } IPage iPage = new Page<>(Integer.valueOf(pageNo),Integer.valueOf(pageSize)); QueryWrapper wrapper = new QueryWrapper<>(); @@ -139,7 +135,7 @@ public class OcrTaskchildDubiousFileController { * @return */ @RequestMapping(value = "/dubiousfileyd", method = RequestMethod.GET) - public ResultVo dubiousfileyd(HttpServletRequest request, @RequestParam(value = "taskchildid", required = true) String taskchildid) { + public ResultVo dubiousfileyd(HttpServletRequest request, @RequestParam(value = "pictureid", required = true) String pictureid) { String tenantId = request.getHeader("X-Tenant-Id"); if(StringUtils.isBlank(tenantId)){ @@ -150,35 +146,57 @@ public class OcrTaskchildDubiousFileController { UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); List list=new ArrayList<>(); - String[] taskchildid1 = taskchildid.toString().split(","); + String[] taskchildid1 = pictureid.toString().split(","); for (String asd:taskchildid1){ QueryWrapper filewrapper = new QueryWrapper<>(); - filewrapper.eq("taskchild_id",asd).eq("userid",userToken.getUserid()); + filewrapper.eq("picture_id",asd).eq("userid",userToken.getUserid()); OcrTaskchildDubiousFile one1 = ocrTaskchildDubiousFileService.getOne(filewrapper); - if(!asd.equals(one1.getTaskchildId())){ + if (null==one1){ OcrTaskchildDubiousFile ocrtaskchilddubiousfile=new OcrTaskchildDubiousFile(); - ocrtaskchilddubiousfile.setTaskchildId(Long.parseLong(asd)); + ocrtaskchilddubiousfile.setPictureId(Long.parseLong(asd)); ocrtaskchilddubiousfile.setTenantid(Long.parseLong(tenantId)); ocrtaskchilddubiousfile.setUserid(Long.parseLong(userToken.getUserid())); ocrtaskchilddubiousfile.setCreatedate(System.currentTimeMillis()); + QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("ID",asd); + wrapper.eq("PICTUREID",asd); OcrTaskchildPicture one = ocrtaskchildpictureservice.getOne(wrapper); - ocrtaskchilddubiousfile.setPictureId(one.getPictureid()); + ocrtaskchilddubiousfile.setTaskchildId(one.getId()); UpdateWrapper updatewrapper = new UpdateWrapper<>(); - updatewrapper.eq("ID", one.getPictureid()).set("suspiciousfile","1"); + updatewrapper.eq("ID", asd).set("suspiciousfile","1"); ocrpictureservice.update(updatewrapper); list.add(ocrtaskchilddubiousfile); + }else { + if (!asd.equals(one1.getPictureId().toString())) { + OcrTaskchildDubiousFile ocrtaskchilddubiousfile=new OcrTaskchildDubiousFile(); + ocrtaskchilddubiousfile.setPictureId(Long.parseLong(asd)); + ocrtaskchilddubiousfile.setTenantid(Long.parseLong(tenantId)); + ocrtaskchilddubiousfile.setUserid(Long.parseLong(userToken.getUserid())); + ocrtaskchilddubiousfile.setCreatedate(System.currentTimeMillis()); + + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("PICTUREID",asd); + OcrTaskchildPicture one = ocrtaskchildpictureservice.getOne(wrapper); + ocrtaskchilddubiousfile.setTaskchildId(one.getId()); + + UpdateWrapper updatewrapper = new UpdateWrapper<>(); + updatewrapper.eq("ID", asd).set("suspiciousfile","1"); + + ocrpictureservice.update(updatewrapper); + + list.add(ocrtaskchilddubiousfile); + } } } - return ocrTaskchildDubiousFileService.saveBatch(list)?ResultVoUtil.success():ResultVoUtil.error(); + return ocrTaskchildDubiousFileService.saveBatch(list)?ResultVoUtil.success():ResultVoUtil.error("当前图片已添加过了"); } }