changes

liuhaonan

2022-08-15 1bf1b023ea45114a1d5ac7b85e18ab5aa40d5cf5

changes

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java

@@ -265,9 +265,6 @@
        }





        List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
        List<LightTaskPoleRelation> newPoleSuccess = new ArrayList<>();
        List<LightTaskPoleRelation> newPoleFail = new ArrayList<>();
@@ -407,8 +404,10 @@
     */
    public A5LightTimerRespInnerFrame sendTimeRRpc(String framePayload, String deviceCode, String lightAddress) {
        IRequestFrame requestFrame = FrameBuilder.builderA5().innerFrame(new A5LightTimerReqInnerFrame(framePayload, lightAddress)).orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode()).build();
        WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceCode, requestFrame, A5LightTimerRespInnerFrame.class);
        System.out.println(requestFrame + "          --------requestFrame");

        WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceCode, requestFrame, A5LightTimerRespInnerFrame.class);
        System.out.println(responseCommonFrame + "         -----------responseCommonFrame");
        StoreOperationRecordsUtils.storeInnerFrameData(deviceCode, "单灯帧-控灯", requestFrame, responseCommonFrame);

        return Optional.ofNullable(responseCommonFrame).map(WrapResponseCommonFrame::getResponseInnerFrame).orElse(null);
@@ -637,7 +636,7 @@


            // rrpc 发生定时命令
            if ("FFFF".equals(lightAddress)) {
     /*       if ("FFFF".equals(lightAddress)) {
                LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
                lightTaskPoleRelation01.setPoleId(pole.getId());
                lightTaskPoleRelation01.setLightAddress("0001");
@@ -682,7 +681,8 @@

                lightTaskPoleRelationList.add(lightTaskPoleRelation01);
                lightTaskPoleRelationList.add(lightTaskPoleRelation02);
            } else {
            } else */
            {
                lightTaskPoleRelation.setLightAddress(lightAddress);
                // rrpc 发生定时命令
                try {
@@ -705,6 +705,7 @@
        map.put("success", success);
        map.put("fail", fail);
        map.put("all", lightTaskPoleRelationList);
        log.error("发送控制器帧结果：{}", map);
        return map;
    }