whyclxw
2025-05-29 d58bf74993ed4b4f8f494da78da34f90164f6363
实时页面
2个文件已修改
24 ■■■■■ 已修改文件
src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/webSocket/RealTimeSocket.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
@@ -6,8 +6,10 @@
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
@@ -24,6 +26,8 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@AllArgsConstructor
@NoArgsConstructor
@TableName(schema = "db_batt_testdata",value ="tb_batttestdata_inf")
@ApiModel(value="BatttestdataInf对象", description="电池组历史测试数据总表")
public class BatttestdataInf implements Serializable {
src/main/java/com/whyc/webSocket/RealTimeSocket.java
@@ -343,7 +343,7 @@
                }
                avgData=avgData/rtdataList.size();
            }
            map.put("rtdataList",rtdataList);
            map.put("rtdataList",rtdataList!=null?rtdataList:"");
            map.put("maxData",maxData);
            map.put("minData",minData);
            map.put("avgData",avgData);
@@ -379,13 +379,13 @@
                }
                avgData=avgData/rtdataList.size();
            }
            map.put("rtdataList",rtdataList);
            map.put("rtdataList",rtdataList!=null?rtdataList:"");
            map.put("maxData",maxData);
            map.put("minData",minData);
            map.put("avgData",avgData);
            //上一次内阻测试数据
            BattresdataInf rinfData= battresdataInfService.getLastTestData(realDto.getBattgroupId());
            map.put("rinfData",rinfData);
            map.put("rinfData",rinfData!=null?rinfData:"");
            map.put("pageType",realDto.getPageType());
            return new Response().setII(1,true,map,"内阻界面信息推送");
        }catch (Exception e){
@@ -418,7 +418,7 @@
                }
                avgData=avgData/rtdataList.size();
            }
            map.put("rtdataList",rtdataList);
            map.put("rtdataList",rtdataList!=null?rtdataList:"");
            map.put("maxData",maxData);
            map.put("minData",minData);
            map.put("avgData",avgData);
@@ -434,7 +434,7 @@
        try {
            //实时获取电源信息
            PwrdevAcdcdata pwrdevAcdcdata = pwrdevAcdcdataService.getPwrRealInfo(realDto.getPowerId());
            map.put("pwrdevAcdcdata",pwrdevAcdcdata);
            map.put("pwrdevAcdcdata",pwrdevAcdcdata!=null?pwrdevAcdcdata:"");
            map.put("pageType",realDto.getPageType());
            return new Response().setII(1,true,map,"电源界面信息推送");
        }catch (Exception e){
@@ -444,20 +444,20 @@
    //获取系统概述界面信息
    private Response getSystemPage(RealTimeDto realDto) {
        Map<String, Object> map=new HashMap<>();
        map.put("pageType",realDto.getPageType());
        try {
            //实时获取电池组信息
            BattRtstate battRtstate = battRtstateService.getBattRealInfo(realDto.getBattgroupId());
            map.put("battRtstate",battRtstate);
            map.put("battRtstate",battRtstate!=null?battRtstate:"");
            //实时获取设备信息
            DeviceState deviceState = deviceStateService.getDevRealInfo(realDto.getDevId());
            map.put("deviceState",deviceState);
            map.put("deviceState",deviceState!=null?deviceState:"");
            //获取上一次标准核容信息
            BatttestdataInf tinfData= batttestdataInfService.getLastStandardTestData(realDto.getBattgroupId());
            map.put("tinfData",tinfData);
            map.put("tinfData",tinfData!=null?tinfData:"");
            //获取近半小时电源数据,整流器数据,核容设备数据(推送实时,接口查询最近半小时数据)
            PwrdevAcdcdata pwrdevAcdcdata = pwrdevAcdcdataService.getPwrRealInfo(realDto.getPowerId());
            map.put("pwrdevAcdcdata",pwrdevAcdcdata);
            map.put("pageType",realDto.getPageType());
            map.put("pwrdevAcdcdata",pwrdevAcdcdata!=null?pwrdevAcdcdata:"");
            return new Response().setII(1,true,map,"系统概述推送");
        }catch (Exception e) {
            e.printStackTrace();