liuchengqian/industrial_measurement
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

更新参数类型

Browse Source
This commit is contained in:
liuchengqian 2022-03-01 14:39:41 +08:00
parent b0afd5f4aa
commit 266c46fe16
5 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/xkrs/controller/FileController.java
View File

@ -59,7 +59,7 @@ public class FileController {
@Transactional(rollbackOn = Exception.class)
public String updateFileUploadPath(@RequestBody FileUpdateQo fileUpdateQo, @RequestParam("fileExcel") MultipartFile fileExcel) throws IOException {
Locale locale = LocaleContextHolder.getLocale();
String file = ExcelUploadUtil.memoryFile(fileExcel);
String file = ExcelUploadUtil.memoryFile(fileExcel,1);
fileDao.updateFileUploadPath(fileUpdateQo.getLotNo(), fileUpdateQo.getMachineNo(), fileUpdateQo.getMaterialNo(), fileUpdateQo.getModelNo(), fileUpdateQo.getPartNo(), file);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "修改成功！", locale);
}

1
src/main/java/com/xkrs/dao/PictureDao.java
View File

@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Optional;
/**

2
src/main/java/com/xkrs/service/impl/FileServiceImpl.java
View File

@ -54,7 +54,7 @@ public class FileServiceImpl implements FileService {
if (fileExcel == null) {
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "模板不能为空！", locale);
}
String file = ExcelUploadUtil.memoryFile(fileExcel);
String file = ExcelUploadUtil.memoryFile(fileExcel,1);
FileEntity fileEntity1 = new FileEntity();
fileEntity1.setLotNo(fileQo.getLotNo());
fileEntity1.setMachineNo(fileQo.getMachineNo());

2
src/main/java/com/xkrs/service/impl/PictureServiceImpl.java
View File

@ -35,7 +35,7 @@ public class PictureServiceImpl implements PictureService {
if (pictureEntity2.isPresent()) {
return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "请勿重复添加!", locale);
}
String file = ExcelUploadUtil.memoryFile(pictureFile);
String file = ExcelUploadUtil.memoryFile(pictureFile, 2);
PictureEntity pictureEntity1 = new PictureEntity();
pictureEntity1.setLotNo(lotNo);
pictureEntity1.setMachineNo(machineNo);

22
src/main/java/com/xkrs/util/ExcelUploadUtil.java
View File

@ -23,16 +23,18 @@ public class ExcelUploadUtil {
/**
* 上传单张图片
* @param fileExcel
*
* @param fileInput
* @return
* @throws IOException
*/
public static String memoryFile(MultipartFile fileExcel) throws IOException {
public static String memoryFile(MultipartFile fileInput, int subDirType) throws IOException {
String subDir = subDirType == 1 ? "excel/" : "picture/";
//String uploadPath = "http://139.199.98.175:2088/wfTaskImage/";
// String uploadPath = "http://192.168.2.9:2088/";
String uploadPath = "http://118.24.27.47:4096/";
//获取原始文件名
String originalFilename = fileExcel.getOriginalFilename();
String originalFilename = fileInput.getOriginalFilename();
if (originalFilename != null && !"".equals(originalFilename)) {
//找到 . 的位置
int index = originalFilename.lastIndexOf(".");
@ -42,16 +44,16 @@ public class ExcelUploadUtil {
String newName = UUID.randomUUID().toString() + suffix;
//将图片保存到本地/usr/etc/images/Folder
//File file = new File("E:/shoptest/");
File file = new File("/home/sxy/server/industrial_measurement/excel/");
// File file = new File("/Users/liuchengqian/Desktop/DaJiang/");
File file = new File("/home/sxy/server/industrial_measurement/" + subDir);
if (!file.exists()) {
file.mkdirs();
}
//String path = "E:/shoptest/" + newName;
String path = "/home/sxy/server/industrial_measurement/excel/" + newName;
// String path = "/Users/liuchengqian/Desktop/DaJiang/"+newName;
String path = "/home/sxy/server/industrial_measurement/" + subDir + newName;
String uploadsImage = uploadPath + newName;
//实现上传
fileExcel.transferTo(new File(path));
fileInput.transferTo(new File(path));
return path;
}
return null;
@ -99,9 +101,9 @@ public class ExcelUploadUtil {
}*/
/**
* 删除本地或服务器储存的图片
*
* @param path
* @return
*/
@ -127,6 +129,7 @@ public class ExcelUploadUtil {
/**
* 通过图片路径解析 ，上传保存
*
* @param listImgSrc
* @return
*/
@ -171,6 +174,7 @@ public class ExcelUploadUtil {
/**
* 删除本地文件夹图片
*
* @param url
*/
public static void deleteImage(String url) {