审批页面修改

lxw

2023-08-15 160e150009b51a39fa95d9462c3798ba28d51a09

审批页面修改

 src/main/java/com/whyc/controller/WorkflowLinkController.java

@@ -41,8 +41,8 @@

    @GetMapping("searchTmp")
    @ApiOperation(value = "查询节点(除放电计划之外的)")
    public Response searchTmp(@RequestParam int type, @RequestParam int pageNum, @RequestParam int pageSize) {
        return service.searchTmp(type, pageNum, pageSize);
    public Response searchTmp(@RequestParam int type, @RequestParam int status, @RequestParam int pageNum, @RequestParam int pageSize) {
        return service.searchTmp(type, status, pageNum, pageSize);
    }

    @GetMapping("searchLastHrById")

 src/main/java/com/whyc/mapper/WorkflowLinkMapper.java

@@ -11,7 +11,7 @@
    List<WorkflowLink> getReceivedList(int type, UserInf user);

    //查询自己需要处理或者审批的
    List<WorkflowLink> searchTmp(int uId, int uRole, int type);
    List<WorkflowLink> searchTmp(int uId, int uRole, int type, int status);

    //查询自己申请的工单(去除放电计划)
    List<WorkflowMain> getFlowMainByUid(int userId, int type, int status);

 src/main/java/com/whyc/service/WorkflowLinkService.java

@@ -225,11 +225,11 @@
    }

    //查询节点(除放电计划之外的)
    public Response searchTmp(int type, int pageNum, int pageSize) {
    public Response searchTmp(int type, int status, int pageNum, int pageSize) {
        UserInf uinf = ActionUtil.getUser();
        //查询自己需要处理或者审批的
        PageHelper.startPage(pageNum, pageSize);
        List<WorkflowLink> list = mapper.searchTmp(uinf.getUId().intValue(), uinf.getURole(), type);
        List<WorkflowLink> list = mapper.searchTmp(uinf.getUId().intValue(), uinf.getURole(), type, status);
        PageInfo pageInfo = new PageInfo(list);
        return new Response().setII(1, list == null ? false : true, list, "查询节点(除放电计划之外的)");
    }

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

New file
@@ -0,0 +1,102 @@
package com.whyc.webSocket;

import com.whyc.config.WebSocketConfig;
import com.whyc.dto.Response;
import com.whyc.pojo.PwrdevAlarm;
import com.whyc.service.WorkflowLinkService;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.websocket.*;
import javax.websocket.server.ServerEndpoint;
import java.util.HashMap;
import java.util.Map;

@Component
@ServerEndpoint(value = "/myFlowMain", encoders = WebSocketEncoder.class, configurator = WebSocketConfig.class)
public class MyFlowMainWebSocket {
    private volatile Thread thread;

    private static final int executeTime = 5000;

    private volatile boolean runFlag = true;

    private volatile Map<String, Thread> threadMap = new HashMap<>();

    private volatile Map<Long, Boolean> threadFlagMap = new HashMap<>();

    private static WorkflowLinkService service;

    private Session session;

    @Autowired
    public void setService(WorkflowLinkService service) {
        MyFlowMainWebSocket.service = service;
    }

    @OnOpen
    public void onOpen(Session session) {
        this.session = session;
    }

    @OnMessage
    public void onMessage(Session session, String message) {
        PwrdevAlarm pwrdevAlarm = ActionUtil.getGson().fromJson(message, PwrdevAlarm.class);
        thread = new Thread("Thread_myFlowMain") {
            @Override
            public void run() {
                while (runFlag && !isInterrupted()) {
                    Thread thread = currentThread();
                    threadFlagMap.put(thread.getId(), true);
                    try {
                        if (session.isOpen()) {
                            Map<String, Response> res = new HashMap<>();
                            /*Response alarmRes = service.getAllPageOfWebSocket(pwrdevAlarm);
                            res.put("alarmRes", alarmRes);*/
                            //推送信息
                            synchronized (session) {
                                session.getBasicRemote().sendObject(new Response().set(1, res));
                            }
                            threadFlagMap.put(thread.getId(), false);
                        }
                        sleep(executeTime);
                        //} catch (IOException | InterruptedException | EncodeException e) {
                    } catch (Exception e) {
                        interrupt();
                    }
                }
            }
        };
        thread.start();
        threadFlagMap.put(thread.getId(), true);
        //停止老的socket线程
        Thread threadBefore = threadMap.get(session.getId());
        if (threadBefore != null && threadBefore.isAlive()) {
            while (threadFlagMap.get(threadBefore.getId())) {
            }
            threadBefore.interrupt();
        }
        //将线程存储,便于调用定位
        threadMap.put(session.getId(), this.thread);
    }

    @OnClose
    public void onClose(CloseReason closeReason) {
        System.err.println("closeReason = " + closeReason);
        runFlag = false;
        if (thread != null && thread.isAlive()) {
            thread.interrupt();
        }
        threadMap.remove(session.getId());
    }

    @OnError
    public void onError(Throwable error) {
        error.printStackTrace();
        if (thread != null && thread.isAlive()) {
            thread.interrupt();
        }
        threadMap.remove(session.getId());
    }
}

 src/main/resources/mapper/WorkflowLinkMapper.xml

@@ -126,6 +126,9 @@
            <if test="type==0">
                and m.type != 1
            </if>
            <if test="status!=0">
                and m.status = #{status}
            </if>
        </where>

        )
@@ -187,6 +190,9 @@
            <if test="type==0">
                and m.type != 1
            </if>
            <if test="status!=0">
                and m.status = #{status}
            </if>
        </where>
        )
        ORDER BY lid