From d66fe6d46cdbaeb88e68ad96da6deb0b35cd131b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 15 十一月 2024 11:36:28 +0800
Subject: [PATCH] 清理无用代码
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java
index eddc38f..bfa8b73 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java
@@ -589,6 +589,11 @@
+ /**
+ * 鑾峰彇瀹炴椂鏁版嵁灞曠ず鐨勬暟鎹偣鍒楄〃
+ * @param workstationIdList 宸ヤ綅id闆嗗悎
+ * @return map(宸ヤ綅id -> 鏁版嵁鐐归泦鍚�)
+ */
public Map<Long, List<RealTimeStatusVO>> getRealTimeProperties(List<Long> workstationIdList) {
Map<Long, List<RealTimeStatusVO>> properties = new HashMap<>();
@@ -603,7 +608,7 @@
WorkstationDatapointsVO dpVO = wsDpService.getDatapoints(workstationId);
if(dpVO!=null && ObjectUtil.isNotEmpty(dpVO.getDpHead())) {
- String prop,label;
+ String prop;
JSONArray dpCfgJson = JSONArray.parseArray(dpVO.getDpConfig());
for(int i=0;i<dpCfgJson.size();i++) {
cfgRow = dpCfgJson.getJSONObject(i);
@@ -1141,16 +1146,16 @@
}
private IPage<WorkstationRealTimeStatusVO> manualBuildIPage(Query query, List<WorkstationRealTimeStatusVO> result) {
- Page<WorkstationRealTimeStatusVO> page = new Page<>(query.getCurrent().intValue(), query.getSize().intValue(), result.size());
+ Page<WorkstationRealTimeStatusVO> page = new Page<>(query.getCurrent(), query.getSize(), result.size());
if (result.size() == 0) {
return page;
}
- if (query.getSize().intValue() == -1) {
+ if (query.getSize() == -1) {
page.setRecords(result);
- } else if (result.size() < ((query.getCurrent().intValue() - 1) * query.getSize().intValue()) + query.getSize().intValue()) {
- page.setRecords(result.subList((query.getCurrent().intValue() - 1) * query.getSize().intValue(), result.size()));
+ } else if (result.size() < ((query.getCurrent() - 1) * query.getSize()) + query.getSize()) {
+ page.setRecords(result.subList((query.getCurrent() - 1) * query.getSize(), result.size()));
} else {
- page.setRecords(result.subList((query.getCurrent().intValue() - 1) * query.getSize().intValue(), ((query.getCurrent().intValue() - 1) * query.getSize().intValue()) + query.getSize().intValue()));
+ page.setRecords(result.subList((query.getCurrent() - 1) * query.getSize(), ((query.getCurrent() - 1) * query.getSize()) + query.getSize()));
}
return page;
}
@@ -1161,12 +1166,10 @@
return dataList;
}
//TODO锛屾牸寮忓お宸�
- Map<Long, List<RealTimeStatusVO>> realTimePropertiesMap = getRealTimeProperties( list.stream().map((v0) -> {
- return v0.getId();
- }).collect(Collectors.toList()));
+ Map<Long, List<RealTimeStatusVO>> realTimePropertiesMap = getRealTimeProperties( list.stream().map(WorkstationRealTimeStatusVO::getId).collect(Collectors.toList()));
return list.stream().filter(i -> {
- boolean filter = Boolean.TRUE.booleanValue();
+ boolean filter = true;
if (Func.isEmpty(i.getMachineId())) {
filter = false;
}
--
Gitblit v1.9.3