guzijian / wvp-GB28181-pro · Commits

Commit b7d85a270e58daf8abd1bc165f79fee27747d688

Authored by 648540858
1 parent 8d6de724

修复添加目录SQL错误 #881

Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java
  View file @b7d85a2
@@ -12,7 +12,7 @@ import java.util.List; @@ -12,7 +12,7 @@ import java.util.List;
12 @Repository 12 @Repository
13 public interface PlatformCatalogMapper { 13 public interface PlatformCatalogMapper {
14 14
15 - @Insert("INSERT INTO platform_catalog (id, name, platform_id, parent_id, civil_code, business_group_id) VALUES" + 15 + @Insert("INSERT INTO wvp_platform_catalog (id, name, platform_id, parent_id, civil_code, business_group_id) VALUES" +
16 "(#{id}, #{name}, #{platformId}, #{parentId}, #{civilCode}, #{businessGroupId})") 16 "(#{id}, #{name}, #{platformId}, #{parentId}, #{civilCode}, #{businessGroupId})")
17 int add(PlatformCatalog platformCatalog); 17 int add(PlatformCatalog platformCatalog);
18 18
@@ -32,7 +32,7 @@ public interface PlatformCatalogMapper { @@ -32,7 +32,7 @@ public interface PlatformCatalogMapper {
32 PlatformCatalog select(String id); 32 PlatformCatalog select(String id);
33 33
34 @Update(value = {" <script>" + 34 @Update(value = {" <script>" +
35 - "UPDATE platform_catalog " + 35 + "UPDATE wvp_platform_catalog " +
36 "SET name=#{name}" + 36 "SET name=#{name}" +
37 "WHERE id=#{id}"+ 37 "WHERE id=#{id}"+
38 "</script>"}) 38 "</script>"})
@@ -41,11 +41,11 @@ public interface PlatformCatalogMapper { @@ -41,11 +41,11 @@ public interface PlatformCatalogMapper {
41 @Select("SELECT *, (SELECT COUNT(1) from wvp_platform_catalog where parent_id = pc.id) as children_count from wvp_platform_catalog pc WHERE pc.platform_id=#{platformId}") 41 @Select("SELECT *, (SELECT COUNT(1) from wvp_platform_catalog where parent_id = pc.id) as children_count from wvp_platform_catalog pc WHERE pc.platform_id=#{platformId}")
42 List<PlatformCatalog> selectByPlatForm(String platformId); 42 List<PlatformCatalog> selectByPlatForm(String platformId);
43 43
44 - @Select("SELECT pc.* FROM platform_catalog pc WHERE pc.id = (SELECT pp.catalog_id from wvp_platform pp WHERE pp.server_gb_id=#{platformId})") 44 + @Select("SELECT pc.* FROM wvp_platform_catalog pc WHERE pc.id = (SELECT pp.catalog_id from wvp_platform pp WHERE pp.server_gb_id=#{platformId})")
45 PlatformCatalog selectDefaultByPlatFormId(String platformId); 45 PlatformCatalog selectDefaultByPlatFormId(String platformId);
46 46
47 47
48 - @Select("SELECT pc.* FROM platform_catalog pc WHERE pc.id = #{id}") 48 + @Select("SELECT pc.* FROM wvp_platform_catalog pc WHERE pc.id = #{id}")
49 PlatformCatalog selectParentCatalog(String id); 49 PlatformCatalog selectParentCatalog(String id);
50 50
51 @Select("SELECT pc.id as channel_id, pc.name, pc.civil_code, pc.business_group_id,'1' as parental, pc.parent_id " + 51 @Select("SELECT pc.id as channel_id, pc.name, pc.civil_code, pc.business_group_id,'1' as parental, pc.parent_id " +
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
  View file @b7d85a2
@@ -356,7 +356,7 @@ public class PlayController { @@ -356,7 +356,7 @@ public class PlayController {
356 message.setKey(key); 356 message.setKey(key);
357 message.setId(uuid); 357 message.setId(uuid);
358 358
359 - String fileName = deviceId + "_" + channelId + "_" + DateUtil.getNowForUrl() + "jpg"; 359 + String fileName = deviceId + "_" + channelId + "_" + DateUtil.getNowForUrl() + ".jpg";
360 playService.getSnap(deviceId, channelId, fileName, (code, msg, data) -> { 360 playService.getSnap(deviceId, channelId, fileName, (code, msg, data) -> {
361 if (code == InviteErrorCode.SUCCESS.getCode()) { 361 if (code == InviteErrorCode.SUCCESS.getCode()) {
362 message.setData(data); 362 message.setData(data);