From 7c331e84a7151c943d900b34fbd57475d69cdc27 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 24 七月 2024 17:31:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java | 8 +++++---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 3 +++
2 files changed, 8 insertions(+), 3 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 3f15b84..5a2126d 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
@@ -34,7 +34,11 @@
* @return
*/
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 http = HTTP + ip + GETFILE +
+ "?filePath=" + device.getCollectUrl() +
+ "&fileExtension=" + device.getFileType() +
+ "&entrustCode=" + entrustCode +
+ "&sampleCode=" + sampleCode;
String result = null;
try {
result = HttpUtil.get(http);
@@ -118,7 +122,6 @@
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());
Map<String, String> map = new HashMap<>();
dataConfig.forEach((k, v) -> {
List<Object> list = new ArrayList<>();
@@ -151,7 +154,6 @@
private static Map<String, String> analysisMdb(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());
Map<String, String> map = new HashMap<>();
dataConfig.forEach((k, v) -> {
List<Object> list = new ArrayList<>();
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index b2f303d..e5b38c3 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -230,6 +230,9 @@
Map<String, Object> devices = baseMapper.getDeviceMessage(ip, i.getInspectionItem(), i.getInspectionItemSubclass());
if (ObjectUtils.isNotEmpty(devices) && (ObjectUtils.isNotEmpty(devices.get("file_type")) || ObjectUtils.isNotEmpty(devices.get("collect_url")))) {
InsProductResult insProductResult = i.getInsProductResult();
+ if (ObjectUtils.isEmpty(insProductResult)) {
+ insProductResult = new InsProductResult();
+ }
List<Object> list = new ArrayList<>();
Map<Object, Object> hashMap = new HashMap<>();
hashMap.put("v", devices.get("device_name"));
--
Gitblit v1.9.3