追加查询和更新字段BattGroupNum

whycxzp

2022-04-22 a1f19329352f3083c7c99b182b4e71dfcbf8cb35

追加查询和更新字段BattGroupNum

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

@@ -23,8 +23,8 @@

    @ApiOperation(tags = "在线监测-实时监控",value = "在线监测-实时监控-BTS停止")
    @GetMapping("serchbyDev_id")
    public Response serchbyDev_id(@RequestParam int num, Integer testCmd,@RequestParam int devId){
        return service.serchbyDev_id(num,testCmd,devId);
    public Response serchbyDev_id(@RequestParam int num, Integer testCmd,@RequestParam int devId,@RequestParam int battGroupNum){
        return service.serchbyDev_id(num,testCmd,devId,battGroupNum);
    }

    @ApiOperation(tags = "在线监测-实时监控",value = "在线监测-实时监控-重启设备")

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

@@ -29,8 +29,8 @@
    }

    //右键查看参数和弹出框的刷新按钮-----BTS停止
    public Response serchbyDev_id(int num,Integer testCmd,int devId) {
        boolean bl=sendCmdToFBS9100Dev(num,testCmd!=null?testCmd:0,devId);
    public Response serchbyDev_id(int num, Integer testCmd, int devId, int battGroupNum) {
        boolean bl=sendCmdToFBS9100Dev2(num,testCmd!=null?testCmd:0,devId,battGroupNum);
        Fbs9100Setparam setparam=mapper.serchbyDev_id(devId);
        return  new Response().setII(1,setparam,bl,bl==true?"查询成功!":"设置9100参数失败,请检查网络!");
    }
@@ -205,4 +205,75 @@
        return res_exe;
    }

    //机房命令操作设备时的cmd和ack校验  test_type  -->默认启动测试的类型
    public boolean sendCmdToFBS9100Dev2(int cmd, int test_type, int dev_id, int battGroupNum)
    {
        int m_cmd = cmd;
        int m_cmd_ack = cmd;
        switch(m_cmd) {
            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_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_SetIp_Tem: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
            case FBS9100_ComBase.CMd_SetIp_Per: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
            case FBS9100_ComBase.CMD_GetOffLineYHParam: m_cmd_ack = FBS9100_ComBase.CMD_GetOffLineYHParam_ACK; break;
            case FBS9100_ComBase.CMD_SetOffLineYHParam: m_cmd_ack = FBS9100_ComBase.CMD_SetOffLineYHParam_ACK; break;
            case FBS9100_ComBase.CMD_StartOffLine: m_cmd_ack = FBS9100_ComBase.CMD_StartOffLine_ACK; break;
            case FBS9100_ComBase.CMD_StopOffLine: m_cmd_ack = FBS9100_ComBase.CMD_StopOffLine_ACK; break;
            case FBS9100_ComBase.CMD_ResetSystem: m_cmd_ack = FBS9100_ComBase.CMD_ResetSystemAck; break;
            //一体机A059
            case FBS9100_ComBase.CMD_StartDischarge: m_cmd_ack = FBS9100_ComBase.CMD_StartDischargeAck; break;
            case FBS9100_ComBase.CMD_StopDischarge: m_cmd_ack = FBS9100_ComBase.CMD_StopDischargeAck; break;
            case FBS9100_ComBase.CMD_PauseDischarge: m_cmd_ack = FBS9100_ComBase.CMD_PauseDischargeAck; break;
            case FBS9100_ComBase.CMD_StartCharTest: m_cmd_ack = FBS9100_ComBase.CMD_StartCharTestAck; break;
            case FBS9100_ComBase.CMD_StopCharTest: m_cmd_ack = FBS9100_ComBase.CMD_StopCharTestAck; break;
            case FBS9100_ComBase.CMD_PauseCharTest: m_cmd_ack = FBS9100_ComBase.CMD_PauseCharTestAck; break;
            case FBS9100_ComBase.CMD_StartHUOHUATest: m_cmd_ack = FBS9100_ComBase.CMD_StartHUOHUATestACK; break;
            case FBS9100_ComBase.CMD_StopHUOHUATest: m_cmd_ack = FBS9100_ComBase.CMD_StopHUOHUATestACK; break;
            case FBS9100_ComBase.CMD_PauseHUOHUATest: m_cmd_ack = FBS9100_ComBase.CMD_PauseHUOHUATestACK; break;
            //图片显示
            case FBS9100_ComBase.CMD_StartShowPic: m_cmd_ack = FBS9100_ComBase.CMD_StartShowPic_ACK; break;
            case FBS9100_ComBase.CMD_StopShowPic: m_cmd_ack = FBS9100_ComBase.CMD_StopShowPic_ACK; break;
            case FBS9100_ComBase. CMD_SetNowBatt: m_cmd_ack = FBS9100_ComBase.CMD_SetNowBatt_ACK; break;

            default: return false;
        }
        UpdateWrapper updateWrapper=new UpdateWrapper();
        updateWrapper.set("op_cmd",m_cmd);
        updateWrapper.set("BattGroupNum",battGroupNum);
        if(test_type > 0 && cmd == FBS9100_ComBase.CMD_Start){                    //启动测试时未点击设定参数按钮，会出现启动内阻测试bug修复
            updateWrapper.set("TestCmd",test_type);
        }
        updateWrapper.eq("dev_id",dev_id);
        int flag=mapper.update(null,updateWrapper);
        boolean res_exe = false;
        if(flag>0)
        {
            PageHelper.startPage(1,1);
            QueryWrapper queryWrapper=new QueryWrapper();
            queryWrapper.eq("dev_id",dev_id);
            for(int n=0; n<40; n++)
            {

                Fbs9100Setparam fbs9100Setparam=mapper.selectOne(queryWrapper);
                if(fbs9100Setparam!=null){
                    if(fbs9100Setparam.getOpCmd()==m_cmd_ack){
                        res_exe = true;
                        break;
                    }
                    try {
                        Thread.sleep(250);
                    } catch (InterruptedException e) {
                        // TODO Auto-generated catch block
                        e.printStackTrace();
                    }
                }else {
                    break;
                }
            }
        }
        return res_exe;
    }

}

 src/main/resources/mapper/Fbs9100SetparamMapper.xml

