From cc45b945d86a6c3c7cc99f17fedc0343f49a14b1 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 24 三月 2026 10:08:11 +0800
Subject: [PATCH] 数量监测按钮修复
---
fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
index 895c2ec..7433680 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
@@ -4,9 +4,13 @@
import com.fzzy.igds.camera.ApiCameraManager;
import com.fzzy.igds.camera.data.ApiCameraData;
import com.fzzy.igds.camera.data.ApiCameraResp;
+import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.constant.OrderRespEnum;
import com.fzzy.igds.constant.RespCodeEnum;
-import com.fzzy.igds.data.*;
+import com.fzzy.igds.data.GroupIndexData;
+import com.fzzy.igds.data.IgdsBaseParam;
+import com.fzzy.igds.data.PageResponse;
+import com.fzzy.igds.data.PatrolSuperData;
import com.fzzy.igds.domain.*;
import com.fzzy.igds.io.manager.QuantityRemoteManager;
import com.fzzy.igds.io.service.RemoteQuantityService;
@@ -19,14 +23,10 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @Description
@@ -229,9 +229,9 @@
* @param patrolId
* @return
*/
- public List<PatrolRecord> getRecordByPatrolId(String patrolId) {
+ public List<PatrolRecord> getRecordByPatrolId(String patrolId,String userId,String confId) {
- List<PatrolRecord> patrolRecords = patrolService.getRecordByPatrolId(patrolId);
+ List<PatrolRecord> patrolRecords = patrolService.getRecordByPatrolId(patrolId,userId,confId);
if (null != patrolRecords && !patrolRecords.isEmpty()) {
//鍒ゆ柇鏂囦欢鏄惁瀛樺湪
@@ -361,6 +361,7 @@
request.setDeptId(conf.getDeptId());
request.setSn(conf.getSn());
request.setLength(conf.getLength());
+ request.setExeUser(ContextUtil.getLoginUserName());
request.setBatchId(conf.getDepotId() + "_" + DateFormatUtils.format(new Date(), "yyyyMMddHHmm"));
@@ -403,4 +404,42 @@
return remoteQuantityService.checkStop(request);
}
+
+
+ /**
+ * 鑾峰彇娌圭綈娌规儏鍙婃恫浣嶄俊鎭�
+ *
+ * @param deptId
+ * @return
+ */
+ public List<Quantity> getHeightList(String deptId) {
+
+ if (StringUtils.isEmpty(deptId)) {
+ deptId = ContextUtil.subDeptId(null);
+ }
+ //鑾峰彇鎵�鏈夌瓛浠撳強娴呭渾浠�
+ List<Depot> depotList = commonManager.listAllDepot(deptId, DepotType.TYPE_02.getCode() + "," + DepotType.TYPE_04.getCode());
+ if (null == depotList || depotList.isEmpty()) {
+ return null;
+ }
+
+ List<Quantity> list = new ArrayList<>();
+ List<Quantity> quantityList;
+ Quantity quantity;
+ for (Depot depot : depotList) {
+
+ quantityList = quantityService.getQuantityList(depot.getId(), 1);
+ if (null == quantityList || quantityList.isEmpty()) {
+ quantity = new Quantity();
+ quantity.setDepotId(depot.getId());
+ }else {
+ quantity = quantityList.get(0);
+ }
+ quantity.setDepotData(depot);
+
+ list.add(quantity);
+ }
+
+ return list;
+ }
}
--
Gitblit v1.9.3