From 4dc585d5bf2fd0a01602aba0d9fa25adbaf4a7fb Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 18 九月 2023 18:45:03 +0800
Subject: [PATCH] 提交仓内抓拍和后台配置
---
igds-core/src/main/java/com/ld/igds/data/ConfigGasImg.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/data/ConfigGasImg.java b/igds-core/src/main/java/com/ld/igds/data/ConfigGasImg.java
index b084c41..91b3d21 100644
--- a/igds-core/src/main/java/com/ld/igds/data/ConfigGasImg.java
+++ b/igds-core/src/main/java/com/ld/igds/data/ConfigGasImg.java
@@ -22,8 +22,9 @@
public class ConfigGasImg {
/**
- * 鍥剧墖鐨勫皝瑁呰鍒欙細浠撳簱缂栫爜.img.png --鐓х墖
- * 鍥剧墖鐨勫皝瑁呰鍒欙細鍒嗗簱缂栫爜.img.png --榛樿鐓х墖
+ * gas.mapImg.5318_001.img=5318_001.png
+ * 鍥剧墖鐨勫皝瑁呰鍒欙細gas.mapImg.companyId_浠撳簱缂栫爜.img.png --鐓х墖
+ * 鍥剧墖鐨勫皝瑁呰鍒欙細gas.mapImg.companyId_鍒嗗簱缂栫爜.img.png --榛樿鐓х墖
*/
private Map<String, GasImg> mapImg;
@@ -39,15 +40,22 @@
Map<String, GasImg> result = new HashMap<>();
Map<String, GasImg> all = this.getMapImg();
if (null == depotList || null == all) return result;
+ String companyId = depotList.get(0).getCompanyId();
GasImg temp;
for (Depot d : depotList) {
- temp = all.get(d.getId());
+ //鍏堜粠閰嶇疆涓幏鍙�
+ temp = all.get(companyId + "_" + d.getId());
+
if (null == temp) {
temp = all.get(deptId);
}
+
result.put(d.getId(), temp);
}
return result;
}
+
+
+
}
--
Gitblit v1.9.3