@@ -38,7 +38,7 @@
                ,db_ram_db.tb_fbs9100_setparam.MonomerLowCount,db_ram_db.tb_fbs9100_setparam.OnlineVolLowAction
                ,db_ram_db.tb_fbs9100_setparam.dCVolHighLimit,db_ram_db.tb_fbs9100_setparam.chargeCurrSet,db_ram_db.tb_fbs9100_setparam.battgroupnum 
                ,db_ram_db.tb_fbs9100_setparam.testcmd,db_ram_db.tb_fbs9100_setparam.testcmd,db_ram_db.tb_fbs9100_setparam.MonomerTmp_High 
                ,db_ram_db.tb_fbs9100_setparam.AutoTestStartVol,db_ram_db.tb_fbs9100_setparam.OnLineVol_Low,db_ram_db.tb_fbs9100_setparam.OffLineYH_Cycle,OffLineYHstarttime,OffLineYHTimes,OffLineYHOnceCycle   
                ,db_ram_db.tb_fbs9100_setparam.AutoTestStartVol,db_ram_db.tb_fbs9100_setparam.OnLineVol_Low,db_ram_db.tb_fbs9100_setparam.OffLineYH_Cycle,OffLineYHstarttime,OffLineYHTimes,OffLineYHOnceCycle,BattGroupNum
                FROM db_battinf.tb_battinf 
                LEFT OUTER JOIN db_ram_db.tb_fbs9100_setparam on db_ram_db.tb_fbs9100_setparam.dev_id=db_battinf.tb_battinf.FBSDeviceId  
                WHERE db_battinf.tb_battinf.FBSDeviceId=#{devId} limit 1