whycrzg
2021-02-19 656bd1b190ed296a7bf63623dc8e9fe2bc9d3098
update
9个文件已修改
409 ■■■■ 已修改文件
src/main/java/com/fgkj/controller/Alarm_paramController.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/controller/AnnounceController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/controller/BadBatt_monController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/controller/ram/Fbs9100_setparamController.java 282 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/dto/ServiceModelOnce.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/services/Alarm_paramService.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/services/AnnounceService.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/services/BadBatt_mon_flagService.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/services/ram/Fbs9100_setparamService.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/controller/Alarm_paramController.java
@@ -26,7 +26,16 @@
    private User_logService uservice;
    @PostMapping("/")
    @ApiOperation(notes = "",value="新增")
    @ApiOperation(notes = "{\n" +
            "  \"alm_id\": 0,\n" +
            "  \"alm_name\": \"\",\n" +
            "  \"alm_high_coe\": 0.0,\n" +
            "  \"alm_low_coe\": 0.0,\n" +
            "  \"alm_high_level\": 0,\n" +
            "  \"alm_low_level\": 0,\n" +
            "  \"alm_high_en\": 0,\n" +
            "  \"alm_low_en\": 0\n" +
            "}",value="新增")
    public ServiceModel add(@RequestBody Alarm_param param){
        ServiceModel model = service.add(param);
@@ -35,7 +44,15 @@
    
    //编辑参数
    @PutMapping("/")
    @ApiOperation(notes = "",value="编辑参数")
    @ApiOperation(notes = "{\n" +
            "  \"alm_id\": 0,\n" +
            "  \"alm_high_coe\": 0.0,\n" +
            "  \"alm_low_coe\": 0.0,\n" +
            "  \"alm_high_level\": 0,\n" +
            "  \"alm_low_level\": 0,\n" +
            "  \"alm_high_en\": 0,\n" +
            "  \"alm_low_en\": 0\n" +
            "}",value="编辑参数")
    public ServiceModel update(@RequestBody Alarm_param param){
        ServiceModel model = service.update(param);
        {
src/main/java/com/fgkj/controller/AnnounceController.java
@@ -36,7 +36,9 @@
    //发布新公告
    @PostMapping("/")
    @ApiOperation(notes = "KEY announce_time VALUE 2018/7/7 11:11:00",value="发布新公告")
       public ServiceModel add(@ApiParam(value = "时间 格式 2018/7/7 11:11:00" ,required = true)@RequestParam Date announce_time, @ApiParam(value = "消息" ,required = true)@RequestParam String message, @ApiParam(value = "备注" ,required = true)@RequestParam String note) {
       public ServiceModel add(@ApiParam(value = "时间 格式 2018/7/7 11:11:00" ,required = true)@RequestParam Date announce_time,
                               @ApiParam(value = "消息" ,required = true)@RequestParam String message,
                               @ApiParam(value = "备注" ,required = true)@RequestParam String note) {
        Announce a= new Announce();
        a.setAnnounce_time(announce_time);
        a.setMessage(message);
src/main/java/com/fgkj/controller/BadBatt_monController.java
@@ -23,7 +23,7 @@
    
    //查询落后单体总数
    @GetMapping("nums")
    @ApiOperation(notes = "获取当前session 中的 uName",value="查询落后单体总数")
    @ApiOperation(notes = "sum 落后单体总数",value="查询落后单体总数")
    public ServiceModelOnce searchNums() {
         User_inf userInf=(User_inf) ActionUtil.getUser();
//        User_inf userInf=new User_inf();
src/main/java/com/fgkj/controller/ram/Fbs9100_setparamController.java
@@ -17,7 +17,7 @@
@RequestMapping("fbs9100SetParam")
@RestController
@Api(tags = "fbs9100SetParam接口")
@Api(tags = "fbs9100SetParam接口 TODO待测 ")
public class Fbs9100_setparamController{
    @Resource
@@ -27,60 +27,108 @@
    private User_logService uservice;
    //根据机房编号和维护区查询放电机房的信息和放电参数
    @GetMapping("byCondition")
    @PostMapping("byCondition")
    @ApiOperation(notes = "",value="机房编号和维护区查询放电机房的信息和放电参数")
    public ServiceModel serchByCondition(@RequestBody BattInf binf){
        // BattInf binf = getGson().fromJson(json, BattInf.class);
    public ServiceModel serchByCondition(@RequestParam Integer num,@RequestParam String stationName1,
                                         @RequestParam String stationName,@RequestParam Integer battGroupId) {
        BattInf binf = new BattInf();
        binf.setNum(num);
        binf.setStationName1(stationName1);
        binf.setStationName(stationName);
        binf.setBattGroupId(battGroupId);
        ServiceModel model = service.serchByCondition(binf);
        return model;
    }
     //根据设备id查询设备的放电参数
    @GetMapping("devParamById")
    @PostMapping("devParamById")
    @ApiOperation(notes = "",value="设备id查询设备的放电参数")
    public ServiceModel serchdevParam(@RequestBody BattInf binf){
    public ServiceModel serchdevParam(@RequestParam Integer fbsDeviceId) {
        BattInf binf = new BattInf();
        binf.setFbsDeviceId(fbsDeviceId);
        ServiceModel model = service.serchdevParam(binf);
        return model;
    }
    //弹出框的确定操作
    @PutMapping("update")
    @ApiOperation(notes = "",value="弹出框的确定操作")
    @ApiOperation(notes = "{\n" +
            "  \"num\": 82,\n" +
            "  \"dev_id\": 961100001,\n" +
            "  \"testCmd\": 0,\n" +
            "  \"hourRate\": 0,\n" +
            "  \"disCurr\": 0.0,\n" +
            "  \"disCap\": 0.0,\n" +
            "  \"disTime\": 0,\n" +
            "  \"groupVol_Low\": 0.0,\n" +
            "  \"monomerVol_Low\": 0.0,\n" +
            "  \"monomerLowCount\": 0,\n" +
            "  \"battGroupNum\": 0,\n" +
            "  \"onlineLowAction\": 0,\n" +
            "  \"dCVolHighLimit\": 0.0,\n" +
            "  \"chargeCurrSet\": 0.0,\n" +
            "  \"monomerTmp_High\": 0.0\n" +
            "}",value="弹出框的确定操作 TODO 待测")
    public ServiceModel update(@RequestBody Fbs9100_setparam fbs) {
        ServiceModel model = service.update(fbs);
        {   String msg="";
            if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
                 msg="修改"+fbs.getDev_id()+"的设备放电参数";
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
                 msg="启动"+fbs.getDev_id()+"的设备放电";
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
                 msg="停止"+fbs.getDev_id()+"的设备放电";
        ServiceModel model = new ServiceModel();
        try {
            model = service.update(fbs);
            {   String msg="";
                if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
                     msg="修改"+fbs.getDev_id()+"的设备放电参数";
                }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
                     msg="启动"+fbs.getDev_id()+"的设备放电";
                }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
                     msg="停止"+fbs.getDev_id()+"的设备放电";
                }
                User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
                uservice.add(ulog);//将用户的操作记录下来
            }
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
            uservice.add(ulog);//将用户的操作记录下来
        } catch (Exception e) {
            e.printStackTrace();
            model.setCode(0);
            model.setMsg("修改异常!");
            return model;
        }
        return model;
    }
    //离线养护功能
    @PutMapping("maintain")
    @ApiOperation(notes = "",value="离线养护功能")
    @ApiOperation(notes = "{\n" +
            "  \"dev_id\": 0,\n" +
            "  \"op_cmd\": 81,\n" +
            "  \"monomerTmp_High\": 0.0,\n" +
            "  \"offLineYH_Cycle\": 0,\n" +
            "  \"offLineYHstarttime\": \"2021-01-25 08:19:35\",\n" +
            "  \"offLineYHTimes\": 0,\n" +
            "  \"offLineYHOnceCycle\": 0,\n" +
            "  \"onLineVol_Low\": 0.0\n" +
            "}",value="离线养护功能 TODO 待测")
    public ServiceModel updateMaintain(@RequestBody Fbs9100_setparam fbs) {
        ServiceModel model = service.updateMaintain(fbs);
        {   String msg="";
        if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_SetOffLineYHParam){
             msg="设置"+fbs.getDev_id()+"的设备离线养护功能";
        }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_StartOffLine){
             msg="启动"+fbs.getDev_id()+"的设备离线养护功能";
        }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_StopOffLine){
             msg="停止"+fbs.getDev_id()+"的设备离线养护功能";
        }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_GetOffLineYHParam){
             msg="读取"+fbs.getDev_id()+"的设备离线养护功能";
        }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_ResetSystem){
             msg="重启"+fbs.getDev_id()+"的设备";
        }
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
            uservice.add(ulog);//将用户的操作记录下来
        ServiceModel model = new ServiceModel();
        try {
            model = service.updateMaintain(fbs);
            {   String msg="";
            if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_SetOffLineYHParam){
                 msg="设置"+fbs.getDev_id()+"的设备离线养护功能";
            }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_StartOffLine){
                 msg="启动"+fbs.getDev_id()+"的设备离线养护功能";
            }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_StopOffLine){
                 msg="停止"+fbs.getDev_id()+"的设备离线养护功能";
            }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_GetOffLineYHParam){
                 msg="读取"+fbs.getDev_id()+"的设备离线养护功能";
            }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_ResetSystem){
                 msg="重启"+fbs.getDev_id()+"的设备";
            }
                User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
                uservice.add(ulog);//将用户的操作记录下来
            }
        } catch (Exception e) {
            e.printStackTrace();
            model.setCode(0);
            model.setMsg("修改失败!");
            return model;
        }
        return model;
