分离CacheService
This commit is contained in:
parent
2ff1600f20
commit
ce494541d1
@ -1,4 +1,4 @@
|
|||||||
package com.das.modules.calc.domain.vo;
|
package com.das.modules.cache.domain;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -9,6 +9,7 @@ import lombok.Data;
|
|||||||
public class DeviceInfoCache {
|
public class DeviceInfoCache {
|
||||||
private Long deviceId;
|
private Long deviceId;
|
||||||
private String deviceCode;
|
private String deviceCode;
|
||||||
|
private String deviceName;
|
||||||
private Integer objectType;
|
private Integer objectType;
|
||||||
private Long parentDeviceId;
|
private Long parentDeviceId;
|
||||||
}
|
}
|
@ -1,6 +1,6 @@
|
|||||||
package com.das.modules.calc.service;
|
package com.das.modules.cache.service;
|
||||||
|
|
||||||
import com.das.modules.calc.domain.vo.DeviceInfoCache;
|
import com.das.modules.cache.domain.DeviceInfoCache;
|
||||||
import com.das.modules.equipment.entity.SysEquipment;
|
import com.das.modules.equipment.entity.SysEquipment;
|
||||||
import com.das.modules.equipment.mapper.SysEquipmentMapper;
|
import com.das.modules.equipment.mapper.SysEquipmentMapper;
|
||||||
import jakarta.annotation.PostConstruct;
|
import jakarta.annotation.PostConstruct;
|
||||||
@ -61,6 +61,7 @@ public class CacheService {
|
|||||||
DeviceInfoCache deviceInfoCache = new DeviceInfoCache();
|
DeviceInfoCache deviceInfoCache = new DeviceInfoCache();
|
||||||
deviceInfoCache.setDeviceId(equipment.getId());
|
deviceInfoCache.setDeviceId(equipment.getId());
|
||||||
deviceInfoCache.setDeviceCode(equipment.getCode());
|
deviceInfoCache.setDeviceCode(equipment.getCode());
|
||||||
|
deviceInfoCache.setDeviceName(equipment.getName());
|
||||||
deviceInfoCache.setObjectType(equipment.getObjectType());
|
deviceInfoCache.setObjectType(equipment.getObjectType());
|
||||||
deviceInfoCache.setParentDeviceId(equipment.getParentEquipmentId());
|
deviceInfoCache.setParentDeviceId(equipment.getParentEquipmentId());
|
||||||
deviceInfoCaches.add(deviceInfoCache);
|
deviceInfoCaches.add(deviceInfoCache);
|
||||||
@ -68,8 +69,7 @@ public class CacheService {
|
|||||||
deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),i);
|
deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),i);
|
||||||
//创建Id索引
|
//创建Id索引
|
||||||
deviceIdIndex.put(equipment.getId(),i);
|
deviceIdIndex.put(equipment.getId(),i);
|
||||||
//关联风场缓存
|
|
||||||
// if (equipment.getObjectType().equals()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,12 +1,11 @@
|
|||||||
package com.das.modules.calc.functions;
|
package com.das.modules.calc.functions;
|
||||||
|
|
||||||
import com.das.modules.calc.domain.vo.DeviceInfoCache;
|
import com.das.modules.cache.domain.DeviceInfoCache;
|
||||||
import com.das.modules.calc.service.CacheService;
|
import com.das.modules.cache.service.CacheService;
|
||||||
import com.das.modules.data.domain.SnapshotValueQueryParam;
|
import com.das.modules.data.domain.SnapshotValueQueryParam;
|
||||||
import com.das.modules.data.service.DataService;
|
import com.das.modules.data.service.DataService;
|
||||||
import com.googlecode.aviator.runtime.function.AbstractFunction;
|
import com.googlecode.aviator.runtime.function.AbstractFunction;
|
||||||
import com.googlecode.aviator.runtime.type.*;
|
import com.googlecode.aviator.runtime.type.*;
|
||||||
import com.googlecode.aviator.utils.Env;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
@ -1,11 +1,9 @@
|
|||||||
package com.das.modules.calc.functions;
|
package com.das.modules.calc.functions;
|
||||||
|
|
||||||
import com.das.modules.calc.domain.vo.DeviceInfoCache;
|
import com.das.modules.cache.domain.DeviceInfoCache;
|
||||||
import com.das.modules.calc.service.CacheService;
|
import com.das.modules.cache.service.CacheService;
|
||||||
import com.das.modules.data.domain.SnapshotValueQueryParam;
|
|
||||||
import com.das.modules.data.service.DataService;
|
import com.das.modules.data.service.DataService;
|
||||||
import com.das.modules.node.domain.bo.CalculateRTData;
|
import com.das.modules.node.domain.bo.CalculateRTData;
|
||||||
import com.googlecode.aviator.runtime.function.AbstractFunction;
|
|
||||||
import com.googlecode.aviator.runtime.function.AbstractVariadicFunction;
|
import com.googlecode.aviator.runtime.function.AbstractVariadicFunction;
|
||||||
import com.googlecode.aviator.runtime.function.FunctionUtils;
|
import com.googlecode.aviator.runtime.function.FunctionUtils;
|
||||||
import com.googlecode.aviator.runtime.type.AviatorObject;
|
import com.googlecode.aviator.runtime.type.AviatorObject;
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.das.modules.calc.service;
|
package com.das.modules.calc.service;
|
||||||
|
|
||||||
|
import com.das.modules.cache.service.CacheService;
|
||||||
import com.das.modules.calc.domain.entity.CalcModule;
|
import com.das.modules.calc.domain.entity.CalcModule;
|
||||||
import com.googlecode.aviator.AviatorEvaluatorInstance;
|
import com.googlecode.aviator.AviatorEvaluatorInstance;
|
||||||
import com.googlecode.aviator.Expression;
|
import com.googlecode.aviator.Expression;
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.das.modules.calc.service;
|
package com.das.modules.calc.service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import com.das.modules.cache.service.CacheService;
|
||||||
import com.das.modules.calc.domain.entity.CalcModule;
|
import com.das.modules.calc.domain.entity.CalcModule;
|
||||||
import com.das.modules.calc.functions.FunctionRealData;
|
import com.das.modules.calc.functions.FunctionRealData;
|
||||||
import com.das.modules.calc.functions.FunctionSaveCalcData;
|
import com.das.modules.calc.functions.FunctionSaveCalcData;
|
||||||
|
Loading…
Reference in New Issue
Block a user