From 7a268ed852ca462347cca383a6d0306ff54e1363 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 04 十一月 2024 15:05:21 +0800
Subject: [PATCH] 添加模版
---
cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
index b143832..dff4725 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
@@ -182,15 +182,7 @@
Object o = jsonObject1.get(refery);
if (ObjectUtils.isNotEmpty(o)) {
numberOfDataEntries.addAndGet(1);
- // 灏忔暟鐐硅繘涓変綅
- double v1 = 0;
- try {
- v1 = Double.parseDouble(o.toString());
- double v2 = v1 / 1000;
- list.add(v2);
- } catch (NumberFormatException e) {
- list.add(o);
- }
+ list.add(o);
}
}
}
@@ -322,7 +314,10 @@
*/
private static Object calculationFormula(List<Object> list, DataConfig dataConfig, String insProductItem, Device device) {
if (list.size() == 0) {
- return null;
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("equipName", device.getDeviceName());
+ hashMap.put("equipValue", device.getManagementNumber());
+ return hashMap;
}
ArrayList<Object> listResult = new ArrayList<>();
Map<String, Object> hashMap = new HashMap<>();
@@ -638,7 +633,6 @@
.map(obj -> {
return new BigDecimal((obj).toString());
}).collect(Collectors.toList());
- System.out.println(bigDecimalList);
//灏嗕腑鏂囩殑(杞崲鑻辨枃鐨�())
formula = formula.replace("锛�", "(")
@@ -650,7 +644,6 @@
if (upperStr.matches(".*\\d.*")) {
upperStr = "";
}
- System.out.println(upperStr);
//鐒跺悗鑾峰彇鏈�澶栭潰鎷彿閲岄潰鐨勫��,鍐嶆牴鎹�","鍒嗗壊
int start = formula.indexOf("(");
int end = -1;
@@ -688,7 +681,6 @@
String[] bracketStrs = arguments.toArray(new String[0]);
List<BigDecimal> results = new ArrayList<>();
for (String expr : bracketStrs) {
- System.out.println("鏇挎崲鍓�" + expr);
Pattern pattern = Pattern.compile("([A-Z])(\\d+)");
Matcher matcher = pattern.matcher(expr);
StringBuffer sb = new StringBuffer();
@@ -702,7 +694,6 @@
}
}
matcher.appendTail(sb);
- System.out.println("鏇挎崲鍚�" + sb.toString());
// 璁＄畻琛ㄨ揪寮�
ScriptEngine engine = new ScriptEngineManager().getEngineByName("JavaScript");
@@ -750,8 +741,6 @@
throw new UnsupportedOperationException("鏆備笉鏀寔鍑芥暟: " + upperStr);
}
}
- System.out.println(results);
- System.out.println("璁＄畻缁撴灉: " + finalResult);
return finalResult.toString();
// 鍚﹀垯锛氭病鏈夊叕寮忎唬琛ㄤ笉闇�瑕佽绠楋紝鐩存帴鎻愬彇List閲岄潰鐨勬暟鎹�
--
Gitblit v1.9.3