From 785af73325fe0cd928a7e059f4bf010dc7bdf25f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 03 四月 2025 14:14:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/Utils.java                  |    6 +++---
 src/main/java/com/zy/asrs/controller/MonitorController.java |   13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index fd0d5dc..ecdfaef 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,16 @@
     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("model,COUNT(*) as modelCount").groupBy("model");
+        List<Map<String, Object>>  selectMap = locDetlService.selectMaps(locDetlEntityWrapper);
+        return R.ok(selectMap);
+    }
 
     /**
      * 鑾峰彇褰撳墠鏃堕棿
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 57ec5f2..d92f13b 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -107,10 +107,10 @@
         int row = getRow(shallowLoc);
         int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
         int targetRow;
-        if (remainder == 2) {
-            targetRow = row - 1;
-        } else if (remainder == 3) {
+        if (remainder == 0  ) {
             targetRow = row + 1;
+        } else if (remainder == 3) {
+            targetRow = row - 1;
         } else {
             throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
         }

--
Gitblit v1.9.1