测试修改

whyclxw

2024-09-21 12c0bb25a0540d97e7c3348e31c9b25a62495390

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

@@ -6,6 +6,7 @@
import com.whyc.service.A200RealstateService;
import com.whyc.service.ActmRealstateService;
import com.whyc.service.BattRtdataService;
import com.whyc.service.WorkstateChangeeventService;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -32,6 +33,8 @@

    private static ActmRealstateService actmService;

    private static WorkstateChangeeventService eventService;


    private volatile boolean runFlag = true;

@@ -52,6 +55,11 @@
    @Autowired
    public void setActmRealstateService(ActmRealstateService actmService) {
        DevRtstateSocket.actmService = actmService;
    }

    @Autowired
    public void setWorkstateChangeeventService(WorkstateChangeeventService eventService) {
        DevRtstateSocket.eventService = eventService;
    }

    @OnOpen
@@ -103,9 +111,13 @@
    private Response getActmState(int devId) {
        Map<String, Response> map = new HashMap<>();
        Response resActmState=actmService.getActmState(devId);
        Response rtdataState=rtdataService.getRtdataState(devId);
        Response rtdataState0=rtdataService.getActmRtdataState(devId,0);
        Response rtdataState1=rtdataService.getActmRtdataState(devId,1);
        Response event=eventService.getWorkEvent(devId);
        map.put("resActmState",resActmState);
        map.put("rtdataState",rtdataState);
        map.put("rtdataState0",rtdataState0);
        map.put("rtdataState1",rtdataState1);
        map.put("event",event);
        return new Response().setII(1,true,map,"均衡仪Actm实时数据");
    }

@@ -113,9 +125,11 @@
    private Response getA200State(int devId) {
        Map<String, Response> map = new HashMap<>();
        Response resA200State=a200Service.getA200State(devId);
        Response rtdataState=rtdataService.getRtdataState(devId);
        Response rtdataState=rtdataService.getA200RtdataState(devId);
        Response event=eventService.getWorkEvent(devId);
        map.put("resA200State",resA200State);
        map.put("rtdataState",rtdataState);
        map.put("event",event);
        return new Response().setII(1,true,map,"一体机A200实时数据");
    }