From 95ca12994fe6a68b46d30653123dba8d8acf20fc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 07 四月 2025 10:46:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 35e0eae..872f214 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -1,12 +1,15 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.dto.AxisBean;
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.LocDetlService;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
@@ -38,6 +41,17 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private LocDetlService locDetlService;
+
+ @GetMapping(value = "/locDetl/pda/statisticalModel")
+ public R statisticalModel() {
+ //浠撳簱鏁版嵁
+ EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
+ locDetlEntityWrapper.setSqlSelect("matnr,count(*)as matnrCount").groupBy("matnr");
+ List<Map<String, Object>> selectMap = locDetlService.selectMaps(locDetlEntityWrapper);
+ return R.ok(selectMap);
+ }
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -202,6 +216,7 @@
public R monitorLocRep(){
List<Map<String, Object>> pie = new ArrayList<>();
+
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
if(locUseRate!=null) {
Map<String, Object> map = new HashMap<>();
@@ -225,6 +240,7 @@
pie.add(map3);
}
+
// 鎬诲簱浣嶆暟
Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
// 浣跨敤涓�
@@ -235,12 +251,12 @@
return R.ok(
Cools.add("pie", pie)
- .add("stockCunt", locUseRate.getFqty())
- .add("emptyCount", locUseRate.getOqty())
- .add("noneCount", locUseRate.getXqty())
- .add("total", total)
- .add("used", used)
- .add("usedPr", usedPr)
+ .add("stockCunt", locUseRate.getFqty())
+ .add("emptyCount", locUseRate.getOqty())
+ .add("noneCount", locUseRate.getXqty())
+ .add("total", total)
+ .add("used", used)
+ .add("usedPr", usedPr)
);
}
--
Gitblit v1.9.1