fix

zhanzhiqin

2021-11-30 77d75870f40cc677c7652c7d8694da1d7eb45834

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java

@@ -35,22 +35,26 @@
     */
    public List<Monitor> listMonitorByKeyword(MonitorParam monitorParam) {
        //设备状态:在线/离线/全部
        String equipmentState1;
        String equipmentState2;
        if ("全部".equals(monitorParam.getEquipmentState())) {
            equipmentState1 = "在线";
            equipmentState2 = "离线";
        int equipmentState1;
        int equipmentState2;
        if (2 == monitorParam.getEquipmentState()) {
            //在线
            equipmentState1 = 1;
            //离线
            equipmentState2 = 0;
        } else {
            equipmentState1 = monitorParam.getEquipmentState();
            equipmentState2 = monitorParam.getEquipmentState();
        }

        //绑定状态：已绑定/未绑定/全部
        String bindingState1;
        String bindingState2;
        if ("全部".equals(monitorParam.getBindingState())) {
            bindingState1 = "已绑定";
            bindingState2 = "未绑定";
        int bindingState1;
        int bindingState2;
        if (2 == monitorParam.getBindingState()) {
            //已绑定
            bindingState1 = 1;
            //未绑定
            bindingState2 = 0;
        } else {
            bindingState1 = monitorParam.getBindingState();
            bindingState2 = monitorParam.getBindingState();
@@ -71,7 +75,6 @@
        }
        return removeById(Id);
    }



}