feat(ems): 添加位置坐标字段及区域功能
-树设备挂载 在 EmsLocation 实体及其相关 BO、VO 中新增 x、y 坐标字段 - 更新 Mapper XML 配置以支持新字段映射 - 新增 LocationTreeNodeVo 类用于表示区域树节点结构 - 在 EmsLocationController 中增加 /treeWithDevices 接口 - 在 EmsLocationServiceImpl 中实现 treeWithDevices 方法, 构建带路径的区域树并在叶子节点挂载设备信息 - 注入 IEmsAlarmDeviceService 服务以查询设备数据 - 修改生产环境数据库端口号与密码配置
This commit is contained in:
@@ -50,4 +50,7 @@ public class EmsLocation extends BaseEntity {
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
private Integer x;
|
||||
private Integer y;
|
||||
|
||||
}
|
||||
|
||||
@@ -47,5 +47,8 @@ public class EmsLocationBo extends BaseEntity {
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
private Integer x;
|
||||
private Integer y;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -55,5 +55,16 @@ public class EmsLocationVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 坐标X
|
||||
*/
|
||||
@ExcelProperty(value = "坐标X")
|
||||
private Integer x;
|
||||
/**
|
||||
* 坐标Y
|
||||
*/
|
||||
@ExcelProperty(value = "坐标Y")
|
||||
private Integer y;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.klp.ems.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 区域树节点(包含路径与叶子设备)
|
||||
*/
|
||||
@Data
|
||||
public class LocationTreeNodeVo {
|
||||
private Long locationId;
|
||||
private String name;
|
||||
private Long parentId;
|
||||
private String path;
|
||||
private List<LocationTreeNodeVo> children;
|
||||
private List<com.klp.ems.domain.vo.EmsAlarmDeviceVo> devices;
|
||||
}
|
||||
Reference in New Issue
Block a user