From 660e6bab9482c3a6400ee0d39d56d254b6da945f Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 12 二月 2026 17:45:44 +0800
Subject: [PATCH] APP文件名生成规则

---
 fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/manager/PhoneManager.java         |   12 ++++--------
 fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5206.java |   12 ++++++------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/manager/PhoneManager.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/manager/PhoneManager.java
index d25ff65..35a0476 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/manager/PhoneManager.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/manager/PhoneManager.java
@@ -17,6 +17,7 @@
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.sun.jna.platform.mac.MacFileUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -168,17 +169,12 @@
         String filePath = fileService.getInoutFilePath();
 
         // 鑾峰彇鏂扮殑ID
-        String newFileName = ContextUtil.UUID();
+        String newFileName = DateFormatUtils.format(new Date(), "yyyyMMddHHmmssSSS");
 
         // 鏂囦欢鍚庣紑鍚�
         String suffixName = oldFileName.substring(oldFileName.lastIndexOf("."));
 
-        // 鍚堟垚鏂扮殑鏂囦欢鍚�
-        if (StringUtils.isEmpty(plateNum)) {
-            newFileName = newFileName + suffixName;
-        } else {
-            newFileName = plateNum + "_" + newFileName + suffixName;
-        }
+        newFileName = newFileName + suffixName;
 
         // 鏂囦欢涓婁紶
         boolean flag = uploadFile(fileByte, filePath, newFileName);
@@ -213,7 +209,7 @@
         String filePath = fileService.getPatrolFilePath();
 
         // 鑾峰彇鏂扮殑ID
-        String newFileName = DateUtils.dateTimeNow();
+        String newFileName = DateFormatUtils.format(new Date(), "yyyyMMddHHmmssSSS");
 
         // 鏂囦欢鍚庣紑鍚�
         String suffixName = oldFileName.substring(oldFileName.lastIndexOf("."));
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5206.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5206.java
index 1ca7edc..6f075a7 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5206.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5206.java
@@ -63,7 +63,7 @@
             param.setDeptId(authUser.getDeptId());
         }
         //鑾峰彇鎵�鏈夌瓛浠撳強娴呭渾浠�
-        List<Depot> depotList = depotService.getCacheDepotList(param.getDeptId());
+        List<Depot> depotList = depotService.getCacheDepotList(ContextUtil.getCompanyId(), param.getDeptId());
         if (null == depotList || depotList.isEmpty()) {
             return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鏈煡鍒颁俊鎭紒锛�");
         }
@@ -79,13 +79,13 @@
                 if (null == quantityList || quantityList.isEmpty()) {
                     quantity.setDepotId(depot.getId());
                 } else {
-                    BeanUtils.copyProperties(quantityList.get(0),quantity);
+                    BeanUtils.copyProperties(quantityList.get(0), quantity);
+                    dept = deptService.getCacheDept(depot.getCompanyId(), depot.getDeptId());
+                    quantity.setDepotData(depot);
+                    quantity.setDeptName(dept.getDeptName());
+                    list.add(quantity);
                 }
 
-                dept = deptService.getCacheDept(depot.getCompanyId(),depot.getDeptId());
-                quantity.setDepotData(depot);
-                quantity.setDeptName(dept.getDeptName());
-                list.add(quantity);
             }
         }
 

--
Gitblit v1.9.3