From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期三, 02 七月 2025 16:43:13 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service --- src/main/java/com/lf/server/service/sys/AttachService.java | 49 +++++++++++++++++++++++++++++-------------------- 1 files changed, 29 insertions(+), 20 deletions(-) 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 699aca0..290b489 100644 --- a/src/main/java/com/lf/server/service/sys/AttachService.java +++ b/src/main/java/com/lf/server/service/sys/AttachService.java @@ -3,7 +3,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.lf.server.entity.all.BaseEntity; import com.lf.server.entity.data.FmeLogEntity; -import com.lf.server.entity.data.MetaEntity; import com.lf.server.entity.sys.AttachEntity; import com.lf.server.helper.ClassHelper; import com.lf.server.helper.StringHelper; @@ -115,7 +114,7 @@ * 鏌ヨFME鏃ュ織 */ public List<FmeLogEntity> selectFmeLogs() { - if (null == tabs) { + if (StringHelper.isEmpty(tabs)) { tabs = UploadAttachService.getTabs().replace("'", ""); } @@ -128,8 +127,8 @@ } @Override - public MetaEntity selectMetaByName(String name) { - return attachMapper.selectMetaByName(name); + public Integer insertAttachByMeta(String tab, String tabGuid, String metaName, String dirid) { + return attachMapper.insertAttachByMeta(tab, tabGuid, metaName, dirid); } /** @@ -144,15 +143,39 @@ return; } - Field field = getAnnexField(list.get(0), fieldName); + Field field = UploadAttachService.getAnnexField(list.get(0), tab); if (null == field) { return; } for (Object obj : list) { + String[] names = UploadAttachService.getNames(UploadAttachService.getAnnexName(obj, field)); + if (null == names || names.length == 0) { + continue; + } + BaseEntity be = (BaseEntity) obj; - // + String dirid = getDirid(be); + for (String name : names) { + if (StringHelper.isEmpty(name)) { + continue; + } + insertAttachByMeta(tab, be.getEventid(), name.trim(), dirid); + } } + } + + /** + * 鑾峰彇鐩綍缂栫爜 + */ + private String getDirid(BaseEntity be) { + if (StringHelper.isEmpty(be.getDirid())) { + return null; + } + + String dirid = be.getDirid().substring(0, 2); + + return StringHelper.getRightLike(dirid); } /** @@ -169,19 +192,5 @@ wrapper.apply(field + " is not null"); return baseMapper.selectList(wrapper); - } - - /** - * 鑾峰彇闄勪欢瀛楁 - */ - private Field getAnnexField(Object obj, String name) { - try { - Field field = obj.getClass().getDeclaredField(name); - field.setAccessible(true); - - return field; - } catch (Exception ex) { - return null; - } } } -- Gitblit v1.9.3