【更新】 iot.vwp表统一加前缀 补漏

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/DeviceChannelMapper.java

@@ -91,9 +91,9 @@ public interface DeviceChannelMapper {
             "SELECT * FROM ( "+
                 " SELECT dc.channelId, dc.deviceId, dc.name, de.manufacturer, de.hostAddress, " +
                 "(SELECT count(0) FROM vmp_device_channel WHERE parentId=dc.channelId) as subCount, " +
-                "(SELECT pc.platformId FROM platform_gb_channel pc WHERE pc.deviceId=dc.deviceId AND pc.channelId = dc.channelId ) as platformId " +
+                "(SELECT pc.platformId FROM vmp_platform_gb_channel pc WHERE pc.deviceId=dc.deviceId AND pc.channelId = dc.channelId ) as platformId " +
                 "FROM vmp_device_channel dc " +
-                "LEFT JOIN device de ON dc.deviceId = de.deviceId " +
+                "LEFT JOIN vmp_device de ON dc.deviceId = de.deviceId " +
                 " WHERE 1=1 " +
                 " <if test=\"query != null\"> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
                 " <if test=\"online == true\" > AND dc.status=1</if> " +

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/DeviceMapper.java

@@ -76,7 +76,7 @@ public interface DeviceMapper {
             " </script>"})
     int update(Device device);
 
-    @Select("SELECT *, (SELECT count(0) FROM device_channel WHERE deviceId=de.deviceId) as channelCount FROM vmp_device de")
+    @Select("SELECT *, (SELECT count(0) FROM vmp_device_channel WHERE deviceId=de.deviceId) as channelCount FROM vmp_device de")
     List<Device> getDevices();
 
     @Delete("DELETE FROM vmp_device WHERE deviceId=#{deviceId}")

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/RoleMapper.java

@@ -10,12 +10,12 @@ import java.util.List;
 @Repository
 public interface RoleMapper {
 
-    @Insert("INSERT INTO  vmp_role (name, authority, createTime, updateTime) VALUES" +
+    @Insert("INSERT INTO vmp_role (name, authority, createTime, updateTime) VALUES" +
             "('${name}', '${authority}', '${createTime}', '${updateTime}')")
     int add(Role role);
 
     @Update(value = {" <script>" +
-            "UPDATE  vmp_role " +
+            "UPDATE vmp_role " +
             "SET updateTime='${updateTime}' " +
             "<if test=\"name != null\">, name='${name}'</if>" +
             "<if test=\"authority != null\">, authority='${authority}'</if>" +
@@ -23,10 +23,10 @@ public interface RoleMapper {
             " </script>"})
     int update(Role role);
 
-    @Delete("DELETE FROM  vmp_role WHERE  id != 1 and id=#{id}")
+    @Delete("DELETE FROM vmp_role WHERE  id != 1 and id=#{id}")
     int delete(int id);
 
-    @Select("select * FROM  vmp_role WHERE id=#{id}")
+    @Select("select * FROM vmp_role WHERE id=#{id}")
     Role selectById(int id);
 
     @Select("select * FROM vmp_role")