xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

平台修改意见20251120-调整表ems_devices_setting字段running_status为device_status，与表ems_pcs_data字段device_status保持一致

Browse Source
This commit is contained in:
zq
2025-12-12 10:47:21 +08:00
parent 73c668709a
commit 0e1c7f52f1
7 changed files with 86 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java
View File

@ -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();
}

46
ems-system/src/main/java/com/xzzn/ems/domain/vo/DeviceUpdateRequest.java Normal file
View File

@ -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;
}
}

3
ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java
View File

@ -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<String, List<EmsDevicesSetting>> initDeviceInfo();
public List<Map<String, Object>> getDeviceListBySiteAndCategory(String siteId, String deviceCategory);
public boolean updateDeviceStatus(DeviceUpdateRequest request);
}

6
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
View File

@ -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<Map<String, Object>> getDeviceListBySiteAndCategory(String siteId, String deviceCategory) {
return emsDevicesMapper.getDeviceInfosBySiteIdAndCategory(siteId, deviceCategory);
}
@Override
public boolean updateDeviceStatus(DeviceUpdateRequest request) {
return false;
}
}

12
ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml
View File

@ -26,12 +26,12 @@
<result property="deviceId" column="device_id" />
<result property="parentId" column="parent_id" />
<result property="deviceCategory" column="device_category" />
<result property="runningStatus" column="running_status" />
<result property="deviceStatus" column="device_status" />
<result property="pictureUrl" column="picture_url" />
</resultMap>
<sql id="selectEmsDevicesSettingVo">
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
</sql>
<select id="selectEmsDevicesSettingList" parameterType="EmsDevicesSetting" resultMap="EmsDevicesSettingResult">
@ -57,7 +57,7 @@
<if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
<if test="parentId != null and parentId != ''"> and parent_id = #{parentId}</if>
<if test="deviceCategory != null and deviceCategory != ''"> and device_category = #{deviceCategory}</if>
<if test="runningStatus != null and runningStatus != ''"> and running_status = #{runningStatus}</if>
<if test="deviceStatus != null and deviceStatus != ''"> and device_status = #{deviceStatus}</if>
<if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
</where>
</select>
@ -90,7 +90,7 @@
<if test="deviceId != null and deviceId != ''">device_id,</if>
<if test="parentId != null">parent_id,</if>
<if test="deviceCategory != null">device_category,</if>
<if test="runningStatus != null">running_status,</if>
<if test="deviceStatus != null">device_status,</if>
<if test="pictureUrl != null">picture_url,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@ -114,7 +114,7 @@
<if test="deviceId != null and deviceId != ''">#{deviceId},</if>
<if test="parentId != null">#{parentId},</if>
<if test="deviceCategory != null">#{deviceCategory},</if>
<if test="runningStatus != null">#{runningStatus},</if>
<if test="deviceStatus != null">#{deviceStatus},</if>
<if test="pictureUrl != null">#{pictureUrl},</if>
</trim>
</insert>
@ -142,7 +142,7 @@
<if test="deviceId != null and deviceId != ''">device_id = #{deviceId},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="deviceCategory != null">device_category = #{deviceCategory},</if>
<if test="runningStatus != null">running_status = #{runningStatus},</if>
<if test="deviceStatus != null">device_status = #{deviceStatus},</if>
<if test="pictureUrl != null">picture_url = #{pictureUrl},</if>
</trim>
where id = #{id}