fix

zhanzhiqin

2021-12-27 d9035580bfaa4d8ad0f6060f4cd6a58ebc452df7

fix

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

@@ -10,6 +10,8 @@
public interface MonitorMapper extends BaseMapper<Monitor> {
    List<Monitor> listMonitorByKeyword(String keyword, int equipmentState1, int equipmentState2,
                                       int bindingState1, int bindingState2);

    List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);
}



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

@@ -5,27 +5,52 @@
<mapper namespace="com.sandu.ximon.dao.mapper.MonitorMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.Monitor">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="deviceSerial" column="device_serial" jdbcType="VARCHAR"/>
            <result property="devicesCode" column="devices_code" jdbcType="VARCHAR"/>
            <result property="deviceName" column="device_name" jdbcType="VARCHAR"/>
            <result property="deviceType" column="device_type" jdbcType="VARCHAR"/>
            <result property="equipmentStatus" column="equipment_status" jdbcType="INTEGER"/>
            <result property="isEncrypt" column="is_encrypt" 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="addTime" column="add_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="netAddress" column="net_address" jdbcType="VARCHAR"/>
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="deviceSerial" column="device_serial" jdbcType="VARCHAR"/>
        <result property="devicesCode" column="devices_code" jdbcType="VARCHAR"/>
        <result property="deviceName" column="device_name" jdbcType="VARCHAR"/>
        <result property="deviceType" column="device_type" jdbcType="VARCHAR"/>
        <result property="equipmentStatus" column="equipment_status" jdbcType="INTEGER"/>
        <result property="isEncrypt" column="is_encrypt" 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="addTime" column="add_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <result property="netAddress" column="net_address" jdbcType="VARCHAR"/>
    </resultMap>
    <select id="listMonitorByKeyword" resultType="com.sandu.ximon.dao.domain.Monitor">
        SELECT    * FROM   (SELECT    * FROM    (SELECT    * FROM    monitor AS table1
              WHERE serial_number  LIKE CONCAT(CONCAT('%', #{keyword}), '%')
              OR belong_to  LIKE CONCAT(CONCAT('%', #{keyword}), '%')) AS table2
         WHERE equipment_state = #{equipmentState1}
         OR equipment_state = #{equipmentState2}) AS table3
              WHERE device_serial  LIKE CONCAT(CONCAT('%', #{keyword}), '%')
              ) AS table2
         WHERE equipment_status = #{equipmentState1}
         OR equipment_status = #{equipmentState2}) AS table3
        WHERE binding_state = #{bindingState1} OR binding_state = #{bindingState2};
    </select>
    <select id="listMonitorByKeyword1" resultType="com.sandu.ximon.dao.domain.Monitor">
        SELECT
            t1.*, t2.pole_id,
            t3.pole_name
        FROM
            monitor t1
        LEFT JOIN pole_binding t2 ON t1.device_serial = t2.device_code
        AND t2.device_type = 7
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
        WHERE
            t1.device_serial  LIKE CONCAT(CONCAT('%', #{keyword}), '%')
        OR t2.pole_id LIKE CONCAT(CONCAT('%', #{keyword}), '%')
        OR t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
        AND binding_state = #{bindingState1}
        OR binding_state = #{bindingState2})
        ORDER BY
            t1.id DESC
    </select>


</mapper>
        <!--        SELECT    * FROM   (SELECT    * FROM    (SELECT    * FROM    monitor AS table1-->
        <!--        WHERE device_serial  LIKE CONCAT(CONCAT('%', #{keyword}), '%')-->
        <!--        OR belong_to  LIKE CONCAT(CONCAT('%', #{keyword}), '%')) AS table2-->
        <!--        WHERE equipment_status = #{equipmentState1}-->
        <!--        OR equipment_status = #{equipmentState2}) AS table3-->
        <!--        WHERE binding_state = #{bindingState1} OR binding_state = #{bindingState2};-->

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

@@ -80,7 +80,8 @@
            bindingState1 = monitorParam.getBindingState();
            bindingState2 = monitorParam.getBindingState();
        }
        return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
//        return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
        return monitorMapper.listMonitorByKeyword1(monitorParam.getKeyword(), bindingState1, bindingState2);
    }

    /**

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

@@ -1,5 +1,7 @@
package com.sandu.ximon.admin.service;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.dao.domain.PoleBinding;
@@ -22,13 +24,21 @@
        Integer deviceType = param.getDeviceType();
//        if (PoleBindingEnums.LIGHT.getCode().equals(deviceType)) {
//        }
        PoleBinding poleBinding = new PoleBinding();
        poleBinding.setPoleId(poleId);
        poleBinding.setDeviceType(deviceType);
        poleBinding.setDeviceName(param.getDeviceName());
        poleBinding.setDeviceCode(param.getDeviceCode());
        return save(poleBinding);

        PoleBinding one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, param.getDeviceCode()));
        if (one == null) {
            PoleBinding poleBinding = new PoleBinding();
            poleBinding.setPoleId(poleId);
            poleBinding.setDeviceType(deviceType);
            poleBinding.setDeviceName(param.getDeviceName());
            poleBinding.setDeviceCode(param.getDeviceCode());
            return save(poleBinding);
        } else {
            throw new BusinessException("该设备已绑定过");
        }


//        return false;

    }
}

 ximon-admin/src/main/resources/application-dev.yml

@@ -14,7 +14,7 @@
    password: chenjiantian1992 # Redis服务器连接密码（默认为空）
    timeout: 300ms # 连接超时时间（毫秒）
server:
  port: 20017
  port: 8080
sandu:
  jwt:
    header: Authorization