审批页面修改

lxw

2023-08-15 160e150009b51a39fa95d9462c3798ba28d51a09

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

@@ -75,6 +75,10 @@

    private static Fbs9140TopologyStateService fbs9140TopologyStateService;

    private static Fbs5100InverterInfoService fbs5100InverterInfoService;

    private static Fbs9100SetParamTempService fbs9100SetParamTempService;

    private Session session;

    private HttpSession httpSession;
@@ -182,6 +186,16 @@
        RealTimeWebsocket.fbs9140TopologyStateService = fbs9140TopologyStateService;
    }

    @Autowired
    public void setFbs5100InverterInfoService(Fbs5100InverterInfoService fbs5100InverterInfoService) {
        RealTimeWebsocket.fbs5100InverterInfoService = fbs5100InverterInfoService;
    }

    @Autowired
    public void setFbs9100SetParamTempService(Fbs9100SetParamTempService fbs9100SetParamTempService) {
        RealTimeWebsocket.fbs9100SetParamTempService = fbs9100SetParamTempService;
    }

    @OnOpen
    public void onOpen(Session session, EndpointConfig config) {
        this.session = session;
@@ -246,6 +260,9 @@
                                break;
                            case "paralle9149":
                                res = getParalle9149(realTimePar, lang);
                                break;
                            case "inverter5100":
                                res = getInverter5100(realTimePar);
                                break;
                        }
                        //实时显示调整,增加电池数量,标称单体电压,铅酸还是锂电，放置于返回结果的data2
@@ -445,6 +462,18 @@
        return new Response().set(1, res);
    }

    //配网5100
    public Response getInverter5100(RealTimePar realTimePar) {
        Map<String, Response> res = new HashMap<>();
        //查询fbs9100信息
        Response f9100stateRes = f9100service.serchContactorState(realTimePar.getDevId());
        res.put("f9100state", f9100stateRes);
        //查询tb_fbs5100_inverter_info信息
        Response f5100stateRes = fbs5100InverterInfoService.serchByDevId(realTimePar.getDevId());
        res.put("f5100stateRes", f5100stateRes);
        return new Response().set(1, res);
    }

    //标准的实时页面信息
    public Response getStandard(RealTimePar realTimePar, String lang) {
        Map<String, Response> res = new HashMap<>();
@@ -494,6 +523,17 @@
        //最后一次核容放电数据
        Response tinfRes = batttestDataInfService.searchBattLastHrDataById(realTimePar.getBattGroupId(), realTimePar.getDevId(), lang);
        res.put("tinfdata", tinfRes);

        if (realTimePar.getDevType() == DeviceTypeDTO.DEVICE6185) {//61850二次放电处理
            //本年度上一次正常核容的放电记录编号
            Response testNumber = batttestDataInfService.searchHrYear(realTimePar.getBattGroupId());
            res.put("testNumber", testNumber);

            //该设备放电申请
            Response Fbs9100SetParamTemp = fbs9100SetParamTempService.searchTemp(realTimePar.getBattGroupId());
            res.put("Fbs9100SetParamTemp", Fbs9100SetParamTemp);
        }

        return new Response().set(1, res);
    }
    //A059的实时页面信息