From d2bcf3785b3733eb2d44bc8721b8e60a41d24793 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 16 May 2024 14:20:33 +0800
Subject: [PATCH] 全景图更新切图功能kl 5-16 14
---
skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/builder/oss/OssBuilder.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/builder/oss/OssBuilder.java b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/builder/oss/OssBuilder.java
index aca369e..c5b793b 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/builder/oss/OssBuilder.java
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/builder/oss/OssBuilder.java
@@ -16,6 +16,7 @@
*/
package cn.gistack.resource.builder.oss;
+import cn.gistack.common.constant.CommonConstant;
import cn.gistack.resource.rule.MyOssRule;
import cn.gistack.resource.rule.PanoramaOSSRule;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -101,6 +102,11 @@
*/
public OssTemplate template(String code) {
String tenantId = AuthUtil.getTenantId();
+
+ if (StringUtil.isBlank(tenantId)){
+ tenantId = "000000";
+ }
+
Oss oss = getOss(tenantId, code);
Oss ossCached = ossPool.get(tenantId);
OssTemplate template = templatePool.get(tenantId);
@@ -169,10 +175,19 @@
*/
public OssTemplate templateByPathPanorama(String code,String prefixPath,String resGuid) {
String tenantId = AuthUtil.getTenantId();
+ System.err.println("tenantId:"+tenantId);
+ if (StringUtil.isBlank(tenantId)){
+ tenantId = "000000";
+ }
+
Oss oss = getOss(tenantId, code);
+
+// System.err.println("Oss");
+// System.err.println(oss.toString());
+
OssTemplate template = null;
// template = templatePool.get(tenantId);
- OssRule ossRule = new PanoramaOSSRule(Boolean.FALSE,prefixPath,resGuid);
+ PanoramaOSSRule ossRule = new PanoramaOSSRule(Boolean.FALSE,prefixPath,resGuid);
if (oss.getCategory() == OssEnum.MINIO.getCategory()) {
template = MinioOssBuilder.template(oss, ossRule);
} else if (oss.getCategory() == OssEnum.QINIU.getCategory()) {
--
Gitblit v1.9.3