同步主线的代码，保持一致性

‘sxh’

2023-06-15 ccc0a99d6894844d83d751b924cfebe74da7826c

 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java

@@ -41,8 +41,9 @@
            "as_message_channel," +
            "geo_coord_sys," +
            "tree_type," +
            "online," +
            "on_line," +
            "media_server_id," +
            "switch_primary_sub_stream," +
            "(SELECT count(0) FROM wvp_device_channel WHERE device_id=wvp_device.device_id) as channel_count "+
            " FROM wvp_device WHERE device_id = #{deviceId}")
    Device getDeviceByDeviceId(String deviceId);
@@ -75,7 +76,7 @@
                "as_message_channel,"+
                "geo_coord_sys,"+
                "tree_type,"+
                "online"+
                "on_line"+
            ") VALUES (" +
                "#{deviceId}," +
                "#{name}," +
@@ -104,7 +105,7 @@
                "#{asMessageChannel}," +
                "#{geoCoordSys}," +
                "#{treeType}," +
                "#{online}" +
                "#{onLine}" +
            ")")
    int add(Device device);

@@ -120,7 +121,7 @@
                "<if test=\"localIp != null\">, local_ip=#{localIp}</if>" +
                "<if test=\"port != null\">, port=#{port}</if>" +
                "<if test=\"hostAddress != null\">, host_address=#{hostAddress}</if>" +
                "<if test=\"online != null\">, online=#{online}</if>" +
                "<if test=\"onLine != null\">, on_line=#{onLine}</if>" +
                "<if test=\"registerTime != null\">, register_time=#{registerTime}</if>" +
                "<if test=\"keepaliveTime != null\">, keepalive_time=#{keepaliveTime}</if>" +
                "<if test=\"keepaliveIntervalTime != null\">, keepalive_interval_time=#{keepaliveIntervalTime}</if>" +
@@ -159,15 +160,16 @@
            "as_message_channel,"+
            "geo_coord_sys,"+
            "tree_type,"+
            "online,"+
            "on_line,"+
            "media_server_id,"+
            "switch_primary_sub_stream switchPrimarySubStream,"+
            "(SELECT count(0) FROM wvp_device_channel WHERE device_id=de.device_id) as channel_count " +
            "FROM wvp_device de" +
            "<if test=\"online != null\"> where online=${online}</if>"+
            "<if test=\"onLine != null\"> where on_line=${onLine}</if>"+
            " order by create_time desc "+
            " </script>"
    )
    List<Device> getDevices(Boolean online);
    List<Device> getDevices(Boolean onLine);

    @Delete("DELETE FROM wvp_device WHERE device_id=#{deviceId}")
    int del(String deviceId);
@@ -200,8 +202,8 @@
            "as_message_channel,"+
            "geo_coord_sys,"+
            "tree_type,"+
            "online"+
            " FROM wvp_device WHERE online = true")
            "on_line"+
            " FROM wvp_device WHERE on_line = true")
    List<Device> getOnlineDevices();
    @Select("SELECT " +
            "device_id,"+
@@ -231,7 +233,7 @@
            "as_message_channel,"+
            "geo_coord_sys,"+
            "tree_type,"+
            "online"+
            "on_line"+
            " FROM wvp_device WHERE ip = #{host} AND port=#{port}")
    Device getDeviceByHostAndPort(String host, int port);

@@ -253,6 +255,7 @@
            "<if test=\"asMessageChannel != null\">, as_message_channel=#{asMessageChannel}</if>" +
            "<if test=\"geoCoordSys != null\">, geo_coord_sys=#{geoCoordSys}</if>" +
            "<if test=\"treeType != null\">, tree_type=#{treeType}</if>" +
            "<if test=\"switchPrimarySubStream != null\">, switch_primary_sub_stream=#{switchPrimarySubStream}</if>" +
            "<if test=\"mediaServerId != null\">, media_server_id=#{mediaServerId}</if>" +
            "WHERE device_id=#{deviceId}"+
            " </script>"})
@@ -270,8 +273,9 @@
            "as_message_channel,"+
            "geo_coord_sys,"+
            "tree_type,"+
            "online,"+
            "media_server_id"+
            "on_line,"+
            "media_server_id,"+
            "switch_primary_sub_stream"+
            ") VALUES (" +
            "#{deviceId}," +
            "#{name}," +
@@ -284,8 +288,9 @@
            "#{asMessageChannel}," +
            "#{geoCoordSys}," +
            "#{treeType}," +
            "#{online}," +
            "#{mediaServerId}" +
            "#{onLine}," +
            "#{mediaServerId}," +
            "#{switchPrimarySubStream}" +
            ")")
    void addCustomDevice(Device device);