From d32e5d152584e8a3b3750f3f059ed7cca5f5c86e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 11 四月 2023 16:49:19 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/mapper/sys/AttachMapper.java | 6 +++---
src/main/java/com/lf/server/service/sys/AttachService.java | 20 +++++++++++++++++---
src/main/resources/mapper/sys/AttachMapper.xml | 7 ++++++-
data/db_cx.sql | 4 ++++
4 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 24f961d..99beea0 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -23,6 +23,10 @@
select * from lf.sys_meta where id in (1393,1392,1383,1382)
-- tabs=鍏冩暟鎹〃,entities=sysmeta,gids=1393,1392,1383,1382
+select * from lf.sys_layer order by id desc;
+select * from bs.s_explorationpoint order by gid desc;
+
+
diff --git a/src/main/java/com/lf/server/mapper/sys/AttachMapper.java b/src/main/java/com/lf/server/mapper/sys/AttachMapper.java
index 7db6d2a..1dd4808 100644
--- a/src/main/java/com/lf/server/mapper/sys/AttachMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/AttachMapper.java
@@ -1,7 +1,6 @@
package com.lf.server.mapper.sys;
import com.lf.server.entity.data.FmeLogEntity;
-import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.sys.AttachEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -159,10 +158,11 @@
/**
* 鏍规嵁鍏冩暟鎹悕绉版彃鍏ラ檮浠�
*
- * @param metaName
* @param tab
* @param tabGuid
+ * @param metaName
+ * @param dirid
* @return
*/
- public Integer insertAttachByMeta(String metaName, String tab, String tabGuid);
+ public Integer insertAttachByMeta(String tab, String tabGuid, String metaName, String dirid);
}
diff --git a/src/main/java/com/lf/server/service/sys/AttachService.java b/src/main/java/com/lf/server/service/sys/AttachService.java
index a469e83..8aab5bb 100644
--- a/src/main/java/com/lf/server/service/sys/AttachService.java
+++ b/src/main/java/com/lf/server/service/sys/AttachService.java
@@ -128,8 +128,8 @@
}
@Override
- public Integer insertAttachByMeta(String metaName, String tab, String tabGuid) {
- return attachMapper.insertAttachByMeta(metaName, tab, tabGuid);
+ public Integer insertAttachByMeta(String tab, String tabGuid, String metaName, String dirid) {
+ return attachMapper.insertAttachByMeta(tab, tabGuid, metaName, dirid);
}
/**
@@ -156,13 +156,27 @@
}
BaseEntity be = (BaseEntity) obj;
+ String dirid = getDirid(be);
for (String name : names) {
- insertAttachByMeta(name, tab, be.getEventid());
+ insertAttachByMeta(tab, be.getEventid(), name, dirid);
}
}
}
/**
+ * 鑾峰彇鐩綍缂栫爜
+ */
+ private String getDirid(BaseEntity be) {
+ if (StringHelper.isEmpty(be.getDirid())) {
+ return null;
+ }
+
+ String dirid = be.getDirid().substring(0, 2);
+
+ return StringHelper.getRightLike(dirid);
+ }
+
+ /**
* 鏍规嵁鐖禝D鏌ヨ璁板綍
*/
private List<?> selectRowsByParentid(String entity, String parentid, String field) {
diff --git a/src/main/resources/mapper/sys/AttachMapper.xml b/src/main/resources/mapper/sys/AttachMapper.xml
index a81c821..24cda7d 100644
--- a/src/main/resources/mapper/sys/AttachMapper.xml
+++ b/src/main/resources/mapper/sys/AttachMapper.xml
@@ -118,7 +118,12 @@
insert into lf.sys_attach (name, guid, path, sizes, create_user, tab, tab_guid)
select name, guid, path, sizes, create_user, #{tab}, #{tabGuid}
from lf.sys_meta
- where name = #{metaName}
+ <where>
+ name = #{metaName}
+ <if test="dirid != null">
+ and dirid like #{dirid}
+ </if>
+ </where>
order by id desc
limit 1;
</insert>
--
Gitblit v1.9.3