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

2024-08-02 

采集优化
java8
fengyuan_yang 2 years ago
parent
d31ae28117
commit
cb51349e00
3 changed files with 58 additions and 50 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. 4
      src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
  2. 102
      src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
  3. 2
      src/main/java/com/xujie/sys/modules/pms/service/QcService.java

4
src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
View File

@ -1732,8 +1732,8 @@ public class QcController {
* @return
*/
@PostMapping("/upload")
public R upload(@RequestParam("file") MultipartFile file, @ModelAttribute GetParamInData inData){
SysOssEntity ossEntity = qcService.upload(file, inData);
public R upload(@RequestParam("file") MultipartFile[] list, @ModelAttribute GetParamInData inData){
List<SysOssEntity> ossEntity = qcService.upload(list, inData);
return R.ok().put("ossEntity", ossEntity);
}

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

@ -4927,52 +4927,56 @@ public class QcServiceImpl implements QcService {
/**
* 文件上传
* @param file
* @param list
* @param inData
* @return
*/
@Override
public SysOssEntity upload(MultipartFile file, GetParamInData inData) {
if (file.isEmpty()) {
public List<SysOssEntity> upload(MultipartFile[] list, GetParamInData inData) {
if (Objects.isNull(list) || list.length == 0) {
throw new XJException("上传文件不能为空");
}
// 保存文件信息
SysOssEntity ossEntity = new SysOssEntity();
// 处理文件后缀
int chartIndex = file.getOriginalFilename().lastIndexOf(".");
String suffix = "";
String fileName = "";
// 判断是否存在
if (chartIndex > 0) {
suffix = file.getOriginalFilename().substring(chartIndex);
fileName = file.getOriginalFilename().substring(0, chartIndex);
}
String newFileName = RandomUtil.getOrderNoByAtomic1("file") + suffix;
String basePath = filePath;
String baseDatePath = DateUtils.format(new Date());
File baseFilePath = new File(basePath + "\\" + baseDatePath + "\\" + inData.getFolder());
if (!baseFilePath.exists()) {
baseFilePath.mkdirs();
}
//最终的目录
String finalFileName = baseFilePath.getPath() + "\\" + newFileName;
try {
baseFilePath = multipartFileToFile(file, finalFileName);
}catch (Exception e){
throw new XJException(e.getMessage());
List<SysOssEntity> ossEntityList = new ArrayList<>();
for (MultipartFile file : list) {
// 保存文件信息
SysOssEntity ossEntity = new SysOssEntity();
// 处理文件后缀
int chartIndex = file.getOriginalFilename().lastIndexOf(".");
String suffix = "";
String fileName = "";
// 判断是否存在
if (chartIndex > 0) {
suffix = file.getOriginalFilename().substring(chartIndex);
fileName = file.getOriginalFilename().substring(0, chartIndex);
}
String newFileName = RandomUtil.getOrderNoByAtomic1("file") + suffix;
String basePath = filePath;
String baseDatePath = DateUtils.format(new Date());
File baseFilePath = new File(basePath + "\\" + baseDatePath + "\\" + inData.getFolder());
if (!baseFilePath.exists()) {
baseFilePath.mkdirs();
}
//最终的目录
String finalFileName = baseFilePath.getPath() + "\\" + newFileName;
try {
baseFilePath = multipartFileToFile(file, finalFileName);
}catch (Exception e){
throw new XJException(e.getMessage());
}
ossEntity.setUrl(baseFilePath.getPath());
ossEntity.setCreatedBy(inData.getCreateBy());
ossEntity.setFileType(suffix.substring(1));
ossEntity.setFileName(fileName+suffix);
ossEntity.setNewFileName(newFileName);
ossEntity.setCreateDate(new Date());
ossEntity.setOrderRef1(inData.getOrderRef1());
ossEntity.setOrderRef2(inData.getOrderRef2());
ossEntity.setOrderRef3(inData.getOrderRef3());
ossEntity.setOrderRef4(inData.getOrderRef4());
sysOssService.save(ossEntity);
ossEntityList.add(ossEntity);
}
ossEntity.setUrl(baseFilePath.getPath());
ossEntity.setCreatedBy(inData.getCreateBy());
ossEntity.setFileType(suffix.substring(1));
ossEntity.setFileName(fileName+suffix);
ossEntity.setNewFileName(newFileName);
ossEntity.setCreateDate(new Date());
ossEntity.setOrderRef1(inData.getOrderRef1());
ossEntity.setOrderRef2(inData.getOrderRef2());
ossEntity.setOrderRef3(inData.getOrderRef3());
ossEntity.setOrderRef4(inData.getOrderRef4());
sysOssService.save(ossEntity);
return ossEntity;
return ossEntityList;
}
@Override
@ -5111,10 +5115,12 @@ public class QcServiceImpl implements QcService {
// 数据采集来源
tempAcquisitionData.setCollectionSource(acquisitionData.getCollectionSource().split(",")[i]);
// 数据采集方式
if (tempAcquisitionData.getCollectionSource().startsWith("value") && "file".equals(tempAcquisitionData.getCollectionMethod())) { // 如果采集来源是以"value"开头则采集方式使用文件数据采集(file)
tempAcquisitionData.setCollectionMethod("file");
} else if (tempAcquisitionData.getCollectionSource().startsWith("value") && "plc".equals(tempAcquisitionData.getCollectionMethod())) { // plc 数据采集
tempAcquisitionData.setCollectionMethod("plc");
if (tempAcquisitionData.getCollectionSource().startsWith("value")) { // 如果采集来源是以"value"开头则采集方式使用文件数据采集(file)
if (tempAcquisitionData.getCollectionMethod().contains("plc")) {
tempAcquisitionData.setCollectionMethod("plc");
} else {
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)
@ -5338,10 +5344,12 @@ public class QcServiceImpl implements QcService {
// 数据采集来源
tempAcquisitionData.setCollectionSource(acquisitionData.getCollectionSource().split(",")[i]);
// 数据采集方式
if (tempAcquisitionData.getCollectionSource().startsWith("value") && "file".equals(tempAcquisitionData.getCollectionMethod())) { // 如果采集来源是以"value"开头则采集方式使用文件数据采集(file)
tempAcquisitionData.setCollectionMethod("file");
} else if (tempAcquisitionData.getCollectionSource().startsWith("value") && "plc".equals(tempAcquisitionData.getCollectionMethod())) { // plc 数据采集
tempAcquisitionData.setCollectionMethod("plc");
if (tempAcquisitionData.getCollectionSource().startsWith("value")) { // 如果采集来源是以"value"开头则采集方式使用文件数据采集(file)
if (tempAcquisitionData.getCollectionMethod().contains("plc")) {
tempAcquisitionData.setCollectionMethod("plc");
} else {
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)

2
src/main/java/com/xujie/sys/modules/pms/service/QcService.java
View File

@ -269,7 +269,7 @@ public interface QcService {
void iqcRecordOverLoad(QcFAIRecordData data);
SysOssEntity upload(MultipartFile file, GetParamInData inData);
List<SysOssEntity> upload(MultipartFile[] list, GetParamInData inData);
List<QcFAIRecordData> searchSeqInfo(QcFAIRecordData data);

Write Preview
Loading…
Cancel
Save