whycxzp
2022-11-05 a081403046577dcf5718a6323ff22cad4c18038d
电操开关遥调遥控更新
3个文件已修改
55 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/Fbs9100SetparamController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/dto/FBS9100_ComBase.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/Fbs9100SetparamService.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/Fbs9100SetparamController.java
@@ -99,4 +99,22 @@
        return service.getEOperatingSwitch(devId);
    }
    @ApiOperation(tags = "电操开关遥调遥控点位",value = "启动测试")
    @PostMapping("updateEOperatingSwitchStart")
    public Response updateEOperatingSwitchStart(@RequestBody Fbs9100Setparam fbs9100Setparam){
        return service.updateEOperatingSwitchStart(fbs9100Setparam);
    }
    @ApiOperation(tags = "电操开关遥调遥控点位",value = "停止测试")
    @PostMapping("updateEOperatingSwitchStop")
    public Response updateEOperatingSwitchStop(@RequestBody Fbs9100Setparam fbs9100Setparam){
        return service.updateEOperatingSwitchStop(fbs9100Setparam);
    }
    @ApiOperation(tags = "电操开关遥调遥控点位",value = "电操开关控制")
    @PostMapping("updateEOperatingSwitchControl")
    public Response updateEOperatingSwitchControl(@RequestBody Fbs9100Setparam fbs9100Setparam){
        return service.updateEOperatingSwitchControl(fbs9100Setparam);
    }
}
src/main/java/com/whyc/dto/FBS9100_ComBase.java
@@ -159,5 +159,8 @@
    public static final int CMD_StopShowPic = 0xBE;  //停止显示内窥镜图片
    public static final int CMD_StopShowPic_ACK = 0xBF;  //停止显示内窥镜图片成功
    //电操开关控制
    public static final int     CMD_EOperatingSwitch_ControlSwitch              =     0x57;        //电操开关控制命令
    public static final int     CMD_EOperatingSwitch_ControlSwitchAck            =     0x58;        //电操开关控制成功
}
src/main/java/com/whyc/service/Fbs9100SetparamService.java
@@ -335,6 +335,9 @@
        switch(m_cmd) {
            case FBS9100_ComBase.CMD_SetDischargeParm: m_cmd_ack = FBS9100_ComBase.CMD_SetDischargeParmAck; break;
            case FBS9100_ComBase.CMD_GetDischargeParm: m_cmd_ack = FBS9100_ComBase.CMD_GetDischargeParmAck; break;
            case FBS9100_ComBase.CMD_Start: m_cmd_ack = FBS9100_ComBase.CMD_StartAck; break;
            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;
            default:
                return false;
@@ -377,7 +380,36 @@
        if(b){
            bl=sendCmdToDev(FBS9100_ComBase.CMD_SetDischargeParm,fbs9100Setparam.getDevId().intValue());
        }
        return new Response().set(1,bl,bl==true?"修改参数成功!":"设置参数失败,请检查网络!");
        return new Response().set(1,bl, bl ?"修改参数成功!":"设置参数失败,请检查网络!");
    }
    public Response updateEOperatingSwitchStart(Fbs9100Setparam fbs9100Setparam) {
        UpdateWrapper<Fbs9100Setparam> update = Wrappers.update();
        update.set("TestCmd",fbs9100Setparam.getTestCmd()).eq("dev_id",fbs9100Setparam.getDevId());
        Boolean b=mapper.update(null,update)==1;
        boolean bl=false;
        if(b){
            bl=sendCmdToDev(FBS9100_ComBase.CMD_Start,fbs9100Setparam.getDevId().intValue());
        }
        return new Response().set(1,bl, bl ?"启动测试成功!":"启动测试失败,请检查网络!");
    }
    public Response updateEOperatingSwitchStop(Fbs9100Setparam fbs9100Setparam) {
        boolean bl=sendCmdToDev(FBS9100_ComBase.CMD_Stop,fbs9100Setparam.getDevId().intValue());
        return new Response().set(1,bl, bl ?"停止测试成功!":"停止测试失败,请检查网络!");
    }
    public Response updateEOperatingSwitchControl(Fbs9100Setparam fbs9100Setparam) {
        UpdateWrapper<Fbs9100Setparam> update = Wrappers.update();
        update.set("TestCmd",fbs9100Setparam.getTestCmd())
                .set("FlowOver_Count",fbs9100Setparam.getFlowoverCount())
                .eq("dev_id",fbs9100Setparam.getDevId());
        Boolean b=mapper.update(null,update)==1;
        boolean bl=false;
        if(b){
            bl=sendCmdToDev(FBS9100_ComBase.CMD_EOperatingSwitch_ControlSwitch,fbs9100Setparam.getDevId().intValue());
        }
        return new Response().set(1,bl, bl ?"电操开关控制成功!":"电操开关控制失败,请检查网络!");
    }
    public Response getEOperatingSwitch(int devId) {