From debbcb1915411849ebe303bfd24ca93a1313f3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?= <9290821+guowen-the-cat@user.noreply.gitee.com> Date: Tue, 23 Dec 2025 15:46:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=92=8C=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index/controller/IndexController.java | 193 +++--- .../mapper/device/DeviceSsjMapper.xml | 8 +- ruoyi-ui/src/api/device/monitor.js | 28 + ruoyi-ui/src/assets/images/agv.png | Bin 0 -> 436759 bytes ruoyi-ui/src/assets/images/ssj.png | Bin 0 -> 407805 bytes ruoyi-ui/src/assets/images/tsj.png | Bin 0 -> 488510 bytes ruoyi-ui/src/views/device/ssj/index.vue | 614 +++++++----------- ruoyi-ui/src/views/index.vue | 63 +- 8 files changed, 411 insertions(+), 495 deletions(-) create mode 100644 ruoyi-ui/src/api/device/monitor.js create mode 100644 ruoyi-ui/src/assets/images/agv.png create mode 100644 ruoyi-ui/src/assets/images/ssj.png create mode 100644 ruoyi-ui/src/assets/images/tsj.png diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexController.java index de9557d..b516f01 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexController.java @@ -5,8 +5,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.ruoyi.device.ddj.domain.MsgDdj; import com.ruoyi.device.ddj.service.IMsgDdjService; +import com.ruoyi.device.srgv.domain.DeviceSrgv; +import com.ruoyi.device.srgv.service.IDeviceSrgvService; +import com.ruoyi.device.tsj.domain.DeviceTsj; +import com.ruoyi.device.tsj.service.IDeviceTsjService; import com.ruoyi.job.domain.MydoJob; import com.ruoyi.job.service.IMydoJobService; import org.springframework.beans.factory.annotation.Autowired; @@ -15,13 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.device.DeviceCar.service.IDeviceCarService; -import com.ruoyi.queue.agv.service.IAgvQueueService; -import com.ruoyi.queue.agv.service.IAgvQueueFinishService; import com.ruoyi.device.ssj.service.IDeviceSsjService; -import com.ruoyi.device.DeviceCar.domain.DeviceCar; -import com.ruoyi.queue.agv.domain.AgvQueue; -import com.ruoyi.queue.agv.domain.AgvQueueFinish; import com.ruoyi.device.ssj.domain.DeviceSsj; /** @@ -33,18 +30,15 @@ import com.ruoyi.device.ssj.domain.DeviceSsj; @RestController @RequestMapping("/index") public class IndexController extends BaseController { - @Autowired - private IDeviceCarService deviceCarService; - - @Autowired - private IAgvQueueService agvQueueService; - - @Autowired - private IAgvQueueFinishService agvQueueFinishService; - @Autowired private IDeviceSsjService deviceSsjService; + @Autowired + private IDeviceSrgvService deviceSrgvService; + + @Autowired + private IDeviceTsjService deviceTsjService; + @Autowired private IMsgDdjService msgDdjService; @@ -58,18 +52,19 @@ public class IndexController extends BaseController { @GetMapping("/deviceStats") public AjaxResult getDeviceStats() { try { - DeviceCar deviceCar = new DeviceCar(); - MsgDdj msgDdj = new MsgDdj(); + DeviceSrgv deviceSrgv = new DeviceSrgv(); + DeviceTsj deviceTsj = new DeviceTsj(); DeviceSsj deviceSsj = new DeviceSsj(); - List deviceList = deviceCarService.selectDeviceCarList(deviceCar); - List msgDdjList = msgDdjService.selectMsgDdjList(msgDdj); + List deviceSsjList = deviceSsjService.selectDeviceSsjList(deviceSsj); + List deviceSrgvList = deviceSrgvService.selectDeviceSrgvList(deviceSrgv); + List deviceTsjList = deviceTsjService.selectDeviceTsjList(deviceTsj); Map count = new HashMap<>(); - count.put("agvCount", deviceList.size()); - count.put("ddjCount", msgDdjList.size()); + count.put("srgvCount", deviceSrgvList.size()); count.put("ssjCount", deviceSsjList.size()); + count.put("tsjCount", deviceTsjList.size()); return AjaxResult.success(count); } catch (Exception e) { @@ -84,8 +79,6 @@ public class IndexController extends BaseController { public AjaxResult getTaskStats() { try { MydoJob mydoJob = new MydoJob(); - AgvQueue agvQueue = new AgvQueue(); - List queueList = agvQueueService.selectAgvQueueList(agvQueue); List mydoJobList = mydoJobService.selectMydoJobList(mydoJob); List mydoJobFinishList = mydoJobService.selectMydoJobFinishList(mydoJob); @@ -144,55 +137,60 @@ public class IndexController extends BaseController { try { List> runningDevices = new ArrayList<>(); - // 查询运行中的AGV和CTU设备 - /*DeviceCar deviceCar = new DeviceCar(); - List deviceList = deviceCarService.selectDeviceCarList(deviceCar); - - for (DeviceCar device : deviceList) { - String taskNo = device.getTaskNo(); - // 判断是否为运行中设备：taskNo不为空且不为0 - if (taskNo != null && !taskNo.trim().isEmpty() && !"0".equals(taskNo.trim())) { - Map deviceInfo = new HashMap<>(); - deviceInfo.put("deviceCode", device.getDeviceCode()); - deviceInfo.put("deviceName", device.getName()); - deviceInfo.put("deviceType", "AGV"); - deviceInfo.put("taskNo", device.getTaskNo()); - runningDevices.add(deviceInfo); - } - }*/ - // 查询运行中的SSJ设备 DeviceSsj deviceSsj = new DeviceSsj(); List ssjList = deviceSsjService.selectDeviceSsjList(deviceSsj); - for (DeviceSsj ssj : ssjList) { - int taskNo = ssj.getTaskNo(); - // 判断是否为运行中设备：taskNo不为0 - if (taskNo != 0) { - Map deviceInfo = new HashMap<>(); - deviceInfo.put("deviceCode", ssj.getDeviceCode()); - deviceInfo.put("deviceName", ssj.getName()); - deviceInfo.put("deviceType", "SSJ"); - deviceInfo.put("taskNo", String.valueOf(ssj.getTaskNo())); - runningDevices.add(deviceInfo); + if (ssjList != null && !ssjList.isEmpty()){ + for (DeviceSsj ssj : ssjList) { + Integer taskNo = ssj.getTaskNo(); + // 判断是否为运行中设备：taskNo不为0 + if (taskNo != 0 && taskNo != null) { + Map deviceInfo = new HashMap<>(); + deviceInfo.put("deviceCode", ssj.getDeviceCode()); + deviceInfo.put("deviceName", ssj.getName()); + deviceInfo.put("deviceType", "SSJ"); + deviceInfo.put("taskNo", String.valueOf(ssj.getTaskNo())); + runningDevices.add(deviceInfo); + } } } - MsgDdj msgDdj = new MsgDdj(); - List msgDdjList = msgDdjService.selectMsgDdjList(msgDdj); - for (MsgDdj ddj : msgDdjList){ - Long taskNo = ddj.getRwh(); - if (taskNo != 0){ - HashMap deviceInfo = new HashMap<>(); - deviceInfo.put("deviceCode",ddj.getId()); - deviceInfo.put("deviceName", ddj.getName()); - deviceInfo.put("deviceType", "DDJ"); - deviceInfo.put("taskNo", ddj.getRwh()); - runningDevices.add(deviceInfo); + DeviceSrgv deviceSrgv = new DeviceSrgv(); + List srgvList = deviceSrgvService.selectDeviceSrgvList(deviceSrgv); + if (srgvList != null && !srgvList.isEmpty()){ + for (DeviceSrgv srgv : srgvList) { + Integer taskNo = srgv.getTaskNo(); + if (taskNo != null && taskNo != 0) { + Map deviceInfo = new HashMap<>(); + deviceInfo.put("deviceCode", srgv.getDeviceId()); + deviceInfo.put("deviceName", srgv.getDeviceName()); + deviceInfo.put("deviceType", "SRGV"); + deviceInfo.put("taskNo", String.valueOf(srgv.getTaskNo())); + runningDevices.add(deviceInfo); + } } } + + DeviceTsj deviceTsj = new DeviceTsj(); + List tsjList = deviceTsjService.selectDeviceTsjList(deviceTsj); + if (tsjList != null && !tsjList.isEmpty()){ + for (DeviceTsj tsj : tsjList) { + Long taskNo = tsj.getRwh(); + if (taskNo != null && taskNo != 0) { + Map deviceInfo = new HashMap<>(); + deviceInfo.put("deviceCode", tsj.getId()); + deviceInfo.put("deviceName", tsj.getName()); + deviceInfo.put("deviceType", "TSJ"); + deviceInfo.put("taskNo", String.valueOf(tsj.getRwh())); + runningDevices.add(deviceInfo); + } + } + } + + return AjaxResult.success(runningDevices); } catch (Exception e) { return AjaxResult.error("获取运行中设备列表失败"); @@ -242,56 +240,65 @@ public class IndexController extends BaseController { public AjaxResult getDeviceStatusChart() { try { Map> statusCount = new HashMap<>(); -// statusCount.put("AGV", new HashMap<>()); - statusCount.put("DDJ", new HashMap<>()); + statusCount.put("SRGV", new HashMap<>()); + statusCount.put("TSJ", new HashMap<>()); statusCount.put("SSJ", new HashMap<>()); // 查询DeviceCar数据（AGV） - DeviceCar deviceCar = new DeviceCar(); - List deviceList = deviceCarService.selectDeviceCarList(deviceCar); + DeviceSrgv deviceSrgv = new DeviceSrgv(); + List deviceSrgvs = deviceSrgvService.selectDeviceSrgvList(deviceSrgv); + + if (deviceSrgvs != null && !deviceSrgvs.isEmpty()){ + for (DeviceSrgv device : deviceSrgvs) { + Integer taskNo = device.getTaskNo(); + String status = "其他"; + // 根据taskNo判断状态：不等于空或0时为运行状态 + if (taskNo != 0 && taskNo != null) { + status = "运行"; + } + Map typeStatusCount = statusCount.get("SRGV"); + typeStatusCount.put(status, typeStatusCount.getOrDefault(status, 0) + 1); - for (DeviceCar device : deviceList) { - String taskNo = device.getTaskNo(); - String status = "其他"; - // 根据taskNo判断状态：不等于空或0时为运行状态 - if (taskNo != null && !taskNo.trim().isEmpty() && !"0".equals(taskNo.trim())) { - status = "运行"; } - Map typeStatusCount = statusCount.get("AGV"); - typeStatusCount.put(status, typeStatusCount.getOrDefault(status, 0) + 1); - } + // 查询DeviceSsj数据（SSJ） DeviceSsj deviceSsj = new DeviceSsj(); List ssjList = deviceSsjService.selectDeviceSsjList(deviceSsj); - for (DeviceSsj ssj : ssjList) { - int taskNo = ssj.getTaskNo(); - String status = "其他"; + if (ssjList != null && !ssjList.isEmpty()){ + for (DeviceSsj ssj : ssjList) { + Integer taskNo = ssj.getTaskNo(); + String status = "其他"; - // 根据taskNo判断状态：不等于空或0时为运行状态 - if (taskNo != 0) { - status = "运行"; + // 根据taskNo判断状态：不等于空或0时为运行状态 + if (taskNo != 0 && taskNo != null) { + status = "运行"; + } + + Map typeStatusCount = statusCount.get("SSJ"); + typeStatusCount.put(status, typeStatusCount.getOrDefault(status, 0) + 1); } - - Map typeStatusCount = statusCount.get("SSJ"); - typeStatusCount.put(status, typeStatusCount.getOrDefault(status, 0) + 1); } - MsgDdj msgDdj = new MsgDdj(); - List msgDdjList = msgDdjService.selectMsgDdjList(msgDdj); - for (MsgDdj ddj : msgDdjList){ - Long taskNo = ddj.getRwh(); - String status = "其他"; - if (taskNo!=0){ - status = "运行"; + DeviceTsj deviceTsj = new DeviceTsj(); + List TsjList = deviceTsjService.selectDeviceTsjList(deviceTsj); + + if (TsjList != null && !TsjList.isEmpty()){ + for (DeviceTsj tsj : TsjList){ + Long taskNo = tsj.getRwh(); + String status = "其他"; + if (taskNo != 0 && taskNo != null){ + status = "运行"; + } + Map typeStatusCount = statusCount.get("TSJ"); + typeStatusCount.put(status,typeStatusCount.getOrDefault(status,0) + 1); } - Map typeStatusCount = statusCount.get("DDJ"); - typeStatusCount.put(status,typeStatusCount.getOrDefault(status,0) + 1); } + return AjaxResult.success(statusCount); } catch (Exception e) { return AjaxResult.error("获取设备状态分布数据失败"); diff --git a/ruoyi-admin/src/main/resources/mapper/device/DeviceSsjMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/DeviceSsjMapper.xml index 0c57cd0..099c730 100644 --- a/ruoyi-admin/src/main/resources/mapper/device/DeviceSsjMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/device/DeviceSsjMapper.xml @@ -6,8 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + @@ -31,8 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"