Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/DataShare/Controller/DataShareController.java

@@ -29,8 +29,8 @@ public class DataShareController extends Controller {
     @IsLoginInterface({})
     @IsSysAdminInterface({"1"})
     @IsNumericInterface({"page", "limit"})
-    public void listSystem(String keyword, int page, int limit) {
-        Page<Record> dt = dm.listSystem(keyword, page, limit);
+    public void listSystem(String keyword,int exclude, int page, int limit) {
+        Page<Record> dt = dm.listSystem(keyword,exclude, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(dt));
     }
 

src/main/java/com/dsideal/QingLong/DataShare/Model/DataShareModel.java

@@ -12,9 +12,12 @@ import com.jfinal.plugin.activerecord.SqlPara;
 import java.util.List;
 
 public class DataShareModel {
-    public Page<Record> listSystem(String keyword, int page, int limit) {
+    public Page<Record> listSystem(String keyword, int exclude, int page, int limit) {
         if (StrKit.isBlank(keyword)) keyword = "";
         Kv kv = Kv.by("keyword", keyword);
+        if (exclude > 0) {
+            kv.set("exclude", exclude);
+        }
         SqlPara sp = Db.getSqlPara("DataShare.listSystem", kv);
         return Db.paginate(page, limit, sp);
     }
@@ -45,6 +48,7 @@ public class DataShareModel {
 
     /**
      * 功能：删除系统
+     *
      * @param system_id
      */
     public void delSystem(int system_id) {
@@ -56,6 +60,7 @@ public class DataShareModel {
 
     /**
      * 功能：更新系统
+     *
      * @param system_id
      * @param system_name
      */
@@ -66,6 +71,7 @@ public class DataShareModel {
 
     /**
      * 功能：获取系统信息
+     *
      * @param system_id
      * @return
      */

src/main/java/com/dsideal/QingLong/Util/PgUtil.java

@@ -90,13 +90,18 @@ public class PgUtil {
 
     /**
      * 功能：判断一个表是不是存在
+     *
      * @param table_name
      * @return
      */
     public static boolean isExistTable(String table_name) {
-        String sql = "SELECT * FROM pg_tables WHERE tablename = ?";
-        List<Record> list = Db.find(sql, table_name);
-        return !list.isEmpty();
+        String sql = "SELECT count(1) as c FROM pg_tables WHERE tablename = ?";
+        int sum = Db.findFirst(sql, table_name).getInt("c");
+        if (sum > 0) return true;
+        //如果是视图
+        sql = "select  count(1) as c from pg_views WHERE viewname = ?";
+        sum = Db.findFirst(sql, table_name).getInt("c");
+        return sum > 0;
     }
 
     //写权限

src/main/resource/Sql/DataShare.sql

@@ -1,6 +1,10 @@
 #namespace("DataShare")
     #sql("listSystem")
         select t1.*  from t_datashare_system as t1 where
-            t1.system_name like #para(keyword, "like")   order by t1.system_id desc
+            t1.system_name like #para(keyword, "like")
+            #if(exclude)
+              and t1.system_id<>#para(exclude)
+            #end
+            order by t1.sort_id,t1.system_id desc
     #end
 #end