From 21dedbb10f307260ac6fd77b826fc9158160c2bb Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 15:20:22 +0800
Subject: [PATCH] 数采bug调整
---
cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java | 50 ++++++++++++++++----------------------------------
1 files changed, 16 insertions(+), 34 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 d4e249a..3f15b84 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
@@ -10,7 +10,6 @@
import com.yuanchu.mom.pojo.DataConfig;
import com.yuanchu.mom.pojo.Device;
-import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -30,12 +29,11 @@
/**
* 鏁伴噰鍏ュ彛
*
- * @param request
* @param dataConfig
* @param device
* @return
*/
- public static Map<String, String> dataAcquisitionEntrance(HttpServletRequest request, List<DataConfig> dataConfig, Device device, String entrustCode, String sampleCode, String ip) {
+ public static Map<String, String> dataAcquisitionEntrance(List<DataConfig> dataConfig, Device device, String entrustCode, String sampleCode, String ip) {
String http = HTTP + ip + GETFILE + "?filePath=" + device.getCollectUrl() + "&fileExtension=" + device.getFileType();
String result = null;
try {
@@ -54,7 +52,11 @@
} else {
String data = jsonObject.get("data").toString();
// 鑰冭檻鍒颁竴涓娴嬮」鍙兘浼氬瓨鍦ㄥ涓暟閲囬厤缃紝鎵�浠ラ渶瑕佽繘琛屽垎缁�
- Map<String, List<DataConfig>> userMap = dataConfig.stream().collect(Collectors.groupingBy(DataConfig::getInsProductItem));
+ Map<String, List<DataConfig>> userMap = dataConfig.stream()
+ .peek(i -> i.setInsProductItem(
+ i.getInspectionItem().equals(i.getInspectionItemSubclass()) ? i.getInspectionItem() + "," : i.getInspectionItem() + "," + i.getInspectionItemSubclass()
+ ))
+ .collect(Collectors.groupingBy(DataConfig::getInsProductItem));
Map<String, String> map;
switch (device.getFileType()) {
case ".docx":
@@ -73,7 +75,7 @@
map = analysisMdb(data, userMap, entrustCode, sampleCode);
break;
case ".db":
- map = analysisDb(data, userMap);
+ map = analysisDb(data, userMap, entrustCode, sampleCode);
break;
case ".png":
map = readPngString(data, userMap);
@@ -113,7 +115,7 @@
* @param dataConfig
* @return
*/
- private static Map<String, String> analysisDb(String data, Map<String, List<DataConfig>> dataConfig) {
+ private static Map<String, String> analysisDb(String data, Map<String, List<DataConfig>> dataConfig, String entrustCode, String sampleCode) {
JSONObject jsonObject = JSON.parseObject(data);
JSONArray dataList = JSONArray.parseArray(jsonObject.get("data").toString());
JSONArray columnList = JSONArray.parseArray(jsonObject.get("column").toString());
@@ -122,27 +124,14 @@
List<Object> list = new ArrayList<>();
for (int config = 0; config < v.size(); config++) {
String referx = getRefer(v.get(config).getReferx());
- int x = getXOrY(v.get(config).getX(), k, "X");
- int y = getXOrY(v.get(config).getY(), k, "Y");
- String key = "";
- for (int i = 0; i < columnList.size(); i++) {
- if (columnList.get(i).equals(referx)) {
- key = columnList.get(i + x).toString();
+ for (int i = 0; i < dataList.size(); i++) {
+ JSONObject jsonObject1 = JSON.parseObject(dataList.get(i).toString());
+ if (entrustCode.equals(jsonObject1.get("ExtInfo_Value1"))) {
+ Object o = jsonObject1.get(referx);
+ if (ObjectUtils.isNotEmpty(o)) {
+ list.add(o);
+ }
}
- }
- JSONObject jsonObject1 = JSON.parseObject(dataList.get(y).toString());
- Object o = jsonObject1.get(key);
- if (ObjectUtils.isNotEmpty(o)) {
- // 灏忔暟鐐硅繘涓変綅
- double v1 = 0;
- try {
- v1 = Double.parseDouble(o.toString());
- double v2 = v1 / 1000;
- list.add(v2);
- } catch (NumberFormatException e) {
- list.add(o);
- }
-
}
}
// 杩涜鍏紡璁＄畻
@@ -168,17 +157,10 @@
List<Object> list = new ArrayList<>();
for (int config = 0; config < v.size(); config++) {
String referx = getRefer(v.get(config).getReferx());
- int x = getXOrY(v.get(config).getX(), k, "X");
- String key = "";
- for (int i = 0; i < columnList.size(); i++) {
- if (columnList.get(i).equals(referx)) {
- key = columnList.get(i + x).toString();
- }
- }
for (int i = 0; i < dataList.size(); i++) {
JSONObject jsonObject1 = JSON.parseObject(dataList.get(i).toString());
if (entrustCode.equals(jsonObject1.get("OrderNumber")) && sampleCode.equals(jsonObject1.get("SampleNumber"))) {
- Object o = jsonObject1.get(key);
+ Object o = jsonObject1.get(referx);
if (ObjectUtils.isNotEmpty(o)) {
list.add(o);
}
--
Gitblit v1.9.3