From 1369c87ddcc0e76e17d01208ef66261ee0cd27da Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 二月 2026 18:13:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-io/src/main/java/com/fzzy/igds/iot/analysis/AnalysisService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fzzy-igdss-io/src/main/java/com/fzzy/igds/iot/analysis/AnalysisService.java b/fzzy-igdss-io/src/main/java/com/fzzy/igds/iot/analysis/AnalysisService.java
index 79f312c..34cbab1 100644
--- a/fzzy-igdss-io/src/main/java/com/fzzy/igds/iot/analysis/AnalysisService.java
+++ b/fzzy-igdss-io/src/main/java/com/fzzy/igds/iot/analysis/AnalysisService.java
@@ -240,7 +240,7 @@
 
             Quantity data = new Quantity();
 
-            data.setBatchId(depot + ContextUtil.generateId());
+            data.setBatchId(depot.getId() +"_"+ ContextUtil.generateId());
             data.setCompanyId(ser.getCompanyId());
             data.setDeptId(depot.getDeptId());
             data.setDepotId(deviceIot.getDepotId());

--
Gitblit v1.9.3