From 0e1c7f52f143a82688332a5f2c0c2b47dcb39432 Mon Sep 17 00:00:00 2001 From: zq Date: Fri, 12 Dec 2025 10:47:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BF=AE=E6=94=B9=E6=84=8F?= =?UTF-8?q?=E8=A7=8120251120-=E8=B0=83=E6=95=B4=E8=A1=A8ems=5Fdevices=5Fse?= =?UTF-8?q?tting=E5=AD=97=E6=AE=B5running=5Fstatus=E4=B8=BAdevice=5Fstatus?= =?UTF-8?q?=EF=BC=8C=E4=B8=8E=E8=A1=A8ems=5Fpcs=5Fdata=E5=AD=97=E6=AE=B5de?= =?UTF-8?q?vice=5Fstatus=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/EmsSiteConfigController.java | 12 +++++ .../com/xzzn/quartz/task/ModbusPoller.java | 14 +++--- .../xzzn/ems/domain/EmsDevicesSetting.java | 12 ++--- .../ems/domain/vo/DeviceUpdateRequest.java | 46 +++++++++++++++++++ .../ems/service/IEmsDeviceSettingService.java | 3 ++ .../impl/EmsDeviceSettingServiceImpl.java | 6 +++ .../mapper/ems/EmsDevicesSettingMapper.xml | 12 ++--- 7 files changed, 86 insertions(+), 19 deletions(-) create mode 100644 ems-system/src/main/java/com/xzzn/ems/domain/vo/DeviceUpdateRequest.java diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java index 3ba4110..3f46464 100644 --- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java +++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java @@ -8,6 +8,7 @@ import com.xzzn.common.utils.file.FileUploadUtils; import com.xzzn.common.utils.file.MimeTypeUtils; import com.xzzn.ems.domain.EmsDevicesSetting; import com.xzzn.ems.domain.EmsSiteSetting; +import com.xzzn.ems.domain.vo.DeviceUpdateRequest; import com.xzzn.ems.domain.vo.PointDataRequest; import com.xzzn.ems.domain.vo.PointQueryResponse; import com.xzzn.ems.domain.vo.SiteDeviceListVo; @@ -21,6 +22,8 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; +import javax.validation.Valid; + /** * * 站点配置 @@ -177,4 +180,13 @@ public class EmsSiteConfigController extends BaseController{ { return success(iEmsDeviceSettingService.getDeviceListBySiteAndCategory(siteId, deviceCategory)); } + + /** + * PCS设备开关机 + */ + @PostMapping("/updateDeviceStatus") + public AjaxResult updateDeviceStatus(@Valid DeviceUpdateRequest request) + { + return success(iEmsDeviceSettingService.updateDeviceStatus(request)); + } } diff --git a/ems-quartz/src/main/java/com/xzzn/quartz/task/ModbusPoller.java b/ems-quartz/src/main/java/com/xzzn/quartz/task/ModbusPoller.java index 3e121d0..2d1b063 100644 --- a/ems-quartz/src/main/java/com/xzzn/quartz/task/ModbusPoller.java +++ b/ems-quartz/src/main/java/com/xzzn/quartz/task/ModbusPoller.java @@ -51,7 +51,7 @@ public class ModbusPoller { public void pollAllDevices() { logger.info("开始执行Modbus设备轮询..."); EmsDevicesSetting selectEntity = new EmsDevicesSetting(); - selectEntity.setRunningStatus(DeviceRunningStatus.RUNNING.getCode()); + selectEntity.setDeviceStatus(DeviceRunningStatus.RUNNING.getCode()); List activeDevices = deviceRepo.selectEmsDevicesSettingList(selectEntity); EmsDevicesSetting device = activeDevices.get(0); @@ -103,8 +103,8 @@ public class ModbusPoller { } // 设备轮询不到修改运行状态 - String beforeStatus = device.getRunningStatus(); - device.setRunningStatus(DeviceRunningStatus.SHUTDOWN.getCode()); + String beforeStatus = device.getDeviceStatus(); + device.setDeviceStatus(DeviceRunningStatus.SHUTDOWN.getCode()); emsDeviceSettingServiceImpl.updateDevice(device); // 轮询设备，设备状态变更日志 @@ -117,16 +117,16 @@ public class ModbusPoller { // 处理获取到的数据 private void processData(EmsDevicesSetting device, int[] data) throws MqttException { - String beforeStatus = device.getRunningStatus(); + String beforeStatus = device.getDeviceStatus(); Boolean error = true; if (data == null || data.length == 0) { logger.warn("设备{}返回空数据", device.getId()); // 设备读取不到-设置设备故障 - device.setRunningStatus(DeviceRunningStatus.FAULT.getCode()); + device.setDeviceStatus(DeviceRunningStatus.FAULT.getCode()); error = false; } else { // 恢复设备状态 - 运行 - device.setRunningStatus(DeviceRunningStatus.RUNNING.getCode()); + device.setDeviceStatus(DeviceRunningStatus.RUNNING.getCode()); } emsDeviceSettingServiceImpl.updateDevice(device); // 轮询设备，设备状态变更日志 @@ -171,7 +171,7 @@ public class ModbusPoller { log.setSiteId(device.getSiteId()); log.setDeviceId(device.getDeviceId()); log.setBeforeStatus(beforeStatus); - log.setAfterStatus(device.getRunningStatus()); + log.setAfterStatus(device.getDeviceStatus()); log.setCreateBy("sys"); log.setCreateTime(new Date()); return log; diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java index d2a350e..13a9d98 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java @@ -104,7 +104,7 @@ public class EmsDevicesSetting extends BaseEntity /** 设备运行状态：0-离线、1-待机、2-运行、3-故障、4-停机 */ @Excel(name = "设备运行状态：0-离线、1-待机、2-运行、3-故障、4-停机") - private String runningStatus; + private String deviceStatus; /** 设备图像地址 */ @Excel(name = "设备图像地址") @@ -320,12 +320,12 @@ public class EmsDevicesSetting extends BaseEntity return deviceCategory; } - public String getRunningStatus() { - return runningStatus; + public String getDeviceStatus() { + return deviceStatus; } - public void setRunningStatus(String runningStatus) { - this.runningStatus = runningStatus; + public void setDeviceStatus(String deviceStatus) { + this.deviceStatus = deviceStatus; } public void setPictureUrl(String pictureUrl) @@ -362,7 +362,7 @@ public class EmsDevicesSetting extends BaseEntity .append("deviceId", getDeviceId()) .append("parentId", getParentId()) .append("deviceCategory", getDeviceCategory()) - .append("runningStatus", getRunningStatus()) + .append("deviceStatus", getDeviceStatus()) .append("pictureUrl", getPictureUrl()) .toString(); } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/DeviceUpdateRequest.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/DeviceUpdateRequest.java new file mode 100644 index 0000000..ba5db62 --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/DeviceUpdateRequest.java @@ -0,0 +1,46 @@ +package com.xzzn.ems.domain.vo; + +import javax.validation.constraints.NotBlank; + +/** + * 设备信息更新入参 + * + */ +public class DeviceUpdateRequest { + + /** 站点id */ + @NotBlank(message = "站点ID不能为空") + private String siteId; + + /** 设备id */ + @NotBlank(message = "设备ID不能为空") + private String deviceId; + + /** 设备状态：0-离线、1-待机、2-运行、3-故障、4-停机 */ + private String deviceStatus; + + + public String getSiteId() { + return siteId; + } + + public void setSiteId(String siteId) { + this.siteId = siteId; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getDeviceStatus() { + return deviceStatus; + } + + public void setDeviceStatus(String deviceStatus) { + this.deviceStatus = deviceStatus; + } +} diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java index 60aca5e..d38d27b 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java @@ -3,6 +3,7 @@ package com.xzzn.ems.service; import com.xzzn.common.enums.DeviceCategory; import com.xzzn.ems.domain.EmsDevicesSetting; import com.xzzn.ems.domain.EmsPointMatch; +import com.xzzn.ems.domain.vo.DeviceUpdateRequest; import com.xzzn.ems.domain.vo.PointDataRequest; import com.xzzn.ems.domain.vo.PointQueryResponse; @@ -33,4 +34,6 @@ public interface IEmsDeviceSettingService public Map> initDeviceInfo(); public List> getDeviceListBySiteAndCategory(String siteId, String deviceCategory); + + public boolean updateDeviceStatus(DeviceUpdateRequest request); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java index 465096c..1f8ca96 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java @@ -11,6 +11,7 @@ import com.xzzn.common.enums.SiteEnum; import com.xzzn.common.utils.DateUtils; import com.xzzn.common.utils.StringUtils; import com.xzzn.ems.domain.EmsDevicesSetting; +import com.xzzn.ems.domain.vo.DeviceUpdateRequest; import com.xzzn.ems.domain.vo.PointDataRequest; import com.xzzn.ems.domain.vo.PointQueryResponse; import com.xzzn.ems.mapper.EmsBatteryDataMinutesMapper; @@ -468,4 +469,9 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService public List> getDeviceListBySiteAndCategory(String siteId, String deviceCategory) { return emsDevicesMapper.getDeviceInfosBySiteIdAndCategory(siteId, deviceCategory); } + + @Override + public boolean updateDeviceStatus(DeviceUpdateRequest request) { + return false; + } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml index fa6e930..574002f 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml @@ -26,12 +26,12 @@ - + - select id, device_name, device_type, slave_id, timeout_ms, retries, ip_address, ip_port, serial_port, baud_rate, data_bits, stop_bits, parity, description, created_at, updated_at, site_id, communication_status, device_id, parent_id, device_category, running_status, picture_url from ems_devices_setting + select id, device_name, device_type, slave_id, timeout_ms, retries, ip_address, ip_port, serial_port, baud_rate, data_bits, stop_bits, parity, description, created_at, updated_at, site_id, communication_status, device_id, parent_id, device_category,device_status, picture_url from ems_devices_setting @@ -90,7 +90,7 @@ device_id, parent_id, device_category, - running_status, + device_status, picture_url, @@ -114,7 +114,7 @@ #{deviceId}, #{parentId}, #{deviceCategory}, - #{runningStatus}, + #{deviceStatus}, #{pictureUrl}, @@ -142,7 +142,7 @@ device_id = #{deviceId}, parent_id = #{parentId}, device_category = #{deviceCategory}, - running_status = #{runningStatus}, + device_status = #{deviceStatus}, picture_url = #{pictureUrl}, where id = #{id}