Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem

DELL

4 天以前 d8475b8670b6b4cbcd1bc9e57d30a6f433d206ab

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

@@ -39,6 +39,8 @@
                break;
            case DevCmd.CMD_ResetSystem:
                cmd_ack = DevCmd.CMD_ResetSystemAck;
            case DevCmd.CMD_StartResDischarge:
                cmd_ack = DevCmd.CMD_StopResDischarge;
            default:
                return false;
        }
@@ -56,7 +58,7 @@
            PageHelper.startPage(1,1);
            QueryWrapper queryWrapper=new QueryWrapper();
            queryWrapper.eq("dev_id",dev_id);
            for(int n=0; n<40; n++)
            for(int n=0; n<1; n++)
            {
                DeviceSetparam DeviceSetparam=mapper.selectOne(queryWrapper);
                if(DeviceSetparam!=null){
@@ -105,4 +107,20 @@
        boolean bl = sendCmdToDev(DevCmd.CMD_Start,DevCmd.CMD_StartDischarge, devId, battGroupNum);
        return new Response().set(1,bl,bl==true?"远程核容成功!":"远程核容失败!");
    }
    //远程停止核容测试
    public Response stopDis(int devId, int battGroupNum) {
        boolean bl = sendCmdToDev(DevCmd.CMD_Stop,DevCmd.CMD_StopDischarge, devId, battGroupNum);
        return new Response().set(1,bl,bl==true?"远程停止核容成功!":"远程停止核容失败!");
    }
    //内阻测试
    public Response startRes(int devId, int battGroupNum) {
        boolean bl = sendCmdToDev(DevCmd.CMD_Start,DevCmd.CMD_StartResDischarge, devId, battGroupNum);
        return new Response().set(1,bl,bl==true?"启动内阻测试成功!":"启动内阻测试失败!");
    }
    //停止内阻测试
    public Response stopRes(int devId, int battGroupNum) {
        boolean bl = sendCmdToDev(DevCmd.CMD_Stop,DevCmd.CMD_StopResDischarge, devId, battGroupNum);
        return new Response().set(1,bl,bl==true?"停止内阻测试成功!":"停止内阻测试失败!");
    }

}