From 34ccc4ae6b10b30c391ba7738c15059bbf676f59 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 三月 2023 14:03:41 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/PublishService.java       |    2 +-
 src/main/java/com/lf/server/controller/data/PublishController.java |    4 ++--
 src/main/java/com/lf/server/mapper/data/PublishMapper.java         |    2 +-
 src/main/resources/mapper/show/PublishMapper.xml                   |   10 +---------
 data/db_tab.sql                                                    |    2 +-
 data/db_cx.sql                                                     |    6 +++---
 src/main/java/com/lf/server/entity/data/MetaEntity.java            |   10 ++++++++++
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/data/db_cx.sql b/data/db_cx.sql
index 9c4ddb2..0cd8cd7 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -26,9 +26,9 @@
 where id = 7
 
 insert into lf.sys_meta_pub (id,metaid,pubid) values (1,1,1);
-insert into lf.sys_publish (id,name) values (1,'Test');
-
-
+insert into lf.sys_publish (id,name,type,dirid,depid) values (1,'Test','0102','000305');
+select a.* from lf.sys_publish a
+select * from lf.sys_meta order by id desc limit 20;
 
 
 
diff --git a/data/db_tab.sql b/data/db_tab.sql
index 853bdf3..4aac80c 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -1256,7 +1256,7 @@
   dirid varchar(24),
   depid varchar(24),
   min integer default 0,
-  max integer default 20,
+  max integer default 0,
   json varchar(2048),
   create_user integer default 1,
   create_time timestamp(6) without time zone default now(),
diff --git a/src/main/java/com/lf/server/controller/data/PublishController.java b/src/main/java/com/lf/server/controller/data/PublishController.java
index 4084de5..c012f21 100644
--- a/src/main/java/com/lf/server/controller/data/PublishController.java
+++ b/src/main/java/com/lf/server/controller/data/PublishController.java
@@ -153,7 +153,7 @@
     @SysLog()
     @ApiOperation(value = "鍒犻櫎澶氭潯")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
+            @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", allowMultiple = true, example = "1")
     })
     @GetMapping(value = "/deletes")
     public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids) {
@@ -162,7 +162,7 @@
                 return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
             }
 
-            int count = publishService.deletes(ids);
+            int count = publishService.deletes(StringHelper.join(ids, ","));
 
             return success(count);
         } catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/entity/data/MetaEntity.java b/src/main/java/com/lf/server/entity/data/MetaEntity.java
index 1439618..1515fd2 100644
--- a/src/main/java/com/lf/server/entity/data/MetaEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaEntity.java
@@ -66,6 +66,8 @@
 
     private Timestamp lastTime;
 
+    private String url;
+
     public MetaEntity() {
     }
 
@@ -292,4 +294,12 @@
     public void setLastTime(Timestamp lastTime) {
         this.lastTime = lastTime;
     }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
 }
diff --git a/src/main/java/com/lf/server/mapper/data/PublishMapper.java b/src/main/java/com/lf/server/mapper/data/PublishMapper.java
index 29500b5..83d6c19 100644
--- a/src/main/java/com/lf/server/mapper/data/PublishMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/PublishMapper.java
@@ -77,7 +77,7 @@
      * @param ids
      * @return
      */
-    public Integer deletes(List<Integer> ids);
+    public Integer deletes(String ids);
 
     /**
      * 鏇存柊涓�鏉�
diff --git a/src/main/java/com/lf/server/service/data/PublishService.java b/src/main/java/com/lf/server/service/data/PublishService.java
index f9dcbaa..9b4306e 100644
--- a/src/main/java/com/lf/server/service/data/PublishService.java
+++ b/src/main/java/com/lf/server/service/data/PublishService.java
@@ -58,7 +58,7 @@
     }
 
     @Override
-    public Integer deletes(List<Integer> ids) {
+    public Integer deletes(String ids) {
         return publishMapper.deletes(ids);
     }
 
diff --git a/src/main/resources/mapper/show/PublishMapper.xml b/src/main/resources/mapper/show/PublishMapper.xml
index 1b0beff..515570c 100644
--- a/src/main/resources/mapper/show/PublishMapper.xml
+++ b/src/main/resources/mapper/show/PublishMapper.xml
@@ -22,7 +22,7 @@
 
     <select id="selectMetasByPage" resultType="com.lf.server.entity.data.MetaEntity">
         select
-            (select c.url from lf.sys_meta_pub b inner join lf.sys_publish c on b.pubid = c.id where b.metaid = a.id limit 1) "layer",
+            (select c.url from lf.sys_meta_pub b inner join lf.sys_publish c on b.pubid = c.id where b.metaid = a.id limit 1) "url",
             (select ST_AsText(c.geom) from lf.sys_meta_pub b inner join lf.sys_publish c on b.pubid = c.id where b.metaid = a.id limit 1) "geom",
             a.*, fn_uname(a.create_user) uname, fn_get_fullname(a.depcode, 1) depName, fn_get_fullname(a.dircode, 2) dirName, fn_ver(a.verid) verName
         from lf.sys_meta a
@@ -97,14 +97,6 @@
     </delete>
 
     <delete id="deletes">
-
-
-
-        delete from lf.sys_publish where id in
-        <foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-
         delete from lf.sys_meta_pub where pubid in (${ids});
         delete from lf.sys_publish where id in (${ids});
     </delete>

--
Gitblit v1.9.3