消息接口修改消息未读为2个接口 全读和单读 分页修改统一参数

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<String, String> map) {
+    public ResponseEntity<?> systempage(HttpServletRequest request,@RequestBody Map<String, String> map) {
 
-        IPage<OcrMsg> iPage = new Page<>(Integer.valueOf(map.get("start")),Integer.valueOf(map.get("limit")));
+        IPage<OcrMsg> iPage = new Page<>(Integer.valueOf(map.get("pageNo")),Integer.valueOf(map.get("pageSize")));
+
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
 
 
         QueryWrapper<OcrMsg> 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<OcrMsgRead> listMsgRead) {
-        List<OcrMsgRead> 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<OcrMsg> wrapperlist = new QueryWrapper<>();
+        wrapperlist.select("id").eq("msg_category",msgCategory).eq("send_status","1").apply("FIND_IN_SET('"+userToken.getUsername()+"',receive_user_ids)");
+
+        QueryWrapper<OcrMsgRead> wrapperone = new QueryWrapper<>();
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSSS");
+
+        List<OcrMsg> 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<Object>(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<Object>(save,HttpStatus.CREATED);
     }
+
 }