From 2e61ca810558b3afc3860a526447230d3c6acf9d Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Mon, 6 Feb 2023 11:04:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E6=B3=A1?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=AF=8F=E5=B0=8F=E6=97=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=20=E7=99=BD=E7=8F=AD=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/broad/FPBroadController.java    | 14 +++++++++-----
 .../com/ruoyi/system/mapper/BroadDataMapper.java   |  3 ++-
 .../ruoyi/system/service/IBroadDataService.java    |  2 +-
 .../system/service/impl/BroadDataServiceImpl.java  |  9 +++++----
 .../resources/mapper/system/BroadDataMapper.xml    |  2 +-
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java
index 4befb41..7825a5b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java
@@ -43,12 +43,7 @@ public class FPBroadController {
 
     }
 
-    @PostMapping("/selectOrderExecutionDay")
-    @ApiOperation("底部列表白天使用")
-    private String selectOrderExecutionDay() {
-        return JSONArray.toJSONString(service.fp_selectOrderExecutionDay());
 
-    }
 
 
     @PostMapping("/selectOrderExecutionPlan")
@@ -72,11 +67,20 @@ public class FPBroadController {
     }
 
     @PostMapping("/selectStationHourInfo")
+//    每小时数据 底部列表
     @ApiOperation("生产统计数据")
     private String fp_selectStationHourInfo() {
         return JSONArray.toJSONString(service.fp_selectStationHourInfo());
     }
 
+    @PostMapping("/selectStationHourInfoDay")
+    @ApiOperation("底部列表白天使用")
+    private String selectOrderExecutionDay() {
+        return JSONArray.toJSONString(service.fp_selectStationHourInfoDay());
+
+    }
+
+
     private Map<String, String> map;
 
     {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
index dbfdb5a..f95208a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
@@ -27,7 +27,7 @@ public interface BroadDataMapper {
     // 发泡线
     ///////////////////////////////////////////////////////////////////////////
     List<OrderInfo> fp_selectOrderExecution();
-    List<OrderInfo> fp_selectOrderExecutionDay();
+
     List<OrderInfo> fp_selectOrderExecutionPlan();
 
     ///////////////////////////////////////////////////////////////////////////
@@ -44,6 +44,7 @@ public interface BroadDataMapper {
 
     List<DeviceStation> fp_selectDeviceStation();
     List<FPStationHourInfo> fp_selectStationHourInfo();
+    List<FPStationHourInfo> fp_selectStationHourInfoDay();
 
     List<OrderInfo> xk_selectStockOccupancy();
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java
index 8bdabd2..8f69c0c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java
@@ -43,6 +43,7 @@ public interface IBroadDataService {
     List<DeviceStation> fp_selectDeviceStation();
 
     List<FPStationHourInfo> fp_selectStationHourInfo();
+    List<FPStationHourInfo> fp_selectStationHourInfoDay();
 
     List<OrderInfo> xk_selectStockOccupancy();
 
@@ -100,5 +101,4 @@ public interface IBroadDataService {
     List<BoxOutput> pqk_selectProductInStore();
 
 
-    List<OrderInfo> fp_selectOrderExecutionDay();
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
index c6b9758..57aef91 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
@@ -67,10 +67,7 @@ public class BroadDataServiceImpl implements IBroadDataService
         return mapper.fp_selectOrderExecution();
     }
 
-       @Override
-    public List<OrderInfo> fp_selectOrderExecutionDay(){
-        return mapper.fp_selectOrderExecutionDay();
-    }
+
 
 
     @Override
@@ -92,6 +89,10 @@ public class BroadDataServiceImpl implements IBroadDataService
     public List<FPStationHourInfo> fp_selectStationHourInfo() {
         return  mapper.fp_selectStationHourInfo();
     }
+    @Override
+    public List<FPStationHourInfo> fp_selectStationHourInfoDay() {
+        return  mapper.fp_selectStationHourInfoDay();
+    }
 
     @Override
     public List<BoxOutput> selectFpStock() {
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index 6798cd2..3def6be 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -384,7 +384,7 @@
     </select>
 
 
-    <select id="fp_selectOrderExecutionDay" resultType="com.ruoyi.system.domain.OrderInfo">
+    <select id="fp_selectStationHourInfoDay" resultType="com.ruoyi.system.domain.FPStationHourInfo">
         select name,
                STATION_NO,
                target,