document/±¤ÀÝ»ú-²Ù×÷ÊÖ²á(1).docx

Binary files differ

 ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java

@@ -33,7 +33,7 @@
            // è°ƒç”¨oss的方法实现长传
            // ç¬¬ä¸€ä¸ªå‚æ•° bucketName
            // ç¬¬äºŒä¸ªå‚æ•° ä¸Šä¼ åˆ°oss的文件路径和文件名称
            ossClient.putObject(bucketName, fileName, new ByteArrayInputStream(file.getBytes()),objectMetadata);
            ossClient.putObject(bucketName, fileName, new ByteArrayInputStream(file.getBytes()), objectMetadata);
            // å…³é—­OSSClient。
            ossClient.shutdown();
            // æŠŠä¸Šä¼ çš„文件路径返回 ï¼ˆæ‰‹åŠ¨æ‹¼æŽ¥ï¼‰
@@ -82,16 +82,18 @@
            // è°ƒç”¨oss的方法实现长传
            // ç¬¬ä¸€ä¸ªå‚æ•° bucketName
            // ç¬¬äºŒä¸ªå‚æ•° ä¸Šä¼ åˆ°oss的文件路径和文件名称
            ossClient.putObject(bucketName, fileName, inputStream,objectMetadata);
            ossClient.putObject(bucketName, fileName, inputStream, objectMetadata);
            // å…³é—­OSSClient。
            ossClient.shutdown();
            // æŠŠä¸Šä¼ çš„文件路径返回 ï¼ˆæ‰‹åŠ¨æ‹¼æŽ¥ï¼‰
            // è¿™é‡Œè®¾ç½®å›¾ç‰‡æœ‰æ•ˆæ—¶é—´ æˆ‘设置了30å¹´
            Date expiration = new Date(System.currentTimeMillis() + 946080000 * 1000);
            String url = ossClient.generatePresignedUrl(bucketName, fileName, expiration).toString();
            // System.out.println("oss成功：" + url);
            return url;
        } catch (Exception e) {
            e.printStackTrace();
            System.out.println("oss异常：" + e.getMessage());
            // e.printStackTrace();
            return null;
        }
    }

 ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java

@@ -145,7 +145,6 @@
//                æŒ‰ç…§Base64编码解析数据
                byte[] data = DatatypeConverter.parseBase64Binary(alarmParam.getPicData());
                InputStream inputStream = new ByteArrayInputStream(data);

                try {
//                    å¦‚æžœList<AlarmDataParam>合理
                    if (alarmParam.getAlarmData()!=null && alarmParam.getAlarmData().size()!=0) {

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

@@ -24,7 +24,7 @@
    </sql>

    <select id="selectMyBackList" resultType="com.ycl.vo.MyBacklogVO">
        with tmp as(
        select distinct * from (
        SELECT
        t3.event_source,
        t3.category,
@@ -63,7 +63,7 @@
                and t3.`code` LIKE CONCAT('%',#{code},'%')
            </if>
        </where>
        )
        select distinct * from tmp order by create_time
        ) as t
         order by create_time
    </select>
</mapper>