From 252b4943e54f7ef930f7f7ea01ad1a8a29655dcf Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 23 十月 2023 21:15:09 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeAlarmController.java | 22 +---------------------
ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java | 30 +++++++++++++++---------------
2 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java b/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java
index de8b669..b017b3d 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java
@@ -184,12 +184,12 @@
return CommonResult.success(bookRemarkService.updateRemark(user, userId, remark));
}
- @ApiOperation(value = "閫氳褰曢�掑綊")
+ @ApiOperation(value = "鑾峰彇瑙嗛")
@GetMapping("/getVideo/{mediaId}")
public CommonResult<String> getVideo(@PathVariable String mediaId) {
String accessToken = getToken();
-
- MultipartFile file = getDownload(accessToken, mediaId);
+ String ticket = getTiker(accessToken);
+ MultipartFile file = getDownload(ticket, mediaId);
String url = ossService.uploadImages(file);
return CommonResult.success(url);
}
@@ -201,23 +201,23 @@
String api = "/media/download";
GetClient getClient = executableClient.newGetClient(api);
//璁剧疆鍙傛暟
- getClient.addParameter("access_token", "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ7XCJ1c2VySWRcIjozLFwidXNlcm5hbWVcIjpcImFkbWluXCJ9IiwiY3JlYXRlZCI6MTY5NDY2NDE5MjA4MiwiZXhwIjoxNjk1MjY4OTkyfQ.fSc0sEfLhD3pgrguYZ0Q4Tr-0wjZNwY2xnGsaGzN1d4oXMnEoX9MJmDQcwEiZ1uLKZbGQCqUtJciAIvINmNq9w ");
+ getClient.addParameter("access_token", access_token);
getClient.addParameter("media_id", media_id);
response = getClient.getB();
HttpEntity entity = response.getEntity();
InputStream is = entity.getContent();
- File voice = new File("D:/IMG_4401.MOV");
- OutputStream fos = new FileOutputStream(voice);
- int cache = 10 * 1024;
- byte[] buffer = new byte[cache];
- int ch = 0;
- while ((ch = is.read(buffer)) != -1) {
- fos.write(buffer, 0, ch);
- }
- is.close();
- fos.flush();
- fos.close();
+// File voice = new File("D:/IMG_4401.MOV");
+// OutputStream fos = new FileOutputStream(voice);
+// int cache = 10 * 1024;
+// byte[] buffer = new byte[cache];
+// int ch = 0;
+// while ((ch = is.read(buffer)) != -1) {
+// fos.write(buffer, 0, ch);
+// }
+// is.close();
+// fos.flush();
+// fos.close();
DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
String strDate2 = dtf2.format(LocalDateTime.now());
diff --git a/ycl-platform/src/main/java/com/ycl/controller/smoke/AlarmController.java b/ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeAlarmController.java
similarity index 87%
rename from ycl-platform/src/main/java/com/ycl/controller/smoke/AlarmController.java
rename to ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeAlarmController.java
index 068b238..b86dd23 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/smoke/AlarmController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeAlarmController.java
@@ -1,35 +1,15 @@
package com.ycl.controller.smoke;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ycl.annotation.LogSave;
-import com.ycl.api.CommonPage;
-import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.dto.smoker.InTimeCountDto;
-import com.ycl.dto.smoker.QueryInTimeParam;
-import com.ycl.entity.smoke.OdsCustomer;
-import com.ycl.entity.smoke.OdsInTime;
import com.ycl.service.smoke.IOdsAlarmMsgService;
-import com.ycl.service.smoke.IOdsCustomerService;
-import com.ycl.service.smoke.IOdsInTimeService;
-import com.ycl.utils.EasyExcelUtils;
-import com.ycl.vo.smoke.OdsInTimeVo;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.*;
@RestController
@RequestMapping("/smoke")
@Api(tags = "娌圭儫绠＄悊绠＄悊-鎶ヨ")
-public class AlarmController extends BaseController {
+public class SmokeAlarmController extends BaseController {
IOdsAlarmMsgService alarmMsgService;
--
Gitblit v1.8.0