|
|
@@ -380,52 +380,52 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
|
|
|
}
|
|
|
String fileName = "";
|
|
|
// if (!file.isEmpty()) {
|
|
|
- fileName = file.getOriginalFilename();
|
|
|
- String fileNamePrex = fileName.substring(0, fileName.lastIndexOf("."));
|
|
|
- String[] split = fileNamePrex.split("\\+");
|
|
|
- System.out.println("split" + split);
|
|
|
- for (Part part : partLists) {
|
|
|
- if (split[0] == part.getPartNo()) {
|
|
|
- partFile.setPartId(part.getId());
|
|
|
- }
|
|
|
- if (Constant.PART_FILE_2D.equals(split[1])) {
|
|
|
- partFile.setDwgType(0);
|
|
|
- }
|
|
|
- if (Constant.PART_FILE_3D.equals(split[1])) {
|
|
|
- partFile.setDwgType(1);
|
|
|
- }
|
|
|
+ fileName = file.getOriginalFilename();
|
|
|
+ String fileNamePrex = fileName.substring(0, fileName.lastIndexOf("."));
|
|
|
+ String[] split = fileNamePrex.split("\\+");
|
|
|
+ System.out.println("split" + split);
|
|
|
+ for (Part part : partLists) {
|
|
|
+ if (split[0] == part.getPartNo()) {
|
|
|
+ partFile.setPartId(part.getId());
|
|
|
}
|
|
|
- partFile.setFileName(fileName);
|
|
|
- partFile.setFileSize(FileUtil.getReadableFileSize(file.getSize()));
|
|
|
- System.out.println("上传文件名称" + file.getName() + "， dir = " + dir.getAbsolutePath());
|
|
|
- int pos = fileName.lastIndexOf(".");
|
|
|
- String rand = UUID.randomUUID().toString().replaceAll("-", "");
|
|
|
- String sufix = fileName.substring(pos);
|
|
|
- fileName = rand + sufix;
|
|
|
- partFile.setFileType(sufix);//文件后缀
|
|
|
- partFile.setFileUrl("/upload/" + fileName);
|
|
|
- partFile.setUplodtorId(user.getId());
|
|
|
- partFile.setUploadtor(user.getUsername());
|
|
|
- File saveFile = new File(dir, fileName);
|
|
|
- mouldFileMapper.insert(partFile);
|
|
|
- try {
|
|
|
- saveFile.createNewFile();
|
|
|
- file.transferTo(saveFile);
|
|
|
- } catch (IOException e) {
|
|
|
- e.printStackTrace();
|
|
|
- partFile = null;
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- partFile = null;
|
|
|
+ if (Constant.PART_FILE_2D.equals(split[1])) {
|
|
|
+ partFile.setDwgType(0);
|
|
|
}
|
|
|
- //添加上传记录
|
|
|
- MouldOperationDynamics dynamics = new MouldOperationDynamics();
|
|
|
- dynamics.setContent(Constant.UPLOAD);
|
|
|
- dynamics.setFileName(file.getOriginalFilename());
|
|
|
- dynamics.setOperatorId(user.getId());
|
|
|
- dynamics.setOperatorName(user.getUsername());
|
|
|
- dynamics.setMouldId(userVO.getMouldId());
|
|
|
- mouldOperationDynamicsMapper.insert(dynamics);
|
|
|
+ if (Constant.PART_FILE_3D.equals(split[1])) {
|
|
|
+ partFile.setDwgType(1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ partFile.setFileName(fileName);
|
|
|
+ partFile.setFileSize(FileUtil.getReadableFileSize(file.getSize()));
|
|
|
+ System.out.println("上传文件名称" + file.getName() + "， dir = " + dir.getAbsolutePath());
|
|
|
+ int pos = fileName.lastIndexOf(".");
|
|
|
+ String rand = UUID.randomUUID().toString().replaceAll("-", "");
|
|
|
+ String sufix = fileName.substring(pos);
|
|
|
+ fileName = rand + sufix;
|
|
|
+ partFile.setFileType(sufix);//文件后缀
|
|
|
+ partFile.setFileUrl("/upload/" + fileName);
|
|
|
+ partFile.setUplodtorId(user.getId());
|
|
|
+ partFile.setUploadtor(user.getUsername());
|
|
|
+ File saveFile = new File(dir, fileName);
|
|
|
+ mouldFileMapper.insert(partFile);
|
|
|
+ try {
|
|
|
+ saveFile.createNewFile();
|
|
|
+ file.transferTo(saveFile);
|
|
|
+ } catch (IOException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ partFile = null;
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ partFile = null;
|
|
|
+ }
|
|
|
+ //添加上传记录
|
|
|
+ MouldOperationDynamics dynamics = new MouldOperationDynamics();
|
|
|
+ dynamics.setContent(Constant.UPLOAD);
|
|
|
+ dynamics.setFileName(file.getOriginalFilename());
|
|
|
+ dynamics.setOperatorId(user.getId());
|
|
|
+ dynamics.setOperatorName(user.getUsername());
|
|
|
+ dynamics.setMouldId(userVO.getMouldId());
|
|
|
+ mouldOperationDynamicsMapper.insert(dynamics);
|
|
|
// }
|
|
|
msg.data = partFile;
|
|
|
}
|
