sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.jsspisoft.com/ry-das

Browse Source
This commit is contained in:
高云鹏 2024-12-05 12:03:00 +08:00
commit c9430948da
4 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
das-dn/third_party/AdsLib/AdsDef.h vendored
View File

@ -8,7 +8,7 @@
#if defined(USE_TWINCAT_ROUTER) #if defined(USE_TWINCAT_ROUTER)
#include "TwinCAT/AdsDef.h" #include "TwinCAT/AdsDef.h"
#else #else
#include "standalone/AdsDef.h" #include "Standalone/AdsDef.h"
#endif #endif
#include <iosfwd> #include <iosfwd>

2
das-dn/third_party/AdsLib/AdsLib.h vendored
View File

@ -8,7 +8,7 @@
#if defined(USE_TWINCAT_ROUTER) #if defined(USE_TWINCAT_ROUTER)
#include "TwinCAT/AdsLib.h" #include "TwinCAT/AdsLib.h"
#else #else
#include "standalone/AdsLib.h" #include "Standalone/AdsLib.h"
#endif #endif
#include "Sockets.h" #include "Sockets.h"

2
das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java vendored
View File

@ -87,7 +87,7 @@ public class EquipmentCacheImpl implements EquipmentCache {
} }
else{ else{
deviceInfoCaches.add(deviceInfoCache); deviceInfoCaches.add(deviceInfoCache);
index = deviceInfoCaches.size(); index = deviceInfoCaches.size() - 1;
deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),index); deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),index);
deviceIdIndex.put(equipment.getId(),index); deviceIdIndex.put(equipment.getId(),index);
} }

23
das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java
View File

@ -35,29 +35,6 @@ public class FunctionSaveCalcData extends AbstractVariadicFunction {
return "save"; return "save";
} }
// @Override
// public AviatorObject call(Map<String, Object> env, AviatorObject deviceCode, AviatorObject attributes) {
// //设备Code
// String code = (String)deviceCode.getValue(env);
// DeviceInfoCache deviceInfoCache = cacheService.getDeviceInfoCache(code);
// //属性列表
// List<String> list = (List<String>)attributes.getValue(env);
// List<String> attrs = list.stream().map(String::toLowerCase).toList();
// SnapshotValueQueryParam snapshotValueQueryParam = new SnapshotValueQueryParam();
// snapshotValueQueryParam.setDeviceId(String.valueOf(deviceInfoCache.getDeviceId()));
// snapshotValueQueryParam.setAttributes(attrs);
// Map<String, Map<String, Object>> stringMapMap = dataService.querySnapshotValues(List.of(snapshotValueQueryParam));
// Map<String,Object> data = stringMapMap.get(String.valueOf(deviceInfoCache.getDeviceId()));
// log.info("{}", data);
// Map<String,Object> result = new HashMap<>(list.size());
// for (String s : list) {
// String key = s.toLowerCase();
// Object value = data.get(key);
// result.put(s, value);
// }
// return AviatorRuntimeJavaType.valueOf(result);
// }
@SneakyThrows @SneakyThrows
@Override @Override
public AviatorObject variadicCall(Map<String, Object> env, AviatorObject... args) { public AviatorObject variadicCall(Map<String, Object> env, AviatorObject... args) {