修改命令

whyclxw

2024-01-23 428175382b8d7169d4afb0b29a3c722e89162a39

修改命令

 src/main/java/com/whyc/constant/CMD_Constant.java

@@ -96,4 +96,14 @@
    public static final int     CMD_SetBreakerState             = 0x70;         //控制断路器开关
    public static final int     CMD_SetBreakerState_ACK         = 0x71;         //控制断路器开关成功

    public static final int     CMD_SetHRSTopState            = 0x72;         //核容终止组端信息设置
    public static final int     CMD_SetHRSTopState_ACK         = 0x73;         //核容终止组端信息设置成功

    public static final int     CMD_SetHRSTopBatt            = 0x74;         //核容终止单体信息设置
    public static final int    CMD_SetHRSTopBatt_ACK         = 0x75;         //核容终止单体信息设置成功


    public static final int     CMD_SetHRSTopAlm            = 0x76;         //核容终止告警设置
    public static final int    CMD_SetHRSTopAlm_ACK         = 0x77;         //核容终止告警设置成功

}

 src/main/java/com/whyc/constant/LogOpEnum.java

@@ -35,7 +35,8 @@
    //TYPE_CMD_BATT2(0x24,"设置电池组2单体信息"),
    //TYPE_CMD_GROUP2(0x26,"设置电池组2组端信息")

    TYPE_CMD_HRSTOP(0x28,"核容终止时模拟数据")
    TYPE_CMD_HRSTOPState(0x72,"核容终止组端信息模拟设置"),
    TYPE_CMD_HRSTOPBatt(0x74,"核容终止单体信息模拟设置")

    ;


 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);

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

@@ -52,13 +52,13 @@
        //1.刷新rsAlarmSet，rtdataSet,rtState告警实时数据<指定默认刷第一组数据>
        updateDataFromDataAndStateAndRsAlarmToSetHrStop();
        //命令设置进去
        almSet.getRsAlmSet().setOpCmd(CMD_Constant.CMD_SetBattAlarm);
        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();
@@ -67,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);
            });

 src/main/java/com/whyc/util/OpCmdUtil.java

@@ -202,6 +202,15 @@
            case CMD_Constant.CMD_SetBreakerState:{
                return opCmdAck ==CMD_Constant.CMD_SetBreakerState_ACK ;
            }
            case CMD_Constant.CMD_SetHRSTopBatt:{
                return opCmdAck ==CMD_Constant.CMD_SetHRSTopBatt_ACK ;
            }
            case CMD_Constant.CMD_SetHRSTopState:{
                return opCmdAck ==CMD_Constant.CMD_SetHRSTopState_ACK ;
            }
            case CMD_Constant.CMD_SetHRSTopAlm:{
                return opCmdAck ==CMD_Constant.CMD_SetHRSTopAlm_ACK ;
            }
            default:
                return false;
        }