bug修改

zhanghua

2023-09-26 89989ff8ff6b38dcee3cab7fa68446ceca5df1de

bug修改

 document/100·ÊÓƵ&ÓÍÑÌÄ£¿é±¨¼Û.xlsx

Binary files differ

 document/ºëÊÓÊÓƵ·ÖÎö±¨¾¯£¨2.X°æ£©ÍÆËÍÄ£¿é½Ó¿Ú˵Ã÷.docx

Binary files differ

 ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java

@@ -17,22 +17,31 @@
import com.ycl.service.auth.AuthService;
import com.ycl.service.ding.BookRemarkService;
import com.ycl.service.ding.DingService;
import com.ycl.service.oss.OssService;
import com.ycl.utils.ConstantPropertiesUtils;
import com.ycl.utils.common.RandomUtils;
import com.ycl.vo.AddressBookVO;
import com.ycl.vo.NewAddressBookVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;

import javax.annotation.Resource;
import java.io.*;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -73,7 +82,8 @@
    private DingConfig dingConfig;



    @Autowired
    private OssService ossService;

    @ApiOperation(value = "根据钉钉授权码获取token")
    @GetMapping("/dingLogin")
@@ -174,111 +184,118 @@
        return CommonResult.success(bookRemarkService.updateRemark(user, userId, remark));
    }

    private String getVideo(String MediaId,MultipartFile file) {
    @ApiOperation(value = "通讯录递归")
    @GetMapping("/getVideo/{mediaId}")
    public CommonResult<String> getVideo(@PathVariable String mediaId) {
        String accessToken = getToken();

        MultipartFile file = getDownload(accessToken, mediaId);
        String url = ossService.uploadImages(file);
        return CommonResult.success(url);
    }


    private MultipartFile getDownload(String access_token, String media_id) {
        CloseableHttpResponse response = null;
        //调用API
        GetClient getClient = executableClient.newGetClient(GET_VIDEO);
        String token =getToken();
        //设置参数
        try {
            if (ObjectUtil.isNotNull(MediaId)) {
            getClient.addParameter("accessToken", token);
            getClient.addParameter("mediaId", MediaId);
//            String result = getClient.get();
//            return parsingResult(result);
            String api = "/media/download";
            GetClient getClient = executableClient.newGetClient(api);
            //设置参数
            getClient.addParameter("access_token", "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ7XCJ1c2VySWRcIjozLFwidXNlcm5hbWVcIjpcImFkbWluXCJ9IiwiY3JlYXRlZCI6MTY5NDY2NDE5MjA4MiwiZXhwIjoxNjk1MjY4OTkyfQ.fSc0sEfLhD3pgrguYZ0Q4Tr-0wjZNwY2xnGsaGzN1d4oXMnEoX9MJmDQcwEiZ1uLKZbGQCqUtJciAIvINmNq9w ");
            getClient.addParameter("media_id", media_id);

            response = getClient.getB();
            HttpEntity entity = response.getEntity();
            InputStream is = entity.getContent();
            File voice = new File("/Users/video/log1.xlsx");
            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) {
            while ((ch = is.read(buffer)) != -1) {
                fos.write(buffer, 0, ch);
                }
            }
            is.close();
            fos.flush();
            fos.close();
            }
            if (file == null) {
                return "上传视频为空";
            }
            String endpoint = ConstantPropertiesUtils.END_POINT;
            String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID;
            String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET;
            String bucketName = ConstantPropertiesUtils.BUCKET_NAME;
            DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");

            // åˆ›å»ºOSSClient实例
            OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
            // èŽ·å–文件的名称
            String fileName = "sczf/" + file.getOriginalFilename();
            ObjectMetadata objectMetadata = new ObjectMetadata();
            objectMetadata.setContentType(getcontentType(fileName.substring(fileName.lastIndexOf("."))));
            // è°ƒç”¨oss的方法实现长传
            // ç¬¬ä¸€ä¸ªå‚æ•° bucketName
            // ç¬¬äºŒä¸ªå‚æ•° ä¸Šä¼ åˆ°oss的文件路径和文件名称
            ossClient.putObject(bucketName, fileName, new ByteArrayInputStream(file.getBytes()), objectMetadata);
            // å…³é—­OSSClient。
            ossClient.shutdown();
            // æŠŠä¸Šä¼ çš„文件路径返回 ï¼ˆæ‰‹åŠ¨æ‹¼æŽ¥ï¼‰
            // è¿™é‡Œè®¾ç½®å›¾ç‰‡æœ‰æ•ˆæ—¶é—´ æˆ‘设置了30å¹´
            Date expiration = new Date(System.currentTimeMillis() + (long) 946080000 * 1000);
            String url = ossClient.generatePresignedUrl(bucketName, fileName, expiration).toString();
            String strDate2 = dtf2.format(LocalDateTime.now());
            String fileName = strDate2 + RandomUtils.generateRandomInt(4) + ".MOV";
            return getMultipartFile(is, fileName);

            return url;
            }catch (Exception e) {
            e.printStackTrace();
        }finally {
        } catch (Exception e) {
            System.out.println(e);
        } finally {
            if (response != null) {
                try {
                    //特别提醒：需要调用response的close方法关闭网络连接！！！
                    response.close();
                } catch (Exception e) {
                    e.printStackTrace();
                    System.out.println(e);
                }
            }
        }
        return null;
    }
    public static String getcontentType(String FilenameExtension) {
        if (FilenameExtension.equalsIgnoreCase(".mp4")||FilenameExtension.equalsIgnoreCase(".mov")) {
            return "video/mp4";
        }
        if (FilenameExtension.equalsIgnoreCase(".bmp")) {
            return "image/bmp";
        }
        if (FilenameExtension.equalsIgnoreCase(".gif")) {
            return "image/gif";
        }
        if (FilenameExtension.equalsIgnoreCase(".jpeg") ||
                FilenameExtension.equalsIgnoreCase(".jpg") ||
                FilenameExtension.equalsIgnoreCase(".png")) {
            return "image/jpg";
        }
        if (FilenameExtension.equalsIgnoreCase(".html")) {
            return "text/html";
        }
        if (FilenameExtension.equalsIgnoreCase(".txt")) {
            return "text/plain";
        }
        if (FilenameExtension.equalsIgnoreCase(".vsd")) {
            return "application/vnd.visio";
        }
        if (FilenameExtension.equalsIgnoreCase(".pptx") ||
                FilenameExtension.equalsIgnoreCase(".ppt")) {
            return "application/vnd.ms-powerpoint";
        }
        if (FilenameExtension.equalsIgnoreCase(".docx") ||
                FilenameExtension.equalsIgnoreCase(".doc")) {
            return "application/msword";
        }
        if (FilenameExtension.equalsIgnoreCase(".xml")) {
            return "text/xml";
        }
        return "image/jpg";

    /**
     * èŽ·å–封装得MultipartFile
     *
     * @param inputStream inputStream
     * @param fileName    fileName
     * @return MultipartFile
     */
    public MultipartFile getMultipartFile(InputStream inputStream, String fileName) {
        FileItem fileItem = createFileItem(inputStream, fileName);
        //CommonsMultipartFile是feign对multipartFile的封装，但是要FileItem类对象
        return new CommonsMultipartFile(fileItem);
    }


    /**
     * FileItem类对象创建
     *
     * @param inputStream inputStream
     * @param fileName    fileName
     * @return FileItem
     */
    public FileItem createFileItem(InputStream inputStream, String fileName) {
        FileItemFactory factory = new DiskFileItemFactory(16, null);
        String textFieldName = "file";
        FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName);
        int bytesRead = 0;
        byte[] buffer = new byte[8192];
        OutputStream os = null;
        //使用输出流输出输入流的字节
        try {
            os = item.getOutputStream();
            while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
                os.write(buffer, 0, bytesRead);
            }
            inputStream.close();
        } catch (IOException e) {
            log.error("Stream copy exception", e);
            throw new IllegalArgumentException("文件上传失败");
        } finally {
            if (os != null) {
                try {
                    os.close();
                } catch (IOException e) {
                    log.error("Stream close exception", e);

                }
            }
            if (inputStream != null) {
                try {
                    inputStream.close();
                } catch (IOException e) {
                    log.error("Stream close exception", e);
                }
            }
        }

        return item;
    }
}


 ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java

@@ -18,6 +18,7 @@
    private String grade;
    private String address;
    private String algoName;
    private String alarmName;
    private String platResourceId;
    private String videoCode;


 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml

@@ -282,7 +282,8 @@
        t3.code as videoCode,
        t1.alarm_time as alarmTime,
        t1.alarm_time as currentAlarmTime,
        t4.algo_name as algoName
        t4.algo_name as algoName,
        t4.alarm_name as alarmName
        FROM ums_base_case t1
        LEFT JOIN ums_violations t2 ON t1.id = t2.id
        LEFT JOIN ums_video_point t3 on t2.video_point_id = t3.id