消息提醒适配

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderMainReq.java

@@ -21,7 +21,7 @@ public class OrderMainReq extends BaseRequest {
     private String orderType;
 
     private String processInstanceId;
-
+    private String receiveUserId;
     private String processId;
 
     private String bussinessType;

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -24,6 +24,7 @@ import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.jyzb.utils.RabbitMQSendMsg;
 import com.junmp.jyzb.utils.RedisUtils;
+import com.junmp.v2.auth.api.context.LoginContext;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
@@ -36,8 +37,14 @@ import com.junmp.v2.dict.entity.SysDict;
 import com.junmp.v2.dict.entity.SysDictItem;
 import com.junmp.v2.dict.service.SysDictItemService;
 import com.junmp.v2.dict.service.SysDictService;
+import com.junmp.v2.message.api.MessageApi;
+import com.junmp.v2.message.api.bean.req.MessageReq;
+import com.junmp.v2.message.api.bean.res.MessageRes;
+import com.junmp.v2.message.api.enums.MsgReadStateEnum;
 import com.junmp.v2.office.api.OfficeExcelApi;
 import com.junmp.v2.office.api.bean.ExcelExportParam;
+import com.junmp.v2.sys.user.entity.SysUser;
+import com.junmp.v2.sys.user.service.SysUserService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.amqp.core.Queue;
@@ -73,8 +80,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     @Resource
     private OrderNumService orderNumService;
 
-    @Resource
-    private PubOrgService pubOrgService;
+
 
     @Resource
     private OrderMainMapper orderMainMapper;
@@ -94,7 +100,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
     @Resource
     private InventoryService inventoryService;
-
+    @Resource
+    private MessageApi messageApi;
     @Resource
     private WarehouseService warehouseService;
     @Resource
@@ -1014,11 +1021,37 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
      */
     @Override
     public ProcessOrderDto GetByProcessId(OrderMainReq req) {
+        String receiveUser="";
+        if (req.getReceiveUserId()!=null)//
+        {
+            receiveUser = req.getReceiveUserId();
+        }
+        else
+        {
+            receiveUser= LoginContext.getContext().getLoginUser().getUserId().toString();
+        }
+
         ProcessOrderDto processOrderDto = new ProcessOrderDto();
         System.out.println("req = " + req.getOrderType());
         if (req.getOrderType().equals("null")|| ObjectUtil.isNull(req.getOrderType())) {
             return processOrderDto;
         }
+
+        //点击后消除已读消息
+        MessageReq reqmsg=new MessageReq();
+        reqmsg.setBizId(Long.valueOf(req.getProcessInstanceId()));
+        reqmsg.setReceiveUserId(Long.valueOf(receiveUser));
+        reqmsg.setReadFlag(0);
+        List<MessageRes> msgRes= messageApi.queryList(reqmsg);
+        if (msgRes.size()>0)
+        {
+            // 使用流将 id 取出，并用逗号拼接成字符串
+            String ids = msgRes.stream()
+                    .map(MessageRes::getMsgId)
+                    .map(String::valueOf) // 将 id 转换为字符串
+                    .collect(Collectors.joining(","));
+            messageApi.batchReadFlagByMessageIds(ids, MsgReadStateEnum.READ);
+        }
         if (req.getOrderType().equals("workOrder")){
             OrderDto orderDto = new OrderDto();
             OrderMain one = getOne(new LambdaQueryWrapper<OrderMain>()