wilson
/
xujie-sys
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-06-27 

功能优化
java8
fengyuan_yang 2 years ago
parent
b16d1fd59c
commit
40c4cc5003
1 changed files with 20 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

38
src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
View File

@ -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 {
// 数据采集方式
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 {
// 数据采集方式
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) {

Write Preview
Loading…
Cancel
Save