From 9bfd0f697d407902d9d80d95e5c23943a556b79f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 10 三月 2023 13:38:14 +0800
Subject: [PATCH] mysql5.7不能使用 with
---
ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java | 8 +++++---
ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml | 6 +++---
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java | 1 -
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
index 97714a6..47a4f18 100644
--- a/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
@@ -33,7 +33,7 @@
// 璋冪敤oss鐨勬柟娉曞疄鐜伴暱浼�
// 绗竴涓弬鏁� bucketName
// 绗簩涓弬鏁� 涓婁紶鍒皁ss鐨勬枃浠惰矾寰勫拰鏂囦欢鍚嶇О
- 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
// 绗簩涓弬鏁� 涓婁紶鍒皁ss鐨勬枃浠惰矾寰勫拰鏂囦欢鍚嶇О
- 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;
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
index 39c4fcf..cd69ba3 100644
--- a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
+++ b/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) {
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
index d623161..ab8ce5a 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
+++ b/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>
--
Gitblit v1.8.0