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:
zhouhuang 2024-12-05 13:21:08 +08:00
commit 5ca3eb7c6f
4 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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) {

4
ui/dasadmin/src/lang/common/zh-cn/statAnalysis.ts
View File

@ -1,7 +1,7 @@
export default { export default {
PowerCurveAnalysis: '功率曲线分析', PowerCurveAnalysis: '功率曲线分析',
trendAnalysis: '趋势分析', trendAnalysis: '单机分析',
trendComparison: '趋势对比', trendComparison: '多机对比',
deviceId: '风机', deviceId: '风机',
attributes: '测点名称', attributes: '测点名称',
interval: '间隔', interval: '间隔',

5
ui/dasadmin/src/views/backend/node/index.vue
View File

@ -121,6 +121,7 @@
background background
:pager-count="7" :pager-count="7"
layout="prev, pager, next, jumper,sizes,total" layout="prev, pager, next, jumper,sizes,total"
@change="changePage"
></el-pagination> ></el-pagination>
</div> </div>
</template> </template>
@ -503,6 +504,10 @@ const paginationOptions = reactive({
pageSizes: [20, 50, 100], pageSizes: [20, 50, 100],
}) })
const changePage = ()=>{
getLinkData(clickTreeData.value!.id!)
}
const getLinkData = (nodeId: string, linkName?: string) => { const getLinkData = (nodeId: string, linkName?: string) => {
getLinkListReq({ nodeId, linkName, pageNum: paginationOptions.current, pageSize: paginationOptions.pageSize }) getLinkListReq({ nodeId, linkName, pageNum: paginationOptions.current, pageSize: paginationOptions.pageSize })
.then((res) => { .then((res) => {