添加设备状态

kaiyu

2020-09-28 1fde1270af7b37209a2b51a214229bacf80662f9

添加设备状态

 src/main/java/com/moral/webSocketServer/BSWebsocketServer.java

@@ -161,6 +161,7 @@
            if(mac.equals(device.getMac())){
                map.put("纬度",device.getLatitude());
                map.put("经度",device.getLongitude());
                map.put("状态",device.getState());
                break;
            }
        }

 src/main/resources/mapper/DeviceMapper.xml

@@ -484,7 +484,7 @@
    </select>

    <select id="selectDevicesAll" parameterType="java.util.Map" resultType="com.moral.entity.Device">
        SELECT dev.id,dev.mac,dev.longitude,dev.latitude,dev.device_version_id deviceVersionId from device dev
        SELECT dev.id,dev.state,dev.mac,dev.longitude,dev.latitude,dev.device_version_id deviceVersionId from device dev
        left join monitor_point mpt on dev.monitor_point_id = mpt.id
        <where>
            <if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">