文件上传修改返回数据格式

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/file/FileInfo.java

@@ -75,6 +75,7 @@ public class FileInfo implements Serializable {
 
     @NotNull(message = "文件删除标志不能为空")
     private Integer delFlag;
+
     @NotNull(message = "文件状态不能为空")
     private Integer status;
 

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/response/HttpResult.java

@@ -78,4 +78,12 @@ public class HttpResult implements Serializable {
 		r.setData(data);
 		return r;
 	}
+
+    public static HttpResult ok(int code,String msg, Object data) {
+        HttpResult r = new HttpResult();
+        r.setCode(code);
+        r.setMsg(msg);
+        r.setData(data);
+        return r;
+    }
 }

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/DateUtil.java

@@ -76,13 +76,21 @@ public class DateUtil {
         return format;
     }
 
-    public static LocalDate localDateToLocalDate(LocalDate date) {
+    public static LocalDateTime localDateToLocalDateEnd(LocalDate date) {
         String str = dateToStr(date, "yyyy-MM-dd") + " 23:59:59";
 //        LocalDate localDate = parseLocalDate(str);
-        LocalDate localDate = LocalDate.parse(str, YYYY_MM_DD_HH_MM_SS);
-        return localDate;
+        LocalDateTime localDateTime = LocalDateTime.parse(str, YYYY_MM_DD_HH_MM_SS);
+        return localDateTime;
+    }
+
+    public static LocalDateTime localDateToLocalDateStart(LocalDate date) {
+        String str = dateToStr(date, "yyyy-MM-dd") + " 00:00:00";
+//        LocalDate localDate = parseLocalDate(str);
+        LocalDateTime localDateTime = LocalDateTime.parse(str, YYYY_MM_DD_HH_MM_SS);
+        return localDateTime;
     }
 
+
     public static String dateToStr(LocalDate date) {
         return dateToStr(date, "yyyy-MM-dd");
     }

sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java

@@ -3,11 +3,10 @@ package com.sckw.file.controller;
 import com.sckw.core.model.file.FileInfo;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.core.web.response.result.Result;
 import com.sckw.core.web.response.result.Status;
 import com.sckw.file.api.dto.FileInfoDTO;
-import com.sckw.file.service.FileService;
 import com.sckw.file.dubbo.FileDubboApiServiceImpl;
+import com.sckw.file.service.FileService;
 import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -139,13 +138,13 @@ public class FileApiController {
      * @param file
      * @return
      */
-    @RequestMapping(value = "/appUploadFileInfo", method = RequestMethod.POST)
-    public Result appUploadFileInfo(@RequestParam("file") MultipartFile file) {
+    @RequestMapping(value = "/appUploadFileInfo", method = RequestMethod.POST,produces = "application/json")
+    public HttpResult appUploadFileInfo(@RequestParam("file") MultipartFile file) {
         try {
             return fileService.appUploadFileInfo(file);
         } catch (Exception e) {
             log.info("上传文件失败:{}",e.getMessage(),e);
-            return Result.build(Status.FAILURE,"上传文件失败:" + e.getMessage());
+            return HttpResult.error(Status.FAILURE.getCode(),"上传文件失败:" + e.getMessage());
         }
     }
 

sckw-modules/sckw-file/src/main/java/com/sckw/file/service/FileService.java

@@ -13,7 +13,6 @@ import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.core.web.response.result.Result;
 import com.sckw.core.web.response.result.Status;
 import com.sckw.file.api.dto.FileInfoDTO;
 import com.sckw.file.config.FileListConfig;
@@ -264,7 +263,7 @@ public class FileService {
         return HttpResult.ok(fileInfoVO);
     }
 
-    private void insertFile(FileInfo fileInfo) throws ParseException {
+    private void insertFile(FileInfo fileInfo){
         kwfFileInfo kwfFileInfo = new kwfFileInfo();
         kwfFileInfo.setOriginalName(fileInfo.getFileOriginalName());
         kwfFileInfo.setFileSuffix(FilenameUtils.getExtension(fileInfo.getFileOriginalName()));
@@ -284,10 +283,11 @@ public class FileService {
     }
 
 
-    public Result appUploadFileInfo(MultipartFile file) throws ParseException {
+    @Transactional
+    public HttpResult appUploadFileInfo(MultipartFile file){
         boolean flag = checkFileFormat(file);
         if (!flag) {
-            return Result.build(Status.FAILURE, "上传文件格式错误!");
+            return HttpResult.error(Status.FAILURE.getCode(), "上传文件格式错误!");
         }
         FileInfo fileInfo = FileUtils.getFileDataList(file);
         fileInfo.setType(FileEnum.FILE_STORE_TYPE_OSS.getFileType());
@@ -295,7 +295,7 @@ public class FileService {
         FileInfoVO fileInfoVO = new FileInfoVO();
         BeanUtils.copyProperties(returnFileInfo, fileInfoVO);
         insertFile(returnFileInfo);
-        return Result.build(Status.SUCCESS, fileInfoVO);
+        return HttpResult.ok(Status.SUCCESS.getCode(),"", fileInfoVO);
     }
 
     /**