From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 28 三月 2025 08:28:26 +0800
Subject: [PATCH] 修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 16a8ff2..5aee6fa 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -334,22 +334,22 @@
for (int i = 1; i <= groupBy.keySet().size(); i++) {
String key = i + "";
if (key != null) {
- List<Map<String, Object>> galssInfo=groupBy.get(key);//褰撳墠閽㈠寲鐗堝浘鍐呯幓鐠冨皬鐗囬泦鍚�
- if(!galssInfo.isEmpty()){
- Map<String, Object> item=new HashMap<>();//鏂版牸寮忕紪鎺�
+ List<Map<String, Object>> galssInfo = groupBy.get(key);//褰撳墠閽㈠寲鐗堝浘鍐呯幓鐠冨皬鐗囬泦鍚�
+ if (!galssInfo.isEmpty()) {
+ Map<String, Object> item = new HashMap<>();//鏂版牸寮忕紪鎺�
//浠ヤ笅涓哄悓灞� {key:"groupBy.get(key)",olLayoutRate:"灏忕墖闆嗗悎"}
// {key:"groupBy.get(key)",olLayoutRate:[{},{},{},{}]}
- item.put("listGlass",groupBy.get(key));
- item.put("LayoutId",key);
- item.put("olWidth",galssInfo.get(0).get("olWidth").toString());
- item.put("olHeight",galssInfo.get(0).get("olHeight").toString());
- item.put("olLayoutRate",galssInfo.get(0).get("olLayoutRate").toString());
+ item.put("listGlass", groupBy.get(key));
+ item.put("LayoutId", key);
+ item.put("olWidth", galssInfo.get(0).get("olWidth").toString());
+ item.put("olHeight", galssInfo.get(0).get("olHeight").toString());
+ item.put("olLayoutRate", galssInfo.get(0).get("olLayoutRate").toString());
result.add(item);
- }else{
- log.info("褰撳墠閽㈠寲鐗堝浘涓嶅瓨鍦ㄥ皬鐗囨暟鎹妫�鏌ワ紝鐗堝浘鍙�:{}"+key);
- return null ;
+ } else {
+ log.info("褰撳墠閽㈠寲鐗堝浘涓嶅瓨鍦ㄥ皬鐗囨暟鎹妫�鏌ワ紝鐗堝浘鍙�:{}" + key);
+ return null;
}
}
}
@@ -478,7 +478,7 @@
BeanUtils.copyProperties(request, damage);
damage.setType(request.getState());
damage.setRemark("");
- damage.setStatus(0);
+ damage.setStatus(1);
damageService.insertDamage(damage);
return "success";
}
@@ -490,7 +490,7 @@
BeanUtils.copyProperties(request, damage);
damage.setType(request.getState());
damage.setRemark("");
- damage.setStatus(0);
+ damage.setStatus(1);
damageService.insertDamage(damage);
//淇敼纾ㄨ竟闃熷垪鏁版嵁鐘舵��
edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
@@ -523,4 +523,9 @@
}
return false;
}
+
+ @Override
+ public EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height) {
+ return baseMapper.queryEdgStorageDetailsBySize(deviceId, currentSlot, width, height);
+ }
}
--
Gitblit v1.8.0