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

‘sxh’

2023-06-15 ccc0a99d6894844d83d751b924cfebe74da7826c

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

@@ -43,6 +43,7 @@
            "tree_type," +
            "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);
@@ -161,6 +162,7 @@
            "tree_type,"+
            "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 on_line=${onLine}</if>"+
@@ -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>"})
@@ -271,7 +274,8 @@
            "geo_coord_sys,"+
            "tree_type,"+
            "on_line,"+
            "media_server_id"+
            "media_server_id,"+
            "switch_primary_sub_stream"+
            ") VALUES (" +
            "#{deviceId}," +
            "#{name}," +
@@ -285,7 +289,8 @@
            "#{geoCoordSys}," +
            "#{treeType}," +
            "#{onLine}," +
            "#{mediaServerId}" +
            "#{mediaServerId}," +
            "#{switchPrimarySubStream}" +
            ")")
    void addCustomDevice(Device device);