#20230529 欣影管理平台拍照时间表代码

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UploadController.java

@@ -36,8 +36,8 @@ public class UploadController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/uploadApk")
     @Log(title = "上传APK", type = "新增")
-    public ResponseReult<String> issueApk(@RequestBody TerminalUploadVo vo) {
+    public ResponseReult<String> issueApk(@RequestParam("file")MultipartFile file,@RequestParam("version")String version) {
-        ServiceBody<String> serviceBody = uploadService.upload(vo);
+        ServiceBody<String> serviceBody = uploadService.upload(file,version);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {

xymanager_common/src/main/java/com/shxy/xymanager_common/util/UploadUtils.java

@@ -2,6 +2,7 @@ package com.shxy.xymanager_common.util;
 
 import com.shxy.xymanager_common.util.spring.SpringUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.MultipartConfigFactory;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.multipart.MultipartFile;
@@ -24,7 +25,6 @@ public class UploadUtils
     public static String upload(MultipartFile file,String path) throws IOException {
       String fileName = file.getOriginalFilename();
       String newName = UUID.randomUUID().toString()+fileName.substring(fileName.indexOf("."));
-
       File saveFile = new File(path+newName);
       if(!saveFile.getParentFile().exists()){
           saveFile.getParentFile().mkdirs();

xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalUploadVo.java

@@ -12,8 +12,8 @@ import java.util.List;
 @ApiModel(value = "上传参数", description = "上传参数")
 public class TerminalUploadVo {
 
-    @NotNull(message = "装置通道编号")
+
-    @ApiModelProperty(value = "装置通道编号", example = "123455")
+    @ApiModelProperty(value = "上传文件信", example = "123455")
     private MultipartFile file;
 
     @NotNull(message = "apk版本")

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UploadServiceImpl.java

@@ -54,15 +54,15 @@ public class UploadServiceImpl implements UploadService {
     /**
      * 上传文件
      *
-     * @param  vo
+     * @param file,version
      * @return
      */
     @Override
-    public ServiceBody<String> upload(TerminalUploadVo vo) {
+    public ServiceBody<String> upload(MultipartFile file, String version) {
-        String fileName = vo.getFile().getOriginalFilename();
+        String fileName = file.getOriginalFilename();
         try {
-            path = UploadUtils.upload(vo.getFile(), path);
+            path = UploadUtils.upload(file, path);
-            TerminalUpload upload = new TerminalUpload(path, fileName,vo.getVersion());
+            TerminalUpload upload = new TerminalUpload(path, fileName, version);
             uploadDao.insert(upload);
         } catch (IOException e) {
             log.info("upload.exception", e);
@@ -96,14 +96,13 @@ public class UploadServiceImpl implements UploadService {
     public ServiceBody<Boolean> issueApk(TerminalApkVo vo) {
         Cma cma = new Cma(server, port);
 
-            vo.getCmdid().stream().forEach(var -> {
+        vo.getCmdid().stream().forEach(var -> {
-                cma.upgrade(var, vo.getPath());
+            cma.upgrade(var, vo.getPath());
-            });
+        });
 
-        return  Asserts.success(true);
+        return Asserts.success(true);
     }
 
 
-
 }
 

xymanager_service/src/main/java/com/shxy/xymanager_service/service/UploadService.java

@@ -5,6 +5,7 @@ import com.shxy.xymanager_common.model.TerminalApkInfoListModel;
 import com.shxy.xymanager_common.vo.PageVo;
 import com.shxy.xymanager_common.vo.TerminalApkVo;
 import com.shxy.xymanager_common.vo.TerminalUploadVo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  *
@@ -14,11 +15,11 @@ import com.shxy.xymanager_common.vo.TerminalUploadVo;
 public interface UploadService {
 
     /**
-     * 获取所有通道树状列表
+     * 上传文件
      *
      * @return
      */
-    ServiceBody<String> upload(TerminalUploadVo vo);
+    ServiceBody<String> upload(MultipartFile file,String version);
 
     /**
      * 查询APK列表