From fe8b2f6b674c259d948c872dd564f83810218bff Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 25 三月 2023 21:04:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/mapper/sys/AttachMapper.java | 2 +-
src/main/java/com/lf/server/service/sys/AttachService.java | 2 +-
src/main/java/com/lf/server/config/ScheduleConfig.java | 2 +-
src/main/resources/mapper/sys/AttachMapper.xml | 2 +-
data/db_cx.sql | 18 ++++++++++++++++--
src/main/java/com/lf/server/service/all/BaseUploadService.java | 3 ++-
6 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 5758ee9..418a8ba 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -7,11 +7,25 @@
select concat(gb, '_', name) from bd.dlg_agnp limit 10;
select ST_AsText(geom) "geom", a.*, fn_get_fullname(a.depid, 1) depName, fn_get_fullname(a.dirid, 2) dirName, fn_uname(create_user) createName, fn_uname(update_user) updateName from lf.sys_publish a
-select * from lf.sys_fme_log order by id desc limit 10; -- 242 >
-select * from lf.sys_meta order by id desc limit 10; -- 1686 >
+select * from lf.sys_fme_log order by id desc limit 10; -- 255 >
+select * from lf.sys_meta order by id desc limit 10; -- 1723 >
select * from lf.sys_fme_log
where count > 0 and update_time is null and create_time > now()::timestamp + '-1 min'
+select * from bs.s_explorationpoint where parentid='df3ee967-3eb8-4685-b49c-d0ae06918069'
+select * from lf.sys_dir where pid=0 order by id
+
+select * from bs.s_explorationpoint
+select * from lf.sys_attach order by id desc limit 100; -- 358042
+
+insert into lf.sys_attach (name, guid, path, sizes, create_user, tab, tab_guid)
+select name, guid, path, sizes, create_user, 'bs.s_explorationpoint', '8de99768-1da3-4784-9423-bb026411fa48'
+from lf.sys_meta
+where name = 'PH02T01-CR004-C04#EGE-DW-0105.pdf' and create_time > now()::timestamp + '-10 min'
+order by id desc
+limit 1;
+
+
diff --git a/src/main/java/com/lf/server/config/ScheduleConfig.java b/src/main/java/com/lf/server/config/ScheduleConfig.java
index b1d6801..5b937f1 100644
--- a/src/main/java/com/lf/server/config/ScheduleConfig.java
+++ b/src/main/java/com/lf/server/config/ScheduleConfig.java
@@ -103,8 +103,8 @@
}
for (FmeLogEntity entity : list) {
- attachService.syncAttaches(entity);
attachService.updateFmeLog(entity.getId());
+ attachService.syncAttaches(entity);
}
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
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 01f5b7b..7db6d2a 100644
--- a/src/main/java/com/lf/server/mapper/sys/AttachMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/AttachMapper.java
@@ -164,5 +164,5 @@
* @param tabGuid
* @return
*/
- public MetaEntity insertAttachByMeta(String metaName, String tab, String tabGuid);
+ public Integer insertAttachByMeta(String metaName, String tab, String tabGuid);
}
diff --git a/src/main/java/com/lf/server/service/all/BaseUploadService.java b/src/main/java/com/lf/server/service/all/BaseUploadService.java
index b7c21c7..7f68fdc 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -236,7 +236,8 @@
zipFolder.mkdirs();
}
- String subPath = zipFolder + File.separator + meta.getName().toLowerCase().replace(".zip", "");
+ // String subPath = zipFolder + File.separator + meta.getName().toLowerCase().replace(".zip", "") .replace("锛�","").replace("锛�","").replace(" ","")
+ String subPath = zipFolder.getPath();
ZipHelper.unzip(zipFile, subPath);
List<File> files = new ArrayList<>();
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 22f230c..a469e83 100644
--- a/src/main/java/com/lf/server/service/sys/AttachService.java
+++ b/src/main/java/com/lf/server/service/sys/AttachService.java
@@ -128,7 +128,7 @@
}
@Override
- public MetaEntity insertAttachByMeta(String metaName, String tab, String tabGuid) {
+ public Integer insertAttachByMeta(String metaName, String tab, String tabGuid) {
return attachMapper.insertAttachByMeta(metaName, tab, tabGuid);
}
diff --git a/src/main/resources/mapper/sys/AttachMapper.xml b/src/main/resources/mapper/sys/AttachMapper.xml
index 25347bf..546a008 100644
--- a/src/main/resources/mapper/sys/AttachMapper.xml
+++ b/src/main/resources/mapper/sys/AttachMapper.xml
@@ -117,7 +117,7 @@
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} and create_time > now()::timestamp + '-10 min'
+ where name = #{metaName} and create_time > now()::timestamp + '-15 min'
order by id desc
limit 1;
</insert>
--
Gitblit v1.9.3