修改

whyclxw

2024-07-01 0ce771b4a4ff5897dc91bb1b84a4561781b00ca5

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

@@ -51,13 +51,14 @@
        //Integer battIndex = dataSetList.get(0).getBattIndex();
        //1.刷新rsAlarmSet，rtdataSet,rtState告警实时数据<指定默认刷第一组数据>
        updateDataFromDataAndStateAndRsAlarmToSetHrStop();

        //命令设置进去
        almSet.getRsAlmSet().setOpCmd(CMD_Constant.CMD_SetHRSTopAlm);
        //修改rsAlarmSet
        rsalarmSetMapper.update(almSet.getRsAlmSet(),null);

        //读取opCmd返回是否成功
        QueryWrapper<CkpowerdevBattRsalarmSet> query = Wrappers.query();
        Response opStatus = OpCmdUtil.getOpStatus(rsalarmSetMapper,query, CMD_Constant.CMD_SetBattAlarm,20,null);
        Response opStatus = OpCmdUtil.getOpStatus(rsalarmSetMapper,query, CMD_Constant.CMD_SetHRSTopAlm,20,null);
        if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //成功
            //记录日志
            Date now = new Date();
@@ -66,7 +67,7 @@
            String opNum=setLogMapper.getOpNum()!=null?setLogMapper.getOpNum():"0";
            logList.forEach(log->{
                log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
                log.setCmdType(CMD_Constant.CMD_SetBattAlarm);
                log.setCmdType(CMD_Constant.CMD_SetHRSTopAlm);
                log.setCreateTime(now);
                log.setCreateDay(now);
            });