智能母联opCmd更新

whycxzp

2024-04-25 38d2dda917c189b7ba87d70196b99a34d50503b4

智能母联opCmd更新

 src/main/java/com/whyc/controller/Fbs9100SetparamController.java

@@ -257,6 +257,23 @@
    public Response updateLD6StopTest(@RequestParam int devId) {
        return service.updateLD6StopTest(devId);
    }
    @ApiOperation(tags = "设置参数", value = "读取参数-智能母联")
    @GetMapping("searchML")
    public Response searchML(@RequestParam int devId){
        return service.searchML(devId);
    }

    @ApiOperation(tags = "设置参数", value = "设置参数-智能母联")
    @PostMapping("updateML")
    public Response updateML(@RequestBody Fbs9100Setparam param) {
        return service.updateML(param);
    }

    @ApiOperation(tags = "设置参数", value = "设置参数-通用启动|停止 DCDC")
    @PostMapping("updateStartOrStopTest")
    public Response updateStartOrStopTest(@RequestParam int devId,@RequestParam int opCmd,@RequestParam int testCmd) {
        return service.updateOpCmdAndTestCmd(devId,opCmd,testCmd);
    }

    @ApiOperation(tags = "在线监测-实时监控", value = "在线监测-实时监控-读取9612放电参数")
    @GetMapping("searchFBS9612Param")

 src/main/java/com/whyc/dto/FBS9100_ComBase.java

@@ -190,5 +190,16 @@
    //61850同步时间
    public static final int     CMD_updateXZTime                =   0xD1;                //设置协转时间
    public static final int     CMD_updateXZTimeAck                =   0xD2;                //设置协转时间成功
    //智能母联控制
    public static final int CMD_ReadTest_Param         = 0xA1;        //读取参数
    public static final int CMD_ReadTest_Param_ACK     = 0xA2;        //读取参数成功
    public static final int CMD_WriteTest_Param         = 0xA3;        //设置参数
    public static final int CMD_WriteTest_Param_ACK     = 0xA4;        //设置参数成功
    public static final int CMD_StartDcdcTest             = 0xA5;        //强制启动测试
    public static final int CMD_StartDcdcTest_ACK         = 0xA6;        //强制启动测试成功
    public static final int CMD_StopDcdcTest             = 0xA7;        //强制停止测试
    public static final int CMD_StopDcdcTest_ACK         = 0xA8;        //强制停止测试成功
    public static final int CMD_Dcdc1                    = 0xA9;        //操作DCDC1
    public static final int CMD_Dcdc2                    = 0xAA;        //操作DCDC2

}

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

@@ -502,6 +502,10 @@
            case FBS9100_ComBase.CMD_Stop: m_cmd_ack = FBS9100_ComBase.CMD_StopAck; break;
            case FBS9100_ComBase.CMD_EOperatingSwitch_ControlSwitch: m_cmd_ack = FBS9100_ComBase.CMD_EOperatingSwitch_ControlSwitchAck; break;
            case FBS9100_ComBase.CMD_ResetSystem: m_cmd_ack = FBS9100_ComBase.CMD_ResetSystemAck; break;
            case FBS9100_ComBase.CMD_ReadTest_Param: m_cmd_ack = FBS9100_ComBase.CMD_ReadTest_Param_ACK; break;
            case FBS9100_ComBase.CMD_WriteTest_Param: m_cmd_ack = FBS9100_ComBase.CMD_WriteTest_Param_ACK; break;
            case FBS9100_ComBase.CMD_StartDcdcTest: m_cmd_ack = FBS9100_ComBase.CMD_StartDcdcTest_ACK; break;
            case FBS9100_ComBase.CMD_StopDcdcTest: m_cmd_ack = FBS9100_ComBase.CMD_StopDcdcTest_ACK; break;
            default:
                return false;
        }
@@ -679,6 +683,10 @@
        int opCmd = FBS9100_ComBase.CMD_GetDischargeParm;
        return searchParam(devId,opCmd);
    }
    public Response searchML(int devId) {
        int opCmd = FBS9100_ComBase.CMD_ReadTest_Param;
        return searchParam(devId,opCmd);
    }

    private Response searchParam(int devId, int opCmd) {
        boolean res = sendCmdToDev(opCmd, devId);
@@ -708,6 +716,20 @@
        return new Response().set(1, res, res ? "修改参数成功" : "设置参数失败,请检查网络");
    }

    public Response updateML(Fbs9100Setparam param) {
        Long devId = param.getDevId();
        UpdateWrapper<Fbs9100Setparam> update = Wrappers.update();
        update.set("dcdc1_outputvol",param.getDcdc1OutputVol())
                .set("dcdc2_outputvol",param.getDcdc2OutputVol())
                .set("dcdc1_outputcurr",param.getDcdc1OutputCurr())
                .set("dcdc2_outputcurr",param.getDcdc2OutputCurr())
                .eq("dev_id",devId);
        mapper.update((Fbs9100Setparam) ActionUtil.objeNull,update);

        boolean res = sendCmdToDev(FBS9100_ComBase.CMD_WriteTest_Param, devId.intValue());
        return new Response().set(1, res, res ? "修改参数成功" : "设置参数失败,请检查网络");
    }

    public Response updateOpCmdAndTestCmd(int devId,int opCmd,int testCmd) {
        UpdateWrapper<Fbs9100Setparam> update = Wrappers.update();
        update.set("TestCmd",testCmd).eq("dev_id",devId);