修改文件上报日志里删除功能

ipfcst-console/src/main/frontend/views/uploadFile/queryUploadFile/index.vue

@@ -425,7 +425,11 @@ export default {
       // console.log(row.id)
       this.$XModal.confirm('您确定要删除该数据?').then(type => {
         if (type === 'confirm') {
-          this.$axios.delete('/uploadFileLog/' + row.id).then(res => {
+          var data = this.dataTime
+          var dataTime = data.getTime()
+          const nowTimeDate = new Date(dataTime)
+          nowTimeDate.setHours(0, 0, 0, 0)
+          this.$axios.delete('/uploadFileLog/' + row.id+'/'+nowTimeDate.getTime()).then(res => {
             if (res.data === 1) {
               if (row.uploadCounter > 0) {
                 this.$axios.delete('/uploadFileLogDetail/' + row.id).then(res => {

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadFileLogController.java

@@ -94,9 +94,9 @@ public class UploadFileLogController {
 
   }
 
-  @DeleteMapping("/{id}")
-  public ResponseVO deleteById(@PathVariable("id") Integer id){
-    uploadFileLogService.deleteById(id);
+  @DeleteMapping("/{id}/{fileCreateDate}")
+  public ResponseVO deleteById(@PathVariable("id") Integer id,@PathVariable("fileCreateDate") String fileCreateDate){
+    uploadFileLogService.deleteById(id,fileCreateDate);
     return ResponseVO.success(1);
   }
 

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/service/UploadFileLogService.java

@@ -254,6 +254,7 @@ public class UploadFileLogService {
         newUploadFileLog.setUploadProtocolEnum(uploadObject.getUploadProtocolEnum());
         newUploadFileLog.setUploadCounter(0);
         newUploadFileLog.setUploadFileEndTime(null);
+        newUploadFileLog.setStationCode(uploadObject.getStationCode());
         newUploadFileLog.setFileRemarks("手动上传文件");
         uploadFileLog = this.uploadFileLogRepository.save(newUploadFileLog);
         String readyFileKey = uploadObject.getObjectNo() + "@" + fileType + "@" + file.getOriginalFilename();
@@ -288,7 +289,7 @@ public class UploadFileLogService {
   /*
    * 根据id删除日志
    */
-  public void deleteById(Integer id) {
+  public void deleteById(Integer id,String fileCreateDate) {
     try {
       Optional<UploadFileLog> uploadFileLogOptional = uploadFileLogRepository.findById(id);
       if (uploadFileLogOptional.isPresent()) {
@@ -308,23 +309,20 @@ public class UploadFileLogService {
         }
         String errorFileDir = null;
         // 错误文件目录
-        errorFileDir = FileUtil.getFileUploadPath() + File.separator + "error" + File.separator + uploadObject.getObjectNo() + File.separator + uploadFileLog.getFileTypeEnum().name();
-        File errDir = new File(errorFileDir);
-        if (errDir.exists()) {
-          File[] files = errDir.listFiles();
-          for (File file : files) {
-            if (uploadFileLog.getFileName().equals(file.getName())) {
+        errorFileDir = FileUtil.getFileUploadPath() + File.separator + "error" + File.separator + uploadObject.getObjectNo();
+        List<File> files = cn.hutool.core.io.FileUtil.loopFiles(errorFileDir);
+        for (File file:files){
+          if (uploadFileLog.getFileName().equals(file.getName())) {
               file.delete();
-            }
           }
         }
         String backFileDir = null;
         // 备份文件目录
-        backFileDir = FileUtil.getFileUploadPath() + File.separator + "backups" + File.separator + uploadObject.getObjectNo() + File.separator + uploadFileLog.getFileTypeEnum().name();
+        backFileDir = FileUtil.getFileUploadPath() + File.separator + "backups" + File.separator + uploadObject.getObjectNo() + File.separator + DateFormatUtils.format(Long.valueOf(fileCreateDate), "yyyyMMdd'") + File.separator + uploadFileLog.getFileTypeEnum().name();
         File backDir = new File(backFileDir);
         if (backDir.exists()) {
-          File[] files = backDir.listFiles();
-          for (File file : files) {
+          File[] backfiles = backDir.listFiles();
+          for (File file : backfiles) {
             if (uploadFileLog.getFileName().equals(file.getName())) {
               file.delete();
             }