From e3f0f5edfd1f825dc95277475257a6ef5c507d4a Mon Sep 17 00:00:00 2001 From: lijingtao <18301674552@163.COM> Date: Thu, 14 Mar 2024 21:19:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B6=88=E6=81=AF=E6=9C=AA=E8=AF=BB=E4=B8=BA2?= =?UTF-8?q?=E4=B8=AA=E6=8E=A5=E5=8F=A3=20=E5=85=A8=E8=AF=BB=E5=92=8C?= =?UTF-8?q?=E5=8D=95=E8=AF=BB=20=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrMsgReadController.java | 75 +++++++++++++++---- 1 file changed, 62 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 4db7fa5c..6aef3ef1 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 @@ -1,6 +1,9 @@ package cn.jyjz.xiaoyao.ocr.controller; +import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; import cn.jyjz.xiaoyao.common.base.util.StringUtils; +import cn.jyjz.xiaoyao.common.base.vo.UserToken; import cn.jyjz.xiaoyao.oa.from.dataobject.Candidateuser; import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg; import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsgRead; @@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestParam; import javax.servlet.http.HttpServletRequest; import cn.jyjz.xiaoyao.ocr.service.IOcrMsgReadService; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -42,6 +46,9 @@ public class OcrMsgReadController { @Autowired private IOcrMsgService iocrmsgservice; + @Autowired + private UserTokenService userTokenService; + /** * 分页查询 @@ -52,13 +59,16 @@ public class OcrMsgReadController { */ @ApiOperation(value = "系统消息分页", notes = "系统消息分页") @RequestMapping(value = "/systempage", method = RequestMethod.GET) - public ResponseEntity systempage(@RequestBody Map map) { + public ResponseEntity systempage(HttpServletRequest request,@RequestBody Map map) { - IPage iPage = new Page<>(Integer.valueOf(map.get("start")),Integer.valueOf(map.get("limit"))); + IPage iPage = new Page<>(Integer.valueOf(map.get("pageNo")),Integer.valueOf(map.get("pageSize"))); + + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("id","titile","sender","bus_json","send_time").eq("msg_category",map.get("msgCategory")).eq("send_status","1").eq("send_status","2").apply(map.get("receiveUser"),"receive_user_ids"); + wrapper.select("id","titile","sender","bus_json","send_time").eq("msg_category",map.get("msgCategory")).eq("send_status","1").apply("FIND_IN_SET('"+userToken.getUsername()+"',receive_user_ids) UNION ALL select id,titile,bus_json,send_time from ocr_msg where receive_user_type='2' "); +// .select("id","titile","sender","bus_json","send_time").eq("send_status","2"); // if(!StringUtils.isEmpty(map.get("productsId"))) { // } //执行查询方法 @@ -95,20 +105,59 @@ public class OcrMsgReadController { /** * 添加 - * @param listMsgRead - * @param listMsgRead * @return */ - @ApiOperation(value = "消除未读", notes = "消除未读") - @RequestMapping(value = "eliminateUnread", method = RequestMethod.POST) - public ResponseEntity eliminateUnread(@RequestBody List listMsgRead) { - List listCa = new ArrayList<>(); - for(OcrMsgRead list:listMsgRead){ - list.setReadTime(System.currentTimeMillis()); - listCa.add(list); + @ApiOperation(value = "消除未读所有", notes = "消除未读所有") + @RequestMapping(value = "eliminateUnreadfull", method = RequestMethod.POST) + public ResponseEntity eliminateUnreadfull(HttpServletRequest request,@RequestParam(value = "msgCategory", required = false)String msgCategory) { + + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + + QueryWrapper wrapperlist = new QueryWrapper<>(); + wrapperlist.select("id").eq("msg_category",msgCategory).eq("send_status","1").apply("FIND_IN_SET('"+userToken.getUsername()+"',receive_user_ids)"); + + QueryWrapper wrapperone = new QueryWrapper<>(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSSS"); + + List list = iocrmsgservice.list(wrapperlist); + for (OcrMsg msg:list){ + wrapperone.eq("msg_id", msg.getId()).eq("user_id",userToken.getUsername()); + OcrMsgRead one = ocrMsgReadService.getOne(wrapperone); + if(null!=one) { + OcrMsgRead ocrmsgread=new OcrMsgRead(); + ocrmsgread.setId(Long.valueOf(sdf.format(System.currentTimeMillis()))); + ocrmsgread.setMsgId(msg.getId()); + ocrmsgread.setUserId(Long.valueOf(userToken.getUserid())); + ocrmsgread.setReadFlag(1); + ocrmsgread.setReadTime(System.currentTimeMillis()); + ocrMsgReadService.save(ocrmsgread); + } } - boolean save = ocrMsgReadService.saveBatch(listCa); + //此处需要手工处理 返回需要将修改后的数据返回 + return new ResponseEntity(HttpStatus.OK); + } + + @ApiOperation(value = "消除未读单个", notes = "消除未读单个") + @RequestMapping(value = "eliminateUnreadone", method = RequestMethod.POST) + public ResponseEntity eliminateUnreadone(HttpServletRequest request,@RequestParam(value = "msgid", required = false)String msgid) { + + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + + + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSSS"); + + + OcrMsgRead ocrmsgread=new OcrMsgRead(); + ocrmsgread.setId(Long.valueOf(sdf.format(System.currentTimeMillis()))); + ocrmsgread.setMsgId(Long.valueOf(msgid)); + ocrmsgread.setUserId(Long.valueOf(userToken.getUserid())); + ocrmsgread.setReadFlag(1); + ocrmsgread.setReadTime(System.currentTimeMillis()); + + boolean save = ocrMsgReadService.save(ocrmsgread); //此处需要手工处理 返回需要将修改后的数据返回 return new ResponseEntity(save,HttpStatus.CREATED); } + }