bug修改

zhanghua

2023-10-23 252b4943e54f7ef930f7f7ea01ad1a8a29655dcf

bug修改

 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());

 ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeAlarmController.java

File was renamed from ycl-platform/src/main/java/com/ycl/controller/smoke/AlarmController.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;