From 9b574e0e759e10bfc4dfb58d8dba594876e012cb Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 28 三月 2023 14:47:57 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 13 +++++++++----
src/main/java/com/lf/server/service/data/MetaService.java | 2 ++
data/db_cx.sql | 8 +++++---
src/main/java/com/lf/server/mapper/all/BasicMapper.java | 12 ++++++++++++
4 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 592b96b..280a15e 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -19,10 +19,12 @@
select * from lf.sys_attach where tab='bs.m_pipeline' and tab_guid in (select eventid from bs.m_pipeline where parentid in ('fdac47da-8879-478d-b67c-9624e8b79d6c'))
select * from bs.s_explorationpoint where exppointid like 'EA12%'
+select id,name,code from lf.sys_dir where pid=0 order by code
+select * from bs.m_marker where gid=854
-
-
-
+select * from lf.sys_meta where name='鍕樻帰鐐瑰湴灞傝〃.xlsx' or type='fbx'
+--delete from bs.s_explorationpointstratum where parentid in (select eventid from lf.sys_meta where name='鍕樻帰鐐瑰湴灞傝〃.xlsx');
+--delete from lf.sys_meta where name='鍕樻帰鐐瑰湴灞傝〃.xlsx';
diff --git a/src/main/java/com/lf/server/mapper/all/BasicMapper.java b/src/main/java/com/lf/server/mapper/all/BasicMapper.java
index 61ac03c..1999b4f 100644
--- a/src/main/java/com/lf/server/mapper/all/BasicMapper.java
+++ b/src/main/java/com/lf/server/mapper/all/BasicMapper.java
@@ -1,6 +1,8 @@
package com.lf.server.mapper.all;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lf.server.entity.sys.AttachEntity;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -40,4 +42,14 @@
* @return
*/
public int updateBatch(@Param("list") List<T> list);
+
+ /**
+ * 鏌ヨ闄勪欢
+ *
+ * @param tab 琛ㄥ悕
+ * @param wrapper 鏌ヨ鍖呰鍣�
+ * @return
+ */
+ @Select("select * from lf.sys_attach where tab = #{tab} and tab_guid in (select eventid from ${tab} where ${ew.customSqlSegment})")
+ public List<AttachEntity> selectAnnex(@Param("tab") String tab, @Param("ew") QueryWrapper wrapper);
}
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 b5b15e4..0430656 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -14,6 +14,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -164,6 +165,7 @@
List<String> list = getTabDeletes(metas, metas.get(0).getTab());
addCascadDeletes(list);
addAttachDeletes(list);
+ Collections.reverse(list);
return StringHelper.join(list, ";");
}
diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index f1630bd..ad49eb6 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -182,8 +182,13 @@
dataMap.get(enity).addAll(list);
}
- // SQL鐗囨
- String sqlSegment = wrapper.getSqlSegment();
+ String tab = BaseQueryService.getTabName(baseMapper);
+ List<AttachEntity> annex = baseMapper.selectAnnex(tab, wrapper);
+ if (null == annex || annex.isEmpty()) {
+ continue;
+ }
+
+ //
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
@@ -201,8 +206,8 @@
wrapper.apply(dirs);
}
if (!StringHelper.isEmpty(dr.getDepcode())) {
- //wrapper.likeRight("depid", dr.getDepcode());
- wrapper.apply(String.format("depid like '%s'", StringHelper.getRightLike(dr.getDepcode())));
+ // wrapper.apply(String.format("depid like '%s'", StringHelper.getRightLike(dr.getDepcode())))
+ wrapper.likeRight("depid", dr.getDepcode());
}
if (baseMapper instanceof GeomBaseMapper && !StringHelper.isEmpty(dr.getWkt())) {
wrapper.select("ST_AsText(geom) as geom, *");
--
Gitblit v1.9.3