rtstateSocket取actm修改

whyclxw

2024-09-07 1f2cf986ce2317973fec8f4cc65b94d1693d9727

rtstateSocket取actm修改

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

@@ -8,6 +8,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
public class ActmRealstateService {

@@ -17,8 +19,7 @@
    public Response getActmState(int devId) {
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",devId);
        wrapper.last("limit 1");
        ActmRealstate actmstate=mapper.selectOne(wrapper);
        return new Response().setII(1,actmstate!=null,actmstate,"均衡仪Actm实时数据");
        List<ActmRealstate> list=mapper.selectList(wrapper);
        return new Response().setII(1,list!=null,list,"均衡仪Actm实时数据");
    }
}

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

@@ -17,8 +17,8 @@
    private BattRtdataMapper mapper;


    //获取电池组数据
    public Response getRtdataState(int devId) {
    //获取a200电池组数据
    public Response getA200RtdataState(int devId) {
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",devId);
        wrapper.orderByAsc("batt_idx");
@@ -26,4 +26,15 @@
        List<BattRtdata> list=mapper.selectList(wrapper);
        return new Response().setII(1,list!=null,list,"获取电池组数据");
    }

    //获取actm电池组数据
    public Response getActmRtdataState(int devId,Integer index) {
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",devId);
        wrapper.eq("batt_idx",index);
        wrapper.orderByAsc("batt_idx");
        wrapper.orderByAsc("mon_num");
        List<BattRtdata> list=mapper.selectList(wrapper);
        return new Response().setII(1,list!=null,list,"获取电池组数据");
    }
}

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

@@ -111,10 +111,12 @@
    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实时数据");
    }
@@ -123,7 +125,7 @@
    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);