From f269210744150f6d1482e374e92a6023b79e4e6b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 25 三月 2023 10:16:09 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/show/PublishMapper.xml | 2 +-
src/main/java/com/lf/server/controller/data/MetaController.java | 2 +-
src/main/java/com/lf/server/service/data/MetaService.java | 16 +++++++++++++++-
data/db_cx.sql | 6 ++++--
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 2 +-
src/main/resources/mapper/data/MetaMapper.xml | 2 +-
6 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 8140f35..521d5f3 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -31,9 +31,11 @@
select * from lf.sys_publish order by id desc
select * from lf.sys_meta_pub order by id desc
select * from lf.sys_layer order by id desc limit 10
-select * from lf.sys_meta where name='43_transparent_mosaic.tif'
-select * from bs.u_sectionline
+select * from lf.sys_meta where name='鍕樻帰鐐硅〃.xlsx'
+select * from lf.sys_fme_log
+--where tcdm='u_sectionline'
+order by id desc;
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index 570b643..6554b01 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -271,7 +271,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) {
diff --git a/src/main/java/com/lf/server/controller/data/upload/UploadController.java b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
index c125dd0..0b41714 100644
--- a/src/main/java/com/lf/server/controller/data/upload/UploadController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
@@ -221,7 +221,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 = "/deleteMetas")
public ResponseMsg<Integer> deleteMetas(@RequestParam List<Integer> ids) {
diff --git a/src/main/java/com/lf/server/service/data/MetaService.java b/src/main/java/com/lf/server/service/data/MetaService.java
index c3193ec..414c283 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -176,11 +176,25 @@
pids.add("'" + me.getEventid() + "'");
}
}
-
if (pids.size() > 0) {
list.add(String.format("delete from %s where parentid in (%s)", tab, StringHelper.join(pids, ",")));
}
+ // 鍏宠仈鍒犻櫎
+ int i = 0, c = list.size();
+ while (i < c) {
+ String str = list.get(i);
+ if (str.contains("bs.m_pipelinepoint")) {
+ list.add(str.replace("bs.m_pipelinepoint", "bs.m_pipesegment"));
+ list.add(str.replace("bs.m_pipelinepoint", "bs.m_pipeline"));
+ }
+ if (str.contains("bs.s_explorationpoint")) {
+ list.add(str.replace("bs.s_explorationpoint", "bs.s_surveyworksite"));
+ }
+
+ i++;
+ }
+
return StringHelper.join(list, ";");
}
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index b2db861..a4f446d 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -195,10 +195,10 @@
</insert>
<delete id="deletes">
+ delete from lf.sys_meta where id in (${ids});
<if test="sql != null">
${sql};
</if>
- delete from lf.sys_meta where id in (${ids});
</delete>
<delete id="deletes_old">
diff --git a/src/main/resources/mapper/show/PublishMapper.xml b/src/main/resources/mapper/show/PublishMapper.xml
index e1e74a6..9c88892 100644
--- a/src/main/resources/mapper/show/PublishMapper.xml
+++ b/src/main/resources/mapper/show/PublishMapper.xml
@@ -101,9 +101,9 @@
</delete>
<delete id="deletes">
+ delete from lf.sys_publish where id in (${ids});
delete from lf.sys_layer where pubid in (${ids});
delete from lf.sys_meta_pub where pubid in (${ids});
- delete from lf.sys_publish where id in (${ids});
</delete>
<update id="update">
--
Gitblit v1.9.3