From a64ddac31cf2fe00899d3714b9cfc974d1519533 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Mon, 6 Feb 2023 10:37:45 +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 --- .../controller/broad/FPBroadController.java | 51 ++++--- .../ruoyi/system/mapper/BroadDataMapper.java | 1 + .../system/service/IBroadDataService.java | 1 + .../service/impl/BroadDataServiceImpl.java | 7 + .../mapper/system/BroadDataMapper.xml | 132 ++++++++++++++++++ 5 files changed, 172 insertions(+), 20 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 4ce948c..4befb41 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 @@ -42,10 +42,19 @@ public class FPBroadController { return JSONArray.toJSONString(service.fp_selectOrderExecution()); } - @PostMapping("/selectOrderExecutionPlan") + + @PostMapping("/selectOrderExecutionDay") + @ApiOperation("底部列表白天使用") + private String selectOrderExecutionDay() { + return JSONArray.toJSONString(service.fp_selectOrderExecutionDay()); + + } + + + @PostMapping("/selectOrderExecutionPlan") @ApiOperation("订单执行") private String fp_selectOrderExecutionPlan() { - return JSONArray.toJSONString(service.fp_selectOrderExecutionPlan()); + return JSONArray.toJSONString(service.fp_selectOrderExecutionPlan()); } @@ -67,28 +76,30 @@ public class FPBroadController { private String fp_selectStationHourInfo() { return JSONArray.toJSONString(service.fp_selectStationHourInfo()); } - private Map map; + + private Map map; + { - map=new HashMap<>(); - map.put("A1","10.10.60.176"); - map.put("A2","10.10.60.177"); - map.put("B1","10.10.60.178"); - map.put("B2","10.10.60.179"); + map = new HashMap<>(); + map.put("A1", "10.10.60.176"); + map.put("A2", "10.10.60.177"); + map.put("B1", "10.10.60.178"); + map.put("B2", "10.10.60.179"); } @PostMapping("/selectDeviceState") @ApiOperation("设备状态查询") - private String selectDeviceState(){ + private String selectDeviceState() { Set strings = map.keySet(); - Map stateMap = null; + Map stateMap = null; try { - stateMap =new HashMap<>(); + stateMap = new HashMap<>(); - for (String key:strings) { - ProcessBuilder procBuilder = new ProcessBuilder("ping", map.get(key),"-w","2","-n","1"); + for (String key : strings) { + ProcessBuilder procBuilder = new ProcessBuilder("ping", map.get(key), "-w", "2", "-n", "1"); Process proc = procBuilder.start(); int exitValue = proc.waitFor(); - stateMap.put(key,exitValue); + stateMap.put(key, exitValue); } } catch (IOException e) { System.out.println(e.getMessage()); @@ -96,24 +107,24 @@ public class FPBroadController { } catch (InterruptedException e) { e.printStackTrace(); } - String json=JSONArray.toJSONString(stateMap); + String json = JSONArray.toJSONString(stateMap); return json; } @PostMapping("/selectFpStock") @ApiOperation("发泡库存统计") - public String selectFpStock(){ + public String selectFpStock() { return JSONArray.toJSONString(service.selectFpStock()); } @PostMapping("/selectTeamGroups") @ApiOperation("班组是早晚") - public String selectTeamGroups(){ - Integer state=iBroadDruidService.selectTeamGroups(); - Map map=new HashMap<>(); - map.put("班组",state); + public String selectTeamGroups() { + Integer state = iBroadDruidService.selectTeamGroups(); + Map map = new HashMap<>(); + map.put("班组", state); return JSONObject.toJSONString(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 e7154de..dbfdb5a 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,6 +27,7 @@ public interface BroadDataMapper { // 发泡线 /////////////////////////////////////////////////////////////////////////// List fp_selectOrderExecution(); + List fp_selectOrderExecutionDay(); List fp_selectOrderExecutionPlan(); /////////////////////////////////////////////////////////////////////////// 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 e7eea93..8bdabd2 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 @@ -100,4 +100,5 @@ 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 82404fc..c6b9758 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 @@ -66,6 +66,13 @@ public class BroadDataServiceImpl implements IBroadDataService public List fp_selectOrderExecution(){ return mapper.fp_selectOrderExecution(); } + + @Override + public List fp_selectOrderExecutionDay(){ + return mapper.fp_selectOrderExecutionDay(); + } + + @Override public List fp_selectOrderExecutionPlan(){ return mapper.fp_selectOrderExecutionPlan(); diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 2b649c5..6798cd2 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -384,6 +384,138 @@ +