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

2024-08-24 

功能优化
java8
fengyuan_yang 2 years ago
parent
9de1e39d86
commit
acc0fc27f7
2 changed files with 19 additions and 10 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. 1
      src/main/java/com/xujie/sys/config/ShiroConfig.java
  2. 28
      src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

1
src/main/java/com/xujie/sys/config/ShiroConfig.java
View File

@ -44,6 +44,7 @@ public class ShiroConfig {
shiroFilter.setFilters(filters);
Map<String, String> filterMap = new LinkedHashMap<>();
filterMap.put("/ckp-file/**", "anon");
// filterMap.put("/**", "authc");
filterMap.put("/webjars/**", "anon");
filterMap.put("/druid/**", "anon");

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

@ -2343,7 +2343,7 @@ public class QcServiceImpl implements QcService {
}
}
// 分批插入
int batchSize = 200; // 假设每批200条记录
int batchSize = 150; // 假设每批200条记录
for (int i = 0; i < subDetailValues.size(); i += batchSize) {
int end = Math.min(i + batchSize, subDetailValues.size());
List<SubDetailValues> subList = subDetailValues.subList(i, end);
@ -2918,7 +2918,7 @@ public class QcServiceImpl implements QcService {
}
}
// 分批插入
int batchSize = 200; // 假设每批200条记录
int batchSize = 150; // 假设每批200条记录
for (int i = 0; i < subDetailValues.size(); i += batchSize) {
int end = Math.min(i + batchSize, subDetailValues.size());
List<SubDetailValues> subList = subDetailValues.subList(i, end);
@ -3540,7 +3540,7 @@ public class QcServiceImpl implements QcService {
}
}
// 分批插入
int batchSize = 200; // 假设每批200条记录
int batchSize = 150; // 假设每批200条记录
for (int i = 0; i < subDetailValues.size(); i += batchSize) {
int end = Math.min(i + batchSize, subDetailValues.size());
List<SubDetailValues> subList = subDetailValues.subList(i, end);
@ -4285,7 +4285,7 @@ public class QcServiceImpl implements QcService {
}
// 分批插入
int batchSize = 200; // 假设每批200条记录
int batchSize = 150; // 假设每批200条记录
for (int i = 0; i < subDetailValues.size(); i += batchSize) {
int end = Math.min(i + batchSize, subDetailValues.size());
List<SubDetailValues> subList = subDetailValues.subList(i, end);
@ -5116,6 +5116,7 @@ public class QcServiceImpl implements QcService {
EquipmentDataAcquisitionData tempAcquisitionData = new EquipmentDataAcquisitionData();
BeanUtils.copyProperties(acquisitionData,tempAcquisitionData);
// 循环数据采集来源
int type = 0;
for (int i = 0; i < acquisitionData.getCollectionSource().split(",").length; i++) {
// 数据采集来源
tempAcquisitionData.setCollectionSource(acquisitionData.getCollectionSource().split(",")[i]);
@ -5137,7 +5138,10 @@ public class QcServiceImpl implements QcService {
tempAcquisitionData.setEquipmentNo(acquisitionData.getEquipmentNo());
if ("file".equals(tempAcquisitionData.getCollectionMethod()) || "plc".equals(tempAcquisitionData.getCollectionMethod()) || "RS232".equals(tempAcquisitionData.getCollectionMethod())) {
// 文件数据采集
tempAcquisitionData.setSubDetailValueType(i);
if (tempAcquisitionData.getCollectionSource().startsWith("value")) {
tempAcquisitionData.setSubDetailValueType(type);
type++;
}
List<SubDetailValues> dataList = qcMapper.dataAcquisition(tempAcquisitionData);
subDetailList.addAll(dataList);
} else if ("image".equals(tempAcquisitionData.getCollectionMethod()) || "fileUrl".equals(tempAcquisitionData.getCollectionMethod())) {
@ -5174,7 +5178,7 @@ public class QcServiceImpl implements QcService {
.collect(Collectors.toList());
// 分批插入
int batchSize = 200; // 假设每批200条记录
int batchSize = 150; // 假设每批200条记录
for (int i = 0; i < groupCannotBeEmpty.size(); i += batchSize) {
int end = Math.min(i + batchSize, groupCannotBeEmpty.size());
List<SubDetailValues> subList = groupCannotBeEmpty.subList(i, end);
@ -5192,7 +5196,7 @@ public class QcServiceImpl implements QcService {
// 新增图片采集信息
if (!fileList.isEmpty()) {
int batchSize2 = 200;
int batchSize2 = 150;
for (int i = 0; i < fileList.size(); i += batchSize2) {
int end = Math.min(i + batchSize2, fileList.size());
List<SysOssEntity> subFileList = fileList.subList(i, end);
@ -5297,6 +5301,7 @@ public class QcServiceImpl implements QcService {
EquipmentDataAcquisitionData tempAcquisitionData = new EquipmentDataAcquisitionData();
BeanUtils.copyProperties(acquisitionData,tempAcquisitionData);
// 循环数据采集来源
int type = 0;
for (int i = 0; i < acquisitionData.getCollectionSource().split(",").length; i++) {
// 数据采集来源
tempAcquisitionData.setCollectionSource(acquisitionData.getCollectionSource().split(",")[i]);
@ -5318,7 +5323,10 @@ public class QcServiceImpl implements QcService {
tempAcquisitionData.setEquipmentNo(acquisitionData.getEquipmentNo());
if ("file".equals(tempAcquisitionData.getCollectionMethod()) || "plc".equals(tempAcquisitionData.getCollectionMethod()) || "RS232".equals(tempAcquisitionData.getCollectionMethod())) {
// 文件数据采集
tempAcquisitionData.setSubDetailValueType(i);
if (tempAcquisitionData.getCollectionSource().startsWith("value")) {
tempAcquisitionData.setSubDetailValueType(type);
type++;
}
List<SubDetailValues> dataList = qcMapper.dataAcquisition(tempAcquisitionData);
subDetailList.addAll(dataList);
} else if ("image".equals(tempAcquisitionData.getCollectionMethod()) || "fileUrl".equals(tempAcquisitionData.getCollectionMethod())) {
@ -5355,7 +5363,7 @@ public class QcServiceImpl implements QcService {
.collect(Collectors.toList());
// 分批插入
int batchSize = 200; // 假设每批200条记录
int batchSize = 150; // 假设每批150条记录
for (int i = 0; i < groupCannotBeEmpty.size(); i += batchSize) {
int end = Math.min(i + batchSize, groupCannotBeEmpty.size());
List<SubDetailValues> subList = groupCannotBeEmpty.subList(i, end);
@ -5373,7 +5381,7 @@ public class QcServiceImpl implements QcService {
// 新增图片采集信息
if (!fileList.isEmpty()) {
int batchSize2 = 200;
int batchSize2 = 150;
for (int i = 0; i < fileList.size(); i += batchSize2) {
int end = Math.min(i + batchSize2, fileList.size());
List<SysOssEntity> subFileList = fileList.subList(i, end);

Write Preview
Loading…
Cancel
Save