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 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 fp_selectOrderExecution(); - List fp_selectOrderExecutionDay(); + List fp_selectOrderExecutionPlan(); /////////////////////////////////////////////////////////////////////////// @@ -44,6 +44,7 @@ public interface BroadDataMapper { List fp_selectDeviceStation(); List fp_selectStationHourInfo(); + List fp_selectStationHourInfoDay(); List 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 fp_selectDeviceStation(); List fp_selectStationHourInfo(); + List fp_selectStationHourInfoDay(); List xk_selectStockOccupancy(); @@ -100,5 +101,4 @@ public interface IBroadDataService { List pqk_selectProductInStore(); - List 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 fp_selectOrderExecutionDay(){ - return mapper.fp_selectOrderExecutionDay(); - } + @Override @@ -92,6 +89,10 @@ public class BroadDataServiceImpl implements IBroadDataService public List fp_selectStationHourInfo() { return mapper.fp_selectStationHourInfo(); } + @Override + public List fp_selectStationHourInfoDay() { + return mapper.fp_selectStationHourInfoDay(); + } @Override public List 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 name, STATION_NO, target,