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 02cb837..7322402 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 @@ -49,6 +49,13 @@ public class FPBroadController { @ResponseBody @ApiOperation("POL压力、SO温度") private String selectDeviceStation() { - return JSONObject.toJSONString(service.fp_selectDeviceStation()); + return JSONArray.toJSONString(service.fp_selectDeviceStation()); } + @PostMapping("/selectStationHourInfo") + @ResponseBody + @ApiOperation("生产统计数据") + private String fp_selectStationHourInfo() { + return JSONArray.toJSONString(service.fp_selectStationHourInfo()); + } + } diff --git a/ruoyi-admin/src/main/resources/static/img/foamer2.jpg b/ruoyi-admin/src/main/resources/static/img/foamer2.jpg index eedad6c..2d5a92f 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/foamer2.jpg and b/ruoyi-admin/src/main/resources/static/img/foamer2.jpg differ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/FPStationHourInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/FPStationHourInfo.java new file mode 100644 index 0000000..edab6b6 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/FPStationHourInfo.java @@ -0,0 +1,145 @@ +package com.ruoyi.system.domain; + +/** + * @author wanghao + * @date 2022/7/14 16:06 + */ +public class FPStationHourInfo { + private String name, STATION_NO, plan_number, qty, rate, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11, h12; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getSTATION_NO() { + return STATION_NO; + } + + public void setSTATION_NO(String STATION_NO) { + this.STATION_NO = STATION_NO; + } + + public String getPlan_number() { + return plan_number; + } + + public void setPlan_number(String plan_number) { + this.plan_number = plan_number; + } + + public String getQty() { + return qty; + } + + public void setQty(String qty) { + this.qty = qty; + } + + public String getRate() { + return rate; + } + + public void setRate(String rate) { + this.rate = rate; + } + + public String getH1() { + return h1; + } + + public void setH1(String h1) { + this.h1 = h1; + } + + public String getH2() { + return h2; + } + + public void setH2(String h2) { + this.h2 = h2; + } + + public String getH3() { + return h3; + } + + public void setH3(String h3) { + this.h3 = h3; + } + + public String getH4() { + return h4; + } + + public void setH4(String h4) { + this.h4 = h4; + } + + public String getH5() { + return h5; + } + + public void setH5(String h5) { + this.h5 = h5; + } + + public String getH6() { + return h6; + } + + public void setH6(String h6) { + this.h6 = h6; + } + + public String getH7() { + return h7; + } + + public void setH7(String h7) { + this.h7 = h7; + } + + public String getH8() { + return h8; + } + + public void setH8(String h8) { + this.h8 = h8; + } + + public String getH9() { + return h9; + } + + public void setH9(String h9) { + this.h9 = h9; + } + + public String getH10() { + return h10; + } + + public void setH10(String h10) { + this.h10 = h10; + } + + public String getH11() { + return h11; + } + + public void setH11(String h11) { + this.h11 = h11; + } + + public String getH12() { + return h12; + } + + public void setH12(String h12) { + this.h12 = h12; + } +} 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 9a50d8d..9a2c79f 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 @@ -40,4 +40,5 @@ public interface BroadDataMapper { List pqk_selectQualityInfo(); List fp_selectDeviceStation(); + List fp_selectStationHourInfo(); } 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 6fa254c..c10b7e2 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 @@ -39,4 +39,6 @@ public interface IBroadDataService { List fp_selectOrderExecution(); List fp_selectDeviceStation(); + + List fp_selectStationHourInfo(); } 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 7d6d439..1a75cfd 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 @@ -65,6 +65,10 @@ public class BroadDataServiceImpl implements IBroadDataService return mapper.fp_selectDeviceStation(); } + @Override + public List fp_selectStationHourInfo() { + return mapper.fp_selectStationHourInfo(); + } /////////////////////////////////////////////////////////////////////////// // 泡前库 /////////////////////////////////////////////////////////////////////////// diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 0f78b22..e2ade4a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -189,4 +189,40 @@ from IMOS_PR_FOAMING_STATION order by to_number(STATION_NO); + + + \ No newline at end of file