修改命令

whyclxw

2024-01-23 428175382b8d7169d4afb0b29a3c722e89162a39

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

@@ -183,17 +183,20 @@
    public Response updateStateHrStop(CKPowerDevBattRtStateSet stateSet) {
        //1.刷新rsAlarmSet，rtdataSet,rtState告警实时数据<指定默认刷第一组数据>
        rsAlarmSetService.updateDataFromDataAndStateAndRsAlarmToSetHrStop();
        //设置state_set表
        //设置state_set表和命令
        UpdateWrapper stateRtWrapper=new UpdateWrapper();
        stateSet.setOpCmd(CMD_Constant.CMD_SetHRSTopState);
        stateRtWrapper.eq("batt_index",0);
        mapper.update(stateSet,stateRtWrapper);
        //发送命令
        UpdateWrapper wrapper=new UpdateWrapper();
        wrapper.set("op_cmd",CMD_Constant.CMD_SetBattAlarm);
       /* UpdateWrapper wrapper=new UpdateWrapper();
        wrapper.set("op_cmd",CMD_Constant.CMD_SetHRSTopState);
        rsalarmSetMapper.update(null,wrapper);
        //读取opCmd返回是否成功
        QueryWrapper<CkpowerdevBattRsalarmSet> query = Wrappers.query();
        Response opStatus = OpCmdUtil.getOpStatus(rsalarmSetMapper,query, CMD_Constant.CMD_SetBattAlarm,20,null);
        QueryWrapper<CkpowerdevBattRsalarmSet> query = Wrappers.query();*/
        //读取opCmd返回是否成功
        QueryWrapper<CKPowerDevBattRtStateSet> query = Wrappers.query();
        Response opStatus = OpCmdUtil.getOpStatus(mapper,query, CMD_Constant.CMD_SetHRSTopState,20,null);
        if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //成功
            //记录日志
            Date now = new Date();
@@ -203,7 +206,7 @@
            logList.forEach(log->{
                log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
                log.setMonNum(0);
                log.setCmdType(CMD_Constant.CMD_SetBattAlarm);
                log.setCmdType(CMD_Constant.CMD_SetHRSTopState);
                log.setBattIndex(0);
                log.setCreateTime(now);
                log.setCreateDay(now);
@@ -220,12 +223,19 @@
        //设置data_set表
        rtDataSetMapper.updateBatchInRsAlarm(setDto.getDataSetList());
        //发送命令
        UpdateWrapper wrapper=new UpdateWrapper();
        wrapper.set("op_cmd",CMD_Constant.CMD_SetBattAlarm);
        /*UpdateWrapper wrapper=new UpdateWrapper();
        wrapper.set("op_cmd",CMD_Constant.CMD_SetHRSTopBatt);
        rsalarmSetMapper.update(null,wrapper);
        //读取opCmd返回是否成功
        QueryWrapper<CkpowerdevBattRsalarmSet> query = Wrappers.query();
        Response opStatus = OpCmdUtil.getOpStatus(rsalarmSetMapper,query, CMD_Constant.CMD_SetBattAlarm,20,null);
        QueryWrapper<CkpowerdevBattRsalarmSet> query = Wrappers.query();*/
        //设置state_set表和命令
        UpdateWrapper stateRtWrapper=new UpdateWrapper();
        stateRtWrapper.eq("batt_index",0);
        stateRtWrapper.set("op_cmd",CMD_Constant.CMD_SetHRSTopBatt);
        mapper.update(null,stateRtWrapper);
        //读取opCmd返回是否成功
        QueryWrapper<CKPowerDevBattRtStateSet> query = Wrappers.query();
        Response opStatus = OpCmdUtil.getOpStatus(mapper,query, CMD_Constant.CMD_SetHRSTopBatt,20,null);
        if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //成功
            //记录日志
            Date now = new Date();
@@ -234,7 +244,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_SetHRSTopBatt);
                log.setBattIndex(0);
                log.setCreateTime(now);
                log.setCreateDay(now);