From 40c4cc5003112ac64f15e3579ddb1d9fc9808406 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 27 Jun 2024 10:35:41 +0800 Subject: [PATCH] =?UTF-8?q?2024-06-27=20=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/service/Impl/QcServiceImpl.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index 0b2d3d27..d6fc2e45 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -4805,17 +4805,18 @@ public class QcServiceImpl implements QcService { BeanUtils.copyProperties(acquisitionData,tempAcquisitionData); // 循环数据采集来源 for (int i = 0; i < acquisitionData.getCollectionSource().split(",").length; i++) { + // 数据采集来源 tempAcquisitionData.setCollectionSource(acquisitionData.getCollectionSource().split(",")[i]); - if (acquisitionData.getCollectionMethod().split(",").length > 1) { - tempAcquisitionData.setCollectionMethod(acquisitionData.getCollectionMethod().split(",")[i]); - } else { - tempAcquisitionData.setCollectionMethod(acquisitionData.getCollectionMethod()); - } - if (acquisitionData.getEquipmentNo().split(",").length > 1) { - tempAcquisitionData.setEquipmentNo(acquisitionData.getEquipmentNo().split(",")[i]); - } else { - tempAcquisitionData.setEquipmentNo(acquisitionData.getEquipmentNo()); + // 数据采集方式 + if (tempAcquisitionData.getCollectionSource().startsWith("value")) { // 如果采集来源是以"value"开头则采集方式使用文件数据采集(file) + tempAcquisitionData.setCollectionMethod("file"); + } else if ("photo_value1".equals(tempAcquisitionData.getCollectionSource())){ // // 如果采集来源是"photo_value1"开头则采集方式使用文件数据采集(image) + tempAcquisitionData.setCollectionMethod("image"); + } else if ("file_value1".equals(tempAcquisitionData.getCollectionSource())){ // // 如果采集来源是"file_value1"开头则采集方式使用文件数据采集(fileUrl) + tempAcquisitionData.setCollectionMethod("fileUrl"); } + // 设备号 + tempAcquisitionData.setEquipmentNo(acquisitionData.getEquipmentNo()); if ("file".equals(tempAcquisitionData.getCollectionMethod())) { // 文件数据采集 if (i == 0) { @@ -5029,17 +5030,18 @@ public class QcServiceImpl implements QcService { BeanUtils.copyProperties(acquisitionData,tempAcquisitionData); // 循环数据采集来源 for (int i = 0; i < acquisitionData.getCollectionSource().split(",").length; i++) { + // 数据采集来源 tempAcquisitionData.setCollectionSource(acquisitionData.getCollectionSource().split(",")[i]); - if (acquisitionData.getCollectionMethod().split(",").length > 1) { - tempAcquisitionData.setCollectionMethod(acquisitionData.getCollectionMethod().split(",")[i]); - } else { - tempAcquisitionData.setCollectionMethod(acquisitionData.getCollectionMethod()); - } - if (acquisitionData.getEquipmentNo().split(",").length > 1) { - tempAcquisitionData.setEquipmentNo(acquisitionData.getEquipmentNo().split(",")[i]); - } else { - tempAcquisitionData.setEquipmentNo(acquisitionData.getEquipmentNo()); + // 数据采集方式 + if (tempAcquisitionData.getCollectionSource().startsWith("value")) { // 如果采集来源是以"value"开头则采集方式使用文件数据采集(file) + tempAcquisitionData.setCollectionMethod("file"); + } else if ("photo_value1".equals(tempAcquisitionData.getCollectionSource())){ // // 如果采集来源是"photo_value1"开头则采集方式使用文件数据采集(image) + tempAcquisitionData.setCollectionMethod("image"); + } else if ("file_value1".equals(tempAcquisitionData.getCollectionSource())){ // // 如果采集来源是"file_value1"开头则采集方式使用文件数据采集(fileUrl) + tempAcquisitionData.setCollectionMethod("fileUrl"); } + // 设备号 + tempAcquisitionData.setEquipmentNo(acquisitionData.getEquipmentNo()); if ("file".equals(tempAcquisitionData.getCollectionMethod())) { // 文件数据采集 if (i == 0) {