fix

zhanzhiqin

2021-11-30 77d75870f40cc677c7652c7d8694da1d7eb45834

fix

 dao/src/main/java/com/sandu/ximon/dao/domain/AdvisementPlayer.java

@@ -20,9 +20,9 @@
    //所属灯杆
    private String belongTo;
    //设备状态:在线/离线
    private String equipmentState;
    private int equipmentState;
    //绑定状态：已绑定/未绑定
    private String bindingState;
    private int bindingState;
    //执行的任务
    private String task;
    //接入时间

 dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java

@@ -23,12 +23,12 @@
    private String belongTo;
    //地址
    private String address;
    //设备状态:在线/离线
    private String equipmentState;
    //工作状态：正常使用/禁止使用
    private String workState;
    //绑定状态：已绑定/未绑定
    private String bindingState;
    //设备状态:在线:1/离线:0
    private int equipmentState;
    //工作状态：正常使用:1/禁止使用:0
    private int workState;
    //绑定状态：已绑定:1/未绑定:0
    private int bindingState;
    //备注
    private String note;
    //接入时间

 dao/src/main/java/com/sandu/ximon/dao/mapper/AdvisementPlayerMapper.java

@@ -8,6 +8,6 @@

@Mapper
public interface AdvisementPlayerMapper extends BaseMapper<AdvisementPlayer> {
    List<AdvisementPlayer> listAdvisementPlayerByKeyword(String keyword, String equipmentState1, String equipmentState2,
                                       String bindingState1, String bindingState2);
    List<AdvisementPlayer> listAdvisementPlayerByKeyword(String keyword, int equipmentState1, int equipmentState2,
                                                         int bindingState1, int bindingState2);
}

 dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java

@@ -8,6 +8,6 @@

@Mapper
public interface MonitorMapper extends BaseMapper<Monitor> {
    List<Monitor> listMonitorByKeyword(String keyword, String equipmentState1, String equipmentState2,
                          String bindingState1, String bindingState2);
    List<Monitor> listMonitorByKeyword(String keyword, int equipmentState1, int equipmentState2,
                                       int bindingState1, int bindingState2);
}

 dao/src/main/resources/mapper/AdvisementPlayerMapper.xml

@@ -8,8 +8,8 @@
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="macAddress" column="mac_address" jdbcType="VARCHAR"/>
        <result property="belongTo" column="belong_to" jdbcType="VARCHAR"/>
        <result property="equipmentState" column="equipment_state" jdbcType="VARCHAR"/>
        <result property="bindingState" column="binding_state" jdbcType="VARCHAR"/>
        <result property="equipmentState" column="equipment_state" jdbcType="INTEGER"/>
        <result property="bindingState" column="binding_state" jdbcType="INTEGER"/>
        <result property="task" column="task" jdbcType="VARCHAR"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>

 dao/src/main/resources/mapper/MonitorMapper.xml

@@ -10,9 +10,9 @@
        <result property="serialNumber" column="serial_number" jdbcType="VARCHAR"/>
        <result property="belongTo" column="belong_to" jdbcType="VARCHAR"/>
        <result property="address" column="address" jdbcType="VARCHAR"/>
        <result property="equipmentState" column="equipment_state" jdbcType="VARCHAR"/>
        <result property="workState" column="work_state" jdbcType="VARCHAR"/>
        <result property="bindingState" column="binding_state" jdbcType="VARCHAR"/>
        <result property="equipmentState" column="equipment_state" jdbcType="INTEGER"/>
        <result property="workState" column="work_state" jdbcType="INTEGER"/>
        <result property="bindingState" column="binding_state" jdbcType="INTEGER"/>
        <result property="note" column="note" jdbcType="VARCHAR"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/AdvisementPlayerParam.java

@@ -9,7 +9,7 @@

    private String keyword;
    @NotEmpty
    private String equipmentState;
    private int equipmentState;
    @NotEmpty
    private String bindingState;
    private int bindingState;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java

@@ -9,7 +9,7 @@

    private String keyword;
    @NotEmpty
    private String equipmentState;
    private int equipmentState;
    @NotEmpty
    private String bindingState;
    private int bindingState;
}

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

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

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



}

 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);
    }



}