feat(data): 添加指标别名功能并优化事件查询逻辑
- 在AppLineDetailVo中新增指标别名和其他名称单位字段 - 移除CsEventUserPOMapper.xml中的注释代码 - 重构事件查询SQL,使用CASE语句统一事件等级映射 - 更新事件查询条件,按等级重新分组过滤逻辑 - 优化DataServiceImpl中数据处理流程,增加空值检查和排序 - 添加对电压负序分量和零序分量的特殊处理 - 改进FTP服务实现,使用轮询机制替代固定延时 - 更新事件详情中的等级描述文档
This commit is contained in:
@@ -51,11 +51,13 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
|
||||
}
|
||||
redisUtil.delete(AppRedisKey.DEVICE_ROOT_PATH + nDid);
|
||||
askDeviceDataFeignClient.askDeviceRootPath(nDid);
|
||||
Thread.sleep(3000);
|
||||
Object object = redisUtil.getObjectByKey(AppRedisKey.DEVICE_ROOT_PATH + nDid);
|
||||
if (Objects.nonNull(object)) {
|
||||
makeUpVo.setPrjDataPath(object.toString());
|
||||
makeUpVo.setType("dir");
|
||||
for (int i = 0; i <= 3; i++) {
|
||||
Thread.sleep(1000);
|
||||
Object object = redisUtil.getObjectByKey(AppRedisKey.DEVICE_ROOT_PATH + nDid);
|
||||
if (Objects.nonNull(object)) {
|
||||
makeUpVo.setPrjDataPath(object.toString());
|
||||
makeUpVo.setType("dir");
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
throw new BusinessException(e.getMessage());
|
||||
@@ -75,12 +77,14 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
|
||||
redisUtil.delete(AppRedisKey.PROJECT_INFO + nDid);
|
||||
// 请求设备文件或目录信息
|
||||
askDeviceDataFeignClient.askDeviceFileOrDir(nDid, name);
|
||||
Thread.sleep(10000);
|
||||
// 从 Redis 获取对象
|
||||
Object object = redisUtil.getObjectByKey(AppRedisKey.PROJECT_INFO + nDid);
|
||||
if (object != null) {
|
||||
// 根据类型处理不同的数据
|
||||
processObject(result, object, type);
|
||||
for (int i = 0; i <= 10; i++) {
|
||||
Thread.sleep(1000);
|
||||
// 从 Redis 获取对象
|
||||
Object object = redisUtil.getObjectByKey(AppRedisKey.PROJECT_INFO + nDid);
|
||||
if (object != null) {
|
||||
// 根据类型处理不同的数据
|
||||
processObject(result, object, type);
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// 捕获特定异常并抛出运行时异常
|
||||
|
||||
Reference in New Issue
Block a user