From cd7f3fa89aed4e7a4b87c0ee4164cd606103b318 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 四月 2025 09:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
index f3a1a9e..cbbadcc 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -19,6 +19,7 @@
import com.mes.common.config.Const;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.largenscreen.entity.PieChartVO;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import lombok.extern.slf4j.Slf4j;
@@ -226,7 +227,7 @@
.like(StringUtils.isNotBlank(query.getFilmsId()), BigStorageCageDetails::getFilmsId, query.getFilmsId())
.like(StringUtils.isNotBlank(query.getFlowCardId()), BigStorageCageDetails::getFlowCardId, query.getFlowCardId())
.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
- .eq(BigStorageCage::getDeviceId, query.getDeviceId())
+// .eq(BigStorageCage::getDeviceId, query.getDeviceId())
.orderByAsc(BigStorageCage::getDeviceId)
.orderByAsc(BigStorageCage::getSlot);
return bigStorageCageMapper.selectJoinList(BigStorageAndDetailsDTO.class, wrapper);
@@ -286,6 +287,7 @@
public List<Map<String, Object>> selectBigStorageCageUsage() {
QueryWrapper<BigStorageCage> wrapper = new QueryWrapper<>();
wrapper.select("device_id,ROUND(1 - SUM(CASE WHEN remain_width = " + slotWidth + " THEN 1 ELSE 0 END) / COUNT(device_id), 2)*100 AS percentage,SUM(CASE WHEN remain_width = " + slotWidth + " THEN 1 ELSE 0 END) AS count")
+ .eq("enable_state", Const.SLOT_ON)
.groupBy("device_id");
List<Map<String, Object>> bigStorageCageUsages = baseMapper.selectMaps(wrapper);
@@ -320,6 +322,11 @@
return Boolean.TRUE;
}
+ @Override
+ public List<PieChartVO> queryPieChart() {
+ return baseMapper.queryPieChart();
+ }
+
// @Override
// public List<Integer> queryFreeDeviceByNotUsed(double thickness) {
// return baseMapper.queryFreeDeviceByNotUsed(thickness);
--
Gitblit v1.8.0