From 3049235e8c7e23b7fb0bfbbf4c9baff9bc6be428 Mon Sep 17 00:00:00 2001 From: lijingtao <18301674552@163.COM> Date: Fri, 22 Mar 2024 20:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AE=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=92=8C?= =?UTF-8?q?=E5=8F=AF=E7=96=91=E6=96=87=E4=BB=B6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrMsgReadController.java | 18 +++++++++++ .../OcrTaskchildDubiousFileController.java | 32 +++++++++++-------- .../impl/OcrSearchHistoryServiceImpl.java | 3 ++ 3 files changed, 40 insertions(+), 13 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java index da169420..39f29720 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java @@ -19,9 +19,11 @@ import org.springframework.web.bind.annotation.RequestParam; import javax.servlet.http.HttpServletRequest; import cn.jyjz.xiaoyao.ocr.service.IOcrMsgReadService; +import java.sql.Array; import java.text.SimpleDateFormat; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * ocr控制器 @@ -97,6 +99,22 @@ public class OcrMsgReadController { return ResultVoUtil.success(selectone); } + @ApiOperation(value = "消息轮询", notes = "消息轮询") + @RequestMapping(value = "/msgPolling", method = RequestMethod.GET) + public ResultVo msgPolling(HttpServletRequest request) { + + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + + QueryWrapper wrapperread = new QueryWrapper<>(); + wrapperread.eq("user_id",userToken.getUserid()); + List list = ocrMsgReadService.list(wrapperread); + + QueryWrapper wrappermsg = new QueryWrapper<>(); + wrappermsg.notIn("id", list.stream().map(i->i.getMsgId()).collect(Collectors.toList())); + long count = iocrmsgservice.count(wrappermsg); + + return ResultVoUtil.success(count); + } /** * 添加 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 e2c7f58f..469738ac 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 @@ -152,23 +152,29 @@ public class OcrTaskchildDubiousFileController { List list=new ArrayList<>(); String[] taskchildid1 = taskchildid.toString().split(","); for (String asd:taskchildid1){ - OcrTaskchildDubiousFile ocrtaskchilddubiousfile=new OcrTaskchildDubiousFile(); - ocrtaskchilddubiousfile.setTaskchildId(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); - OcrTaskchildPicture one = ocrtaskchildpictureservice.getOne(wrapper); - ocrtaskchilddubiousfile.setPictureId(one.getPictureid()); + QueryWrapper filewrapper = new QueryWrapper<>(); + filewrapper.eq("taskchild_id",asd).eq("userid",userToken.getUserid()); + OcrTaskchildDubiousFile one1 = ocrTaskchildDubiousFileService.getOne(filewrapper); + if(!asd.equals(one1.getTaskchildId())){ + OcrTaskchildDubiousFile ocrtaskchilddubiousfile=new OcrTaskchildDubiousFile(); + ocrtaskchilddubiousfile.setTaskchildId(Long.parseLong(asd)); + ocrtaskchilddubiousfile.setTenantid(Long.parseLong(tenantId)); + ocrtaskchilddubiousfile.setUserid(Long.parseLong(userToken.getUserid())); + ocrtaskchilddubiousfile.setCreatedate(System.currentTimeMillis()); - UpdateWrapper updatewrapper = new UpdateWrapper<>(); - updatewrapper.eq("ID", one.getPictureid()).set("suspiciousfile","1"); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("ID",asd); + OcrTaskchildPicture one = ocrtaskchildpictureservice.getOne(wrapper); + ocrtaskchilddubiousfile.setPictureId(one.getPictureid()); - ocrpictureservice.update(updatewrapper); + UpdateWrapper updatewrapper = new UpdateWrapper<>(); + updatewrapper.eq("ID", one.getPictureid()).set("suspiciousfile","1"); - list.add(ocrtaskchilddubiousfile); + ocrpictureservice.update(updatewrapper); + + list.add(ocrtaskchilddubiousfile); + } } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java index da8232e5..f360a944 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java @@ -77,6 +77,9 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl selectaisp(String userid,String id) { Map selectaisp = ocrsearchhistorymapper.selectaisp(id); + if(null==selectaisp){ + return null; + } String selectaiuser = ocrsearchhistorymapper.selectaiuser(userid); String[] cps = selectaisp.get("pictureresult").toString().split(",");