From cf3c21eb0e6b4c4c96c9b4f3a5070dd842ccde3d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 31 五月 2023 10:32:47 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/sys/AttachService.java | 5 ++++-
src/main/java/com/lf/server/service/data/UploadService.java | 19 +++++++++++++++----
src/main/java/com/lf/server/service/data/MetaService.java | 6 +++---
data/db_cx.sql | 10 ++++++++--
src/main/java/com/lf/server/mapper/data/MetaMapper.java | 7 ++++---
src/main/resources/application.yml | 8 ++++----
src/main/resources/mapper/data/MetaMapper.xml | 3 +++
7 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 326e380..6b78690 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -54,9 +54,15 @@
select * from bs.s_surveyworksite where createtime < '2023-05-26 10:00:00';
--delete from bs.s_surveyworksite where createtime < '2023-05-26 10:00:00';
+select * from lf.sys_dict where tab='u_sectionline';
+select * from bs.u_sectionline where parentid='5bf5fe98-31a0-4dd9-9fa6-5e6d1570ae00';
+select * from lf.sys_attach;
+select * from lf.sys_dir where pid=0 order by id;
-
-
+select * from lf.sys_fme_log where tcdm='u_sectionline' order by id desc;
+select * from lf.sys_meta where name='鍕樻帰鐐硅〃.xlsx';
+select * from lf.sys_meta where name='宸ョ▼鍦拌川鍓栭潰鍥炬帶鍒剁偣.xlsx';
+select * from lf.sys_fme_log where parentid= '70ca841d-2103-485b-ab10-278cb9df85bd'
diff --git a/src/main/java/com/lf/server/mapper/data/MetaMapper.java b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
index b31284e..a56c4ac 100644
--- a/src/main/java/com/lf/server/mapper/data/MetaMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
@@ -112,11 +112,12 @@
/**
* 鏍规嵁GUID鏌ヨ
*
- * @param guid 鏂囦欢GUID
- * @param tab 琛ㄥ悕
+ * @param guid 鏂囦欢GUID
+ * @param dircode 鐩綍缂栫爜
+ * @param tab 琛ㄥ悕
* @return
*/
- public MetaEntity selectByGuid(String guid, String tab);
+ public MetaEntity selectByGuid(String guid, String dircode, String tab);
/**
* 鏍规嵁澶氫釜ID鏌ヨ鍏冩暟鎹紙鏁版嵁琛級
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 79e98d8..61b5b5d 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -115,8 +115,8 @@
}
@Override
- public MetaEntity selectByGuid(String guid, String tab) {
- return metaMapper.selectByGuid(guid, tab);
+ public MetaEntity selectByGuid(String guid, String dircode, String tab) {
+ return metaMapper.selectByGuid(guid, dircode, tab);
}
@Override
@@ -270,7 +270,7 @@
return;
}
- MetaEntity me = selectByGuid(guid, null);
+ MetaEntity me = selectByGuid(guid, null, null);
if (me == null) {
WebHelper.writeStr2Page(res, StaticData.NO_FILE);
return;
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index 2dccb6e..f683bed 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -95,11 +95,22 @@
mf.setMsg("鏂囦欢涓㈠け");
}
- MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), getDirCode(mf), null);
if (null != old) {
mf.setMsg("宸插瓨鍦�");
}
}
+ }
+
+ /**
+ * 鑾峰彇鐩綍缂栫爜
+ */
+ private String getDirCode(MetaFileEntity mf) {
+ if (StringHelper.isEmpty(mf.getDircode())) {
+ return null;
+ }
+
+ return StringHelper.getRightLike(mf.getDircode().substring(0, 2));
}
/**
@@ -208,7 +219,7 @@
return;
}
- MetaEntity old = metaService.selectByGuid(mf.getGuid(), tabName);
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), getDirCode(mf), tabName);
if (null != old) {
mf.setMsg("宸插瓨鍦�");
return;
@@ -315,7 +326,7 @@
return -1;
}
- MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), null, null);
if (null != old) {
mf.setMsg("宸插瓨鍦�");
file.delete();
@@ -384,7 +395,7 @@
return;
}
- MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
+ MetaEntity old = metaService.selectByGuid(mf.getGuid(), null, null);
if (null != old) {
mf.setMsg("宸插瓨鍦�");
FileHelper.deleteFiles(file);
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 d303656..290b489 100644
--- a/src/main/java/com/lf/server/service/sys/AttachService.java
+++ b/src/main/java/com/lf/server/service/sys/AttachService.java
@@ -157,7 +157,10 @@
BaseEntity be = (BaseEntity) obj;
String dirid = getDirid(be);
for (String name : names) {
- insertAttachByMeta(tab, be.getEventid(), name, dirid);
+ if (StringHelper.isEmpty(name)) {
+ continue;
+ }
+ insertAttachByMeta(tab, be.getEventid(), name.trim(), dirid);
}
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index dec3f4e..2e972c2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -42,12 +42,12 @@
datasource:
name: prod
# JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
- url: jdbc:postgresql://103.85.165.99:5433/langfang?useAffectedRows=true
+ #url: jdbc:postgresql://103.85.165.99:5433/langfang?useAffectedRows=true
#url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
- #url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
+ url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
username : postgres
- password: Postgres!_14_Lf
- #password: postgres
+ #password: Postgres!_14_Lf
+ password: postgres
driver-class-name: org.postgresql.Driver
platform: POSTGRESQL
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index cb4e053..37c3e97 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -141,6 +141,9 @@
select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
where guid = #{guid}
+ <if test="dircode != null">
+ and dircode like #{dircode}
+ </if>
<if test="tab != null">
and tab = #{tab}
</if>
--
Gitblit v1.9.3