From 061749548c0b603774582f823768c23f351a39e1 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 五月 2023 11:23:48 +0800
Subject: [PATCH] 修复字段名错误

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java
index 59ecdbc..19e7d1a 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java
@@ -1,9 +1,7 @@
 package com.genersoft.iot.vmp.storager.dao;
 
-import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.gb28181.bean.PlatformCatalog;
-import com.genersoft.iot.vmp.gb28181.bean.PlatformGbStream;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
@@ -14,22 +12,23 @@
 @Repository
 public interface PlatformCatalogMapper {
 
-    @Insert("INSERT INTO platform_catalog (id, name, platformId, parentId) VALUES" +
-            "(#{id}, #{name}, #{platformId}, #{parentId})")
+    @Insert("INSERT INTO platform_catalog (id, name, platform_id, parent_id, civil_code, business_group_id) VALUES" +
+            "(#{id}, #{name}, #{platformId}, #{parentId}, #{civilCode}, #{businessGroupId})")
     int add(PlatformCatalog platformCatalog);
 
-    @Delete("DELETE FROM platform_catalog WHERE id=#{id}")
+    @Delete("DELETE from wvp_platform_catalog WHERE id=#{id}")
     int del(String id);
 
-    @Delete("DELETE FROM platform_catalog WHERE platformId=#{platformId}")
+    @Delete("DELETE from wvp_platform_catalog WHERE platform_id=#{platformId}")
     int delByPlatformId(String platformId);
 
-    @Select("SELECT pc.*, count(pc2.id) as childrenCount FROM platform_catalog pc " +
-            "left join platform_catalog pc2 on pc.id = pc2.parentId " +
-            "WHERE pc.parentId=#{parentId} AND pc.platformId=#{platformId} group by pc.id")
+    @Select("SELECT pc.*, count(pc2.id) as children_count from wvp_platform_catalog pc " +
+            "left join wvp_platform_catalog pc2 on pc.id = pc2.parent_id " +
+            "WHERE pc.parent_id=#{parentId} AND pc.platform_id=#{platformId} " +
+            "group by pc.id, pc.name, pc.platform_id, pc.business_group_id, pc.civil_code, pc.parent_id")
     List<PlatformCatalog> selectByParentId(String platformId, String parentId);
 
-    @Select("SELECT *, (SELECT COUNT(1) from platform_catalog where parentId = pc.id) as childrenCount  FROM platform_catalog pc WHERE pc.id=#{id}")
+    @Select("SELECT *, (SELECT COUNT(1) from wvp_platform_catalog where parent_id = pc.id) as children_count  from wvp_platform_catalog pc WHERE pc.id=#{id}")
     PlatformCatalog select(String id);
 
     @Update(value = {" <script>" +
@@ -39,6 +38,17 @@
             "</script>"})
     int update(PlatformCatalog platformCatalog);
 
-    @Select("SELECT *, (SELECT COUNT(1) from platform_catalog where parentId = pc.id) as childrenCount  FROM platform_catalog pc WHERE pc.platformId=#{platformId}")
+    @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}")
     List<PlatformCatalog> selectByPlatForm(String platformId);
+
+    @Select("SELECT pc.* FROM  platform_catalog pc WHERE pc.id = (SELECT pp.catalog_id from wvp_platform pp WHERE pp.server_gb_id=#{platformId})")
+    PlatformCatalog selectDefaultByPlatFormId(String platformId);
+
+
+    @Select("SELECT pc.* FROM  platform_catalog pc WHERE pc.id = #{id}")
+    PlatformCatalog selectParentCatalog(String id);
+
+    @Select("SELECT pc.id as channel_id, pc.name, pc.civil_code, pc.business_group_id,'1' as parental, pc.parent_id  " +
+            " from wvp_platform_catalog pc WHERE pc.platform_id=#{platformId}")
+    List<DeviceChannel> queryCatalogInPlatform(String platformId);
 }

--
Gitblit v1.8.0