修改 发泡底部每小时数据表格 白班使用的接口

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;
 
     {

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();
 

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();
 }

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() {

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,