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/show/ApplyService.java |   68 +++++++++++++++++++++++++++++-----
 1 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/lf/server/service/show/ApplyService.java b/src/main/java/com/lf/server/service/show/ApplyService.java
index 26962a1..b3adb4a 100644
--- a/src/main/java/com/lf/server/service/show/ApplyService.java
+++ b/src/main/java/com/lf/server/service/show/ApplyService.java
@@ -2,12 +2,15 @@
 
 import com.lf.server.entity.all.StaticData;
 import com.lf.server.entity.ctrl.DownloadReqEntity;
+import com.lf.server.entity.data.MetaEntity;
 import com.lf.server.entity.show.ApplyEntity;
 import com.lf.server.entity.show.FlowEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.AesHelper;
 import com.lf.server.helper.StringHelper;
 import com.lf.server.mapper.show.ApplyMapper;
+import com.lf.server.service.data.MetaService;
+import com.lf.server.service.sys.UserService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +32,12 @@
 
     @Autowired
     FlowService flowService;
+
+    @Autowired
+    UserService userService;
+
+    @Autowired
+    MetaService metaService;
 
     @Autowired
     DataLibService dataLibService;
@@ -135,9 +144,12 @@
         }
 
         List<FlowEntity> list = getFlowEntities(apply.getId(), ue, dr);
-        rows = flowService.inserts(list);
+        if (list.isEmpty()) {
+            applyMapper.delete(apply.getId());
+            throw new Exception("鎵句笉鍒板緟瀹℃牳浜�");
+        }
 
-        return rows;
+        return flowService.inserts(list);
     }
 
     /**
@@ -146,11 +158,12 @@
     private ApplyEntity getApplyEntity(UserEntity ue, DownloadReqEntity dr) throws Exception {
         // String dbPwd = Md5Helper.reverse(Md5Helper.generate(dr.getPwd()))
         String aesPwd = AesHelper.encrypt(dr.getPwd());
+        String gids = null == dr.getIds() || dr.getIds().isEmpty() ? null : StringHelper.join(dr.getIds(), ",");
 
         ApplyEntity apply = new ApplyEntity();
         apply.setUserid(ue.getId());
         apply.setDepids(StringHelper.join(dr.getDepcodes(), ","));
-        apply.setTabs(StringHelper.join(dr.getTabs(), ","));
+        apply.setTabs(getTabs(dr));
         apply.setEntities(StringHelper.join(dr.getEntities(), ","));
         apply.setWkt(dr.getWkt());
         apply.setPwd(aesPwd);
@@ -160,10 +173,37 @@
         apply.setCreateUser(ue.getId());
         apply.setDepcode(dr.getDepcode());
         apply.setDircodes(dr.getDirs());
-        apply.setGids(StringHelper.join(dr.getIds(), ","));
+        apply.setGids(gids);
         apply.setFilters(dr.getFilter());
 
         return apply;
+    }
+
+    /**
+     * 鑾峰彇琛ㄥ悕
+     */
+    private String getTabs(DownloadReqEntity dr) {
+        if (!StaticData.SYS_META.equals(dr.getEntities().get(0))) {
+            return StringHelper.join(dr.getTabs(), ",");
+        }
+
+        List<MetaEntity> list = metaService.selectMetaFiles(dr.getIds());
+        if (null == list || list.isEmpty()) {
+            return "鍏冩暟鎹〃";
+        }
+
+        StringBuilder sb = new StringBuilder();
+        for (MetaEntity me : list) {
+            sb.append(me.getName()).append(",");
+            if (sb.length() > StaticData.I1000) {
+                break;
+            }
+        }
+        if (sb.length() > 1) {
+            sb.deleteCharAt(sb.length() - 1);
+        }
+
+        return sb.toString();
     }
 
     /**
@@ -174,12 +214,12 @@
         for (String depcode : dr.getDepcodes()) {
             UserEntity user = selectUserByDepcode(depcode);
             if (null == user) {
-                continue;
+                user = userService.selectByUid(StaticData.ADMIN);
             }
 
             FlowEntity flow = new FlowEntity();
             flow.setApplyid(applyId);
-            flow.setDepcode(user.getDepcode());
+            flow.setDepcode(depcode);
             flow.setUserid(user.getId());
             flow.setStatus(0);
             flow.setDescr(null);
@@ -205,10 +245,14 @@
             dr.setPwd(pwd);
             dr.setDepcode(entity.getDepcode());
             dr.setDirs(entity.getDircodes());
-            dr.setIds(getIds(entity));
+            dr.setIds(getIds(entity.getGids()));
             dr.setFilter(entity.getFilters());
 
-            dataLibService.downloadDbReq(ue, dr);
+            String guid = StaticData.SYS_META.equals(entity.getEntities()) ? metaService.downloadMeteReq(ue, dr) : dataLibService.downloadDbReq(ue, dr);
+            if (!StringHelper.isEmpty(guid)) {
+                entity.setGuid(guid);
+                update(entity);
+            }
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
         }
@@ -217,9 +261,13 @@
     /**
      * 鑾峰彇ID闆嗗悎
      */
-    private List<Integer> getIds(ApplyEntity entity) {
+    private List<Integer> getIds(String gids) {
+        if (StringHelper.isEmpty(gids)) {
+            return null;
+        }
+
         List<Integer> list = new ArrayList<>();
-        for (String str : entity.getGids().split(StaticData.COMMA)) {
+        for (String str : gids.split(StaticData.COMMA)) {
             list.add(Integer.parseInt(str));
         }
 

--
Gitblit v1.9.3