审批页面修改

lxw

2023-08-15 160e150009b51a39fa95d9462c3798ba28d51a09

 src/main/java/com/whyc/webSocket/UserWorkSocket.java

@@ -1,5 +1,6 @@
package com.whyc.webSocket;

import com.whyc.dto.Response;
import com.whyc.pojo.UserWork;
import com.whyc.service.WorkAlarmService;
import com.whyc.util.ActionUtil;
@@ -51,7 +52,7 @@
                        if (session.isOpen()) {
                            //推送信息
                            synchronized (session) {
                                session.getBasicRemote().sendObject(service.getTaskListWithFlagNew(userWork.getUserId(), Integer.valueOf(userWork.getNote()), userWork.getPageNum(), userWork.getPageSize()));
                                session.getBasicRemote().sendObject(getData(userWork));
                            }
                            threadFlagMap.put(thread.getId(), false);
                        }
@@ -94,4 +95,19 @@
        }
        threadMap.remove(session.getId());
    }

    //根据admin属性判断是用管理员属性还是true普通用户false
    public Response getData(UserWork uWork) {
        Map<String, Response> res = new HashMap<>();
        Response admin = new Response();
        Response guest = new Response();
        if (uWork.isAdmin()) {
            admin = service.getTaskListWithFlagNew(uWork.getUserId(), Integer.valueOf(uWork.getNote()), uWork.getPageNum(), uWork.getPageSize());
        } else {
            guest = service.searchByUserIdAndStatus(uWork.getPageNum(), uWork.getPageSize(), uWork.getUserId(), Integer.valueOf(uWork.getNote()));
        }
        res.put("admin", admin);
        res.put("guest", guest);
        return new Response().set(1, res);
    }
}