|
@@ -15,7 +15,9 @@ import com.management.platform.exception.FileCheckException;
|
|
|
import com.management.platform.mapper.*;
|
|
|
import com.management.platform.service.*;
|
|
|
import com.management.platform.task.SFTPAsyncUploader;
|
|
|
-import com.management.platform.util.*;
|
|
|
+import com.management.platform.util.HttpRespMsg;
|
|
|
+import com.management.platform.util.MessageUtils;
|
|
|
+import com.management.platform.util.WorkDayCalculateUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -26,8 +28,6 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
-import java.io.File;
|
|
|
-import java.io.IOException;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
@@ -105,16 +105,16 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
|
|
|
@Override
|
|
|
public HttpRespMsg add(LeaveSheet sheet, String userId, MultipartFile[] files) {
|
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
|
- if(null != files && files.length > 0){
|
|
|
- try {
|
|
|
- for (MultipartFile file : files) {
|
|
|
- checkFile(file);
|
|
|
- }
|
|
|
- } catch (FileCheckException e) {
|
|
|
- msg.setError(e.getMessage());
|
|
|
- return msg;
|
|
|
- }
|
|
|
- }
|
|
|
+// if(null != files && files.length > 0){
|
|
|
+// try {
|
|
|
+// for (MultipartFile file : files) {
|
|
|
+// checkFile(file);
|
|
|
+// }
|
|
|
+// } catch (FileCheckException e) {
|
|
|
+// msg.setError(e.getMessage());
|
|
|
+// return msg;
|
|
|
+// }
|
|
|
+// }
|
|
|
boolean isNew = false;
|
|
|
if (sheet.getId() == null) {
|
|
|
isNew = true;
|
|
@@ -186,55 +186,55 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
|
|
|
if (wxCorpInfo != null) {
|
|
|
sendAuditNotifyMsg(wxCorpInfo, user, sheet);
|
|
|
}
|
|
|
- if(null != files && files.length > 0){
|
|
|
- for (MultipartFile file : files) {
|
|
|
- LeaveSheetFiles leaveSheetFiles = new LeaveSheetFiles();
|
|
|
- leaveSheetFiles.setDocumentName(file.getOriginalFilename());
|
|
|
- leaveSheetFiles.setLeaveSheetId(sheet.getId());
|
|
|
- leaveSheetFiles.setCreatorId(userId);
|
|
|
- leaveSheetFiles.setCreatorName(user.getName());
|
|
|
- String fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
|
|
|
- leaveSheetFiles.setDocumentType(DocumentTypeUtil.DocumentType(fileSuffix));
|
|
|
- //处理文件
|
|
|
- File dir = new File(path);
|
|
|
- if (!dir.exists()) {
|
|
|
- dir.mkdir();
|
|
|
- }
|
|
|
- String fileName = "";
|
|
|
- if (file != null && !file.isEmpty()) {
|
|
|
- fileName = file.getOriginalFilename();
|
|
|
-
|
|
|
- int pos = fileName.lastIndexOf(".");
|
|
|
- String suffix = fileName.substring(pos).toLowerCase();
|
|
|
- //用uuid替换原始的文件名
|
|
|
- String purFName = UUID.randomUUID().toString().replaceAll("-", "");
|
|
|
- fileName = purFName + suffix;
|
|
|
- File saveFile = new File(dir, fileName);
|
|
|
- try {
|
|
|
- saveFile.createNewFile();
|
|
|
- file.transferTo(saveFile);
|
|
|
- //异步上传到备份服务器
|
|
|
- sftpAsyncUploader.uploadFileAsync(saveFile);
|
|
|
- //计算文件大小
|
|
|
- long fileSize = saveFile.length();
|
|
|
- String fileLength = FileUtil.getReadableFileSize(fileSize);
|
|
|
- leaveSheetFiles.setServerName(path + fileName);
|
|
|
- leaveSheetFiles.setSize(fileLength);
|
|
|
- String pathPrefix = "/upload/";
|
|
|
- leaveSheetFiles.setUrl(pathPrefix + fileName);
|
|
|
- leaveSheetFilesMapper.insert(leaveSheetFiles);
|
|
|
- } catch (IOException e) {
|
|
|
- e.printStackTrace();
|
|
|
- fileName = null;
|
|
|
- msg.setError(e.getMessage() + ", path=" + dir.getAbsolutePath());
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- fileName = null;
|
|
|
- msg.setError(e.getMessage() + ", path=" + dir.getAbsolutePath());
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+// if(null != files && files.length > 0){
|
|
|
+// for (MultipartFile file : files) {
|
|
|
+// LeaveSheetFiles leaveSheetFiles = new LeaveSheetFiles();
|
|
|
+// leaveSheetFiles.setDocumentName(file.getOriginalFilename());
|
|
|
+// leaveSheetFiles.setLeaveSheetId(sheet.getId());
|
|
|
+// leaveSheetFiles.setCreatorId(userId);
|
|
|
+// leaveSheetFiles.setCreatorName(user.getName());
|
|
|
+// String fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
|
|
|
+// leaveSheetFiles.setDocumentType(DocumentTypeUtil.DocumentType(fileSuffix));
|
|
|
+// //处理文件
|
|
|
+// File dir = new File(path);
|
|
|
+// if (!dir.exists()) {
|
|
|
+// dir.mkdir();
|
|
|
+// }
|
|
|
+// String fileName = "";
|
|
|
+// if (file != null && !file.isEmpty()) {
|
|
|
+// fileName = file.getOriginalFilename();
|
|
|
+//
|
|
|
+// int pos = fileName.lastIndexOf(".");
|
|
|
+// String suffix = fileName.substring(pos).toLowerCase();
|
|
|
+// //用uuid替换原始的文件名
|
|
|
+// String purFName = UUID.randomUUID().toString().replaceAll("-", "");
|
|
|
+// fileName = purFName + suffix;
|
|
|
+// File saveFile = new File(dir, fileName);
|
|
|
+// try {
|
|
|
+// saveFile.createNewFile();
|
|
|
+// file.transferTo(saveFile);
|
|
|
+// //异步上传到备份服务器
|
|
|
+// sftpAsyncUploader.uploadFileAsync(saveFile);
|
|
|
+// //计算文件大小
|
|
|
+// long fileSize = saveFile.length();
|
|
|
+// String fileLength = FileUtil.getReadableFileSize(fileSize);
|
|
|
+// leaveSheetFiles.setServerName(path + fileName);
|
|
|
+// leaveSheetFiles.setSize(fileLength);
|
|
|
+// String pathPrefix = "/upload/";
|
|
|
+// leaveSheetFiles.setUrl(pathPrefix + fileName);
|
|
|
+// leaveSheetFilesMapper.insert(leaveSheetFiles);
|
|
|
+// } catch (IOException e) {
|
|
|
+// e.printStackTrace();
|
|
|
+// fileName = null;
|
|
|
+// msg.setError(e.getMessage() + ", path=" + dir.getAbsolutePath());
|
|
|
+// } catch (Exception e) {
|
|
|
+// e.printStackTrace();
|
|
|
+// fileName = null;
|
|
|
+// msg.setError(e.getMessage() + ", path=" + dir.getAbsolutePath());
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
return msg;
|
|
|
}
|