whyclxw
2022-01-18 3be4d7dfb39031da1112815c09733c6a042e3107
在线监测-实时监控-开始、停止显示A059图片,设置当前电池组数
5个文件已修改
46 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/Fbs9100SetparamController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/dto/FBS9100_ComBase.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/Fbs9100SetparamMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/Fbs9100SetparamService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/Fbs9100SetparamMapper.xml 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/Fbs9100SetparamController.java
@@ -64,4 +64,15 @@
    public Response serchCharHighTmp(@RequestParam int devId){
        return service.serchCharHighTmp(devId);
    }
    @ApiOperation(tags = "在线监测-实时监控",value = "在线监测-实时监控-开始/停止显示FGCD_A059图片",notes = "Fbs9100_setparamAction_action_StartOrStopShowPic")
    @GetMapping("StartOrStopShowPic")
    public Response StartOrStopShowPic(@RequestParam int devId,@RequestParam int opCmd){
        return service.StartOrStopShowPic(devId,opCmd);
    }
    @ApiOperation(tags = "在线监测-实时监控",value = "在线监测-实时监控-设置FGCD_A059当前电池组",notes = "Fbs9100_setparamAction_action_SetNowBatt")
    @GetMapping("SetNowBatt")
    public Response SetNowBatt(@RequestParam int devId,@RequestParam int opCmd,@RequestParam int battGroupNum){
        return service.SetNowBatt(devId,opCmd,battGroupNum);
    }
}
src/main/java/com/whyc/dto/FBS9100_ComBase.java
@@ -135,5 +135,14 @@
    public static final int  CMD_StopFile  = 0xA5;   //停止下载文件
    public static final int  CMD_StopFile_ACK = 0xA6;   //停止下载文件成功
    public static final int  CMD_SetNowBatt            =   0xBA;  //设置当前电池组
    public static final int  CMD_SetNowBatt_ACK            =   0xBB;  //设置当前电池组成功
    public static final int  CMD_StartShowPic             =   0xBC;  //开始显示内窥镜图片
    public static final int  CMD_StartShowPic_ACK            =   0xBD;  //开始显示内窥镜图片成功
    public static final int  CMD_StopShowPic             =   0xBE;  //停止显示内窥镜图片
    public static final int  CMD_StopShowPic_ACK             =   0xBF;  //停止显示内窥镜图片成功
}
src/main/java/com/whyc/mapper/Fbs9100SetparamMapper.java
@@ -16,4 +16,6 @@
    Boolean update61850Param(Fbs9100Setparam fbs9100Setparam);
    //在线监测-实时监控-设置FGCD_A059放电参数
    Boolean updateA059Param(Fbs9100Setparam a059setParam);
    //在线监测-实时监控-设置FGCD_A059当前电池组
    Boolean SetNowBatt(int devId, int battGroupNum);
}
src/main/java/com/whyc/service/Fbs9100SetparamService.java
@@ -119,6 +119,20 @@
        Fbs9100Setparam a059param=mapper.selectOne(wrapper);
        return new Response().set(1,a059param);
    }
    //在线监测-实时监控-开始/停止显示FGCD_A059图片
    public Response StartOrStopShowPic(int devId, int opCmd) {
      boolean  bl=sendCmdToFBS9100Dev(opCmd,0,devId);
      return new Response().set(1,bl,bl==true?"开始/停止显示FGCD_A059图片成功!":"开始/停止显示FGCD_A059图片失败,请检查网络!");
    }
    //在线监测-实时监控-设置FGCD_A059当前电池组
    public Response SetNowBatt(int devId, int opCmd,int battGroupNum) {
        Boolean b=mapper.SetNowBatt(devId,battGroupNum);
        boolean bl=false;
        if(b){
            bl=sendCmdToFBS9100Dev(opCmd,0,devId);
        }
        return new Response().set(1,bl,bl==true?"设置当前电池组成功!":"设置当前电池组失败,请检查网络!");
    }
    //机房命令操作设备时的cmd和ack校验  test_type  -->默认启动测试的类型
    public boolean sendCmdToFBS9100Dev(int cmd,int test_type,int dev_id)
    {
@@ -146,6 +160,11 @@
            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();
src/main/resources/mapper/Fbs9100SetparamMapper.xml
@@ -26,8 +26,11 @@
            CharHighTmp=#{CharHighTmp}, DisWaitTime=#{DisWaitTime}, CharWaitTime=#{CharWaitTime} , FlowOver_Count = #{flowoverCount},  FlowOver_CharCurr_1 = #{flowoverCharcurr1},  FlowOver_CharCurr_2 =#{flowoverCharcurr2},  FlowOver_CharCurr_3 =#{flowoverCharcurr3},
            FlowOver_CharTime_1 =#{flowoverChartime1},  FlowOver_CharTime_2 =#{flowoverChartime2},  FlowOver_CharTime_3 =#{flowoverChartime3} WHERE dev_id = #{devId}
    </update>
    <update id="SetNowBatt">
        update db_ram_db.tb_Fbs9100_setparam set BattGroupNum=#{battGroupNum} where dev_id=#{devId}
    </update>
    <select id="serchbyDev_id" resultType="com.whyc.pojo.Fbs9100Setparam">
    <select id="serchbyDev_id" resultType="com.whyc.pojo.Fbs9100Setparam">
        select db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,db_battinf.tb_battinf.BattGroupName,db_battinf.tb_battinf.BattGroupId
                ,db_battinf.tb_battinf.GroupIndexInFBSDevice,db_battinf.tb_battinf.MonCount,db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.load_curr 
                ,db_ram_db.tb_fbs9100_setparam.HourRate,db_ram_db.tb_fbs9100_setparam.DisCurr,db_ram_db.tb_fbs9100_setparam.DisCap