Browse Source

修改视频

hexiao 2 years ago
parent
commit
0fd70bb58f

+ 1 - 0
hazard-admin/src/main/resources/application.yml

@@ -14,6 +14,7 @@ base:
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
+#  path: http://47.106.159.135:8554
   path: http://47.106.159.135:8554
 
 # 开发环境配置

+ 19 - 4
hazard-sdk/src/main/java/com/ozs/controller/upload/UploadController.java

@@ -23,7 +23,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 public class UploadController {
@@ -38,13 +40,18 @@ public class UploadController {
 
 
     @PostMapping("/putObject")
-    public AjaxResult upLoadImage(@RequestParam("stream") MultipartFile stream,
+    public JSONObject upLoadImage(@RequestParam("stream") MultipartFile stream,
                                   @RequestParam(value = "cameraCode", required = false) String cameraCode,
                                   @RequestParam(value = "size", required = false) Long size,
                                   @RequestParam(value = "contentType", required = false) String contentType,
                                   @RequestParam(value = "lineDir", required = false) Integer lineDir) throws Exception {
+
+        JSONObject jsonObject = new JSONObject();
         if (stream.isEmpty()) {
-            return AjaxResult.error("不能上传空文件哦");
+            jsonObject.put("resultCode", 2);
+            jsonObject.put("message", "失败");
+            jsonObject.put("data", "不能上传空文件哦");
+            return jsonObject;
         }
         //图片保存路径
         //String fileUploadPath ="/"+userId+"/image";
@@ -73,9 +80,17 @@ public class UploadController {
                 uploadFile = "/" + baseCameraManagement.getRailwayCode() + "/" + line + "/" + baseCameraManagement.getInstallMile() + "/" + format1 + "/" + filename;
             }
         } else {
-            return AjaxResult.error("上传功能出错");
+            jsonObject.put("resultCode", 2);
+            jsonObject.put("message", "失败");
+            jsonObject.put("data", "图片为null");
+            return jsonObject;
         }
-        return AjaxResult.success(uploadFile);
+        Map<String, Object> map = new HashMap<>();
+        map.put("imageUrl", uploadFile);
+        jsonObject.put("resultCode", 1);
+        jsonObject.put("message", "成功");
+        jsonObject.put("data", map);
+        return jsonObject;
     }
 
 //    public static void main(String[] args) {