@@ -88,19 +136,38 @@
    //点击弹出框的设定按钮,修改ld6测试参数
    @PutMapping("ld6Param")
    @ApiOperation(notes = "",value="点击弹出框的设定按钮,修改ld6测试参数")
    @ApiOperation(notes = "{\n" +
            "  \"num\": -,\n" +
            "  \"testCmd\": -,\n" +
            "  \"groupVol_LOW\": -,\n" +
            "  \"monomerVol_LOW\": -,\n" +
            "  \"monomerLowCount\": -,\n" +
            "  \"monomerTmp_High\": -,\n" +
            "  \"disTime\": -,\n" +
            "  \"disCap\": -,\n" +
            "  \"autoTestStartVol\": -,\n" +
            "  \"dev_id\": -\n" +
            "}",value="点击弹出框的设定按钮,修改ld6测试参数 TODO 待测")
    public ServiceModel updateld6Param(@RequestBody Fbs9100_setparam fbs){
        ServiceModel model = service.updateld6Param(fbs);
        {   String msg="";
            if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
                 msg="修改"+fbs.getDev_id()+"的设备放电参数";
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
                 msg="启动"+fbs.getDev_id()+"的设备放电";
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
                 msg="停止"+fbs.getDev_id()+"的设备放电";
        ServiceModel model = null;
        try {
            model = service.updateld6Param(fbs);
            {   String msg="";
                if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
                     msg="修改"+fbs.getDev_id()+"的设备放电参数";
                }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
                     msg="启动"+fbs.getDev_id()+"的设备放电";
                }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
                     msg="停止"+fbs.getDev_id()+"的设备放电";
                }
                User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
                uservice.add(ulog);//将用户的操作记录下来
            }
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
            uservice.add(ulog);//将用户的操作记录下来
        } catch (Exception e) {
            e.printStackTrace();
            model.setCode(0);
            model.setMsg("修改失败!");
            return model;
        }
        return model;
@@ -108,35 +175,66 @@
    //点击弹出框的设定按钮,修改61850测试参数
    @PutMapping("61850Param")
    @ApiOperation(notes = "",value="点击弹出框的设定按钮,修改61850测试参数")
    @ApiOperation(notes = "{\n" +
            "  \"chargeCurrSet\": 0,\n" +
            "  \"dCVolHighLimit\": 0,\n" +
            "  \"dev_id\": 0,\n" +
            "  \"disCap\": 0,\n" +
            "  \"disCurr\": 0,\n" +
            "  \"disTime\": 0,\n" +
            "  \"groupVol_Low\": 0,\n" +
            "  \"hourRate\": 0,\n" +
            "  \"monomerLowCount\": 0,\n" +
            "  \"monomerTmp_High\": 0,\n" +
            "  \"monomerVol_Low\": 0\n" +
            "}",value="点击弹出框的设定按钮,修改61850测试参数 TODO 待测")
    public ServiceModel update61850Param(@RequestBody Fbs9100_setparam fbs){
        ServiceModel model = service.update61850Param(fbs);
        {   String msg="";
            if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
                 msg="修改"+fbs.getDev_id()+"的设备放电参数";
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
                 msg="启动"+fbs.getDev_id()+"的设备放电";
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
                 msg="停止"+fbs.getDev_id()+"的设备放电";
        ServiceModel model = new ServiceModel();
        try {
            model = service.update61850Param(fbs);
            {   String msg="";
                if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
                     msg="修改"+fbs.getDev_id()+"的设备放电参数";
                }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
                     msg="启动"+fbs.getDev_id()+"的设备放电";
                }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
                     msg="停止"+fbs.getDev_id()+"的设备放电";
                }
                User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
                uservice.add(ulog);//将用户的操作记录下来
            }
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
            uservice.add(ulog);//将用户的操作记录下来
        } catch (Exception e) {
            e.printStackTrace();
            model.setCode(0);
            model.setMsg("修改失败!");
            return model;
        }
        return model;
    }
    
    //右键查看参数和弹出框的刷新按钮
    @GetMapping("byDevId")
    @ApiOperation(notes = "",value="右键查看参数和弹出框的刷新按钮")
    public ServiceModel serchbyDev_id(@RequestBody Fbs9100_setparam fsparam) {
    @PostMapping("byDevId")
    @ApiOperation(notes = "{\n" +
            "\"num\":\"-\",\n" +
                "\"dev_id\":618500002,\n" +
            "\"testCmd\":\"-\"\n" +
            "}",value="右键查看参数和弹出框的刷新按钮 TODO 待测")
    public ServiceModel serchbyDev_id(@RequestParam Integer num,@RequestParam Integer dev_id,@RequestParam Integer testCmd) {
        Fbs9100_setparam fsparam = new Fbs9100_setparam();
        fsparam.setNum(num);
        fsparam.setDev_id(dev_id);
        fsparam.setTestCmd(testCmd);
        ServiceModel model = service.serchbyDev_id(fsparam);
        return model;
    }
    
    //实时刷新放电表格的电池组状态(集合)
    @GetMapping("byInfo")
    @ApiOperation(notes = "",value="实时刷新放电表格的电池组状态(集合)")
    @PostMapping("byInfo")
    @ApiOperation(notes = "[{\n" +
            "    \"fbsDeviceId\":618500001,\n" +
            "    \"battGroupId\":1000007\n" +
            "}]",value="实时刷新放电表格的电池组状态(集合)")
    public ServiceModel serchByInfo(@RequestBody List<BattInf> binf){
        // List<BattInf> binf = getGson().fromJson(json, new TypeToken<List<BattInf>>(){}.getType());
        ServiceModel model = service.serchByInfo(binf);
@@ -144,38 +242,70 @@
    }
    
    //根据电池组id查询电池组内前五的内阻数据(修改为前10)
    @GetMapping("byThirdBatt")
    @PostMapping("byThirdBatt")
    @ApiOperation(notes = "",value="电池组id查询电池组内前五的内阻数据(修改为前10)")
    public ServiceModel serchByThirdBatt(@RequestBody BattInf binf){
    public ServiceModel serchByThirdBatt(@RequestParam Integer groupIndexInFBSDevice,@RequestParam Integer fbsDeviceId){
        BattInf binf = new BattInf();
        binf.setGroupIndexInFBSDevice(groupIndexInFBSDevice);
        binf.setFbsDeviceId(fbsDeviceId);                        //910000001
        ServiceModel model = service.serchByThirdBatt(binf);
        return model;
    }
    //-----------跨域实现(启动,停止)设备放电
    @PutMapping("update_ky")
    @ApiOperation(tags = "跨域", notes = "",value="跨域实现(启动,停止)设备放电")
    @ApiOperation(tags = "跨域", notes = "{\n" +
            "\t\"testCmd\":\"-\",\n" +
            "    \"hourRate\":\"-\",\n" +
            "    \"disCurr\":\"-\",\n" +
            "    \"disCap\":\"-\",\n" +
            "    \"disTime\":\"-\",\n" +
            "    \"groupVol_Low\":\"-\",\n" +
            "    \"monomerVol_Low\":\"-\",\n" +
            "    \"monomerLowCount\":\"-\",\n" +
            "    \"battGroupNum\":\"-\",\n" +
            "    \"onlineLowAction\":\"-\",\n" +
            "    \"dCVolHighLimit\":\"-\",\n" +
            "    \"chargeCurrSet\":\"-\",\n" +
            "    \"monomerTmp_High\":\"-\",\n" +
            "    \"dev_id\":\"-\"\n" +
            "}",value="跨域实现(启动,停止)设备放电")
    public ServiceModel update_ky(@RequestBody Fbs9100_setparam fbs) {
        {   String msg="";
            if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
                 msg="修改"+fbs.getDev_id()+"的设备放电参数";
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
                 msg="启动"+fbs.getDev_id()+"的设备放电";
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
                 msg="停止"+fbs.getDev_id()+"的设备放电";
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
                 msg="获取"+fbs.getDev_id()+"的设备放电参数";
        ServiceModel model = null;
        try {
            {   String msg="";
                if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
                     msg="修改"+fbs.getDev_id()+"的设备放电参数";
                }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
                     msg="启动"+fbs.getDev_id()+"的设备放电";
                }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
                     msg="停止"+fbs.getDev_id()+"的设备放电";
                }else if(fbs.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
                     msg="获取"+fbs.getDev_id()+"的设备放电参数";
                }
            }
            model = service.update(fbs);
        } catch (Exception e) {
            e.printStackTrace();
            model.setCode(0);
            model.setMsg("修改失败!");
            return model;
        }
        ServiceModel model = service.update(fbs);
        return model;
    }
    //-----------跨域根据机房编号和维护区查询放电机房的信息和放电参数
    @GetMapping("byCondition_ky")
    @ApiOperation(tags = "跨域", notes = "",value="跨域根据机房编号和维护区查询放电机房的信息和放电参数")
    public ServiceModel serchByCondition_ky(@RequestBody BattInf binf){
    @PostMapping("byCondition_ky")
    @ApiOperation(tags = "跨域", notes = "",value="跨域根据机房编号和维护区查询放电机房的信息和放电参数 TODO")
    public ServiceModel serchByCondition_ky(@RequestParam Integer num,@RequestParam String stationName1,
                                            @RequestParam String stationName,@RequestParam Integer battGroupId){
        BattInf binf = new BattInf();
        binf.setNum(num);                            //41
        binf.setStationName1(stationName1);
        binf.setStationName(stationName);
        binf.setBattGroupId(battGroupId);            //1000003
        ServiceModel model = service.serchByCondition(binf);
        return model;
    }
src/main/java/com/fgkj/dto/ServiceModelOnce.java
@@ -7,17 +7,7 @@
    private Integer sum;
    private Integer newsum;
    public String msg;            //返回的简单信息
    // public Integer sum=0;       //用于放查询记录的条数
    // public Integer newsum=0;     //用于记录条数
    public Object data;            //用于返回复杂数据
    // public  String msgN;       //返回单体编号
    // public String msgV;        //返回单体电压
    // public  String msgO;
    // public String msgT;
    // public Float lowCA;        //返回告警阈值
    // public Float lowCH;        //返回更换阈值
    // public Float lowRA;        //返回电导的告警阈值
    // public Float lowRH;        //返回电导的更换阈值
    public Object data;            //用于返回复杂数据
    public Integer getSum() {
        return sum;
src/main/java/com/fgkj/services/Alarm_paramService.java
@@ -21,7 +21,15 @@
    public ServiceModel add(Alarm_param param){
        ServiceModel model = new ServiceModel();
        Boolean bl=mapper.add(param)>0;
        Boolean bl= null;
        try {
            bl = mapper.add(param)>0;
        } catch (Exception e) {
            e.printStackTrace();
            model.setCode(0);
            model.setMsg("添加失败!");
            return model;
        }
        if(bl){
            model.setCode(1);
            model.setMsg("添加成功!");
@@ -34,30 +42,37 @@
    //编辑参数
    public ServiceModel update(Alarm_param param){
        ServiceModel model = new ServiceModel();
        Boolean bl=mapper.update(param)>0;
        if(bl){
            //告警参数修改成功后重启服务
            int alarm_id=param.getAlm_id();
            Process_survey process=new Process_survey();
            if(alarm_id==AlarmDaoFactory.Alarm_CapAlarm||
               alarm_id== AlarmDaoFactory.Alarm_CapChange){
                //将落后单体的服务设为重启
                process.setProcessName(ProcessServerDao.BMS_FBSDEV_BADBATT_MON);
                process.setServerFlag(ProcessServerDao.PROCESS_OFF);
                //将processTemp参数暂存在num中
                process.setNum(ProcessServerDao.PROCESS_TEMP);
                Boolean b=surveyMapper.update(process);
        try {
            Boolean bl=mapper.update(param)>0;
            if(bl){
                //告警参数修改成功后重启服务
                int alarm_id=param.getAlm_id();
                Process_survey process=new Process_survey();
                if(alarm_id==AlarmDaoFactory.Alarm_CapAlarm||
                   alarm_id== AlarmDaoFactory.Alarm_CapChange){
                    //将落后单体的服务设为重启
                    process.setProcessName(ProcessServerDao.BMS_FBSDEV_BADBATT_MON);
                    process.setServerFlag(ProcessServerDao.PROCESS_OFF);
                    //将processTemp参数暂存在num中
                    process.setNum(ProcessServerDao.PROCESS_TEMP);
                    Boolean b=surveyMapper.update(process);
                }else{
                    //将电池告警的服务设为重启
                    process.setProcessName(ProcessServerDao.BMS_FBSDEV_ALARM_BATT);
                    Boolean b=surveyMapper.update(process);
                }
                model.setCode(1);
                model.setMsg("修改成功!");
            }else{
                //将电池告警的服务设为重启
                process.setProcessName(ProcessServerDao.BMS_FBSDEV_ALARM_BATT);
                Boolean b=surveyMapper.update(process);
                model.setCode(0);
                model.setMsg("修改失败!");
            }
            model.setCode(1);
            model.setMsg("修改成功!");
        }else{
        } catch (Exception e) {
            e.printStackTrace();
            model.setCode(0);
            model.setMsg("修改失败!");
            return model;
        }
        return model;
    }
src/main/java/com/fgkj/services/AnnounceService.java
@@ -23,7 +23,14 @@
    //发布新公告
    public ServiceModel add(Announce a) {
        ServiceModel model = new ServiceModel();
        Boolean bl=mapper.add(a)>0;
        Boolean bl= null;
        try {
            bl = mapper.add(a)>0;
        } catch (Exception e) {
            e.printStackTrace();
            model.setMsg("添加失败!");
            return model;
        }
        if(bl){
            model.setCode(1);
            model.setMsg("添加成功!");
src/main/java/com/fgkj/services/BadBatt_mon_flagService.java
@@ -15,7 +15,15 @@
    //往标识表中插入一笔数据
    public ServiceModel add(BadBatt_mon_flag monFlag) {
        ServiceModel model = new ServiceModel();
        Boolean bl=mapper.add(monFlag)>0;
        Boolean bl= null;
        try {
            bl = mapper.add(monFlag)>0;
        } catch (Exception e) {
            e.printStackTrace();
            model.setCode(0);
            model.setMsg("添加失败!");
            return model;
        }
        if(bl){
            model.setCode(1);
            model.setMsg("添加成功!");
src/main/java/com/fgkj/services/ram/Fbs9100_setparamService.java
@@ -71,7 +71,7 @@
        }
        return model;    
    }
     //弹出框的确定操作
     //弹出框的确定操作 db_ram_db.tb_Fbs9100_setparam无数据
    public ServiceModel update(Fbs9100_setparam fsparam) {
        ServiceModel model = new ServiceModel();
        Boolean b=mapper.update(fsparam)>0;
@@ -183,7 +183,7 @@
    //根据机房编号和维护区查询放电机房的信息和放电参数
    public ServiceModel serchByCondition(BattInf binf){
        ServiceModel model = new ServiceModel();
        Integer dev_id=battInfMapper.serchDev_id(binf);
        Integer dev_id=battInfMapper.serchDev_id(binf);    //db_ram_db.tb_fbs9100_setparam have no data
        if (null==dev_id){
            dev_id=-1;
        }
@@ -277,13 +277,15 @@
                //执行fbs9600查询
                fbs9100 =mapper.getFbs9600ByInfo(battInf);
            }
            list.add(fbs9100);
            if (fbs9100!=null){
                list.add(fbs9100);
            }
        }
        if(list!=null && list.size()>0){
        if (list != null && list.size() > 0) {
            model.setCode(1);
            model.setData(list);
            model.setMsg("查询成功!");
        }else{
        } else {
            model.setCode(0);
            model.setMsg("查询失败!");
        }