From 1bf7694bf779310b9f314672526d8bcb547e313e Mon Sep 17 00:00:00 2001
From: Raod <1130305001@qq.com>
Date: Thu, 19 Aug 2021 14:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=85=E8=BF=94=E5=9B=9E=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ReportShareService.java           |  2 +-
 .../service/impl/ReportShareServiceImpl.java  | 45 +++++++++++--------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/service/ReportShareService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/service/ReportShareService.java
index c350f75b..e3613cba 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/service/ReportShareService.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/service/ReportShareService.java
@@ -21,7 +21,7 @@ public interface ReportShareService extends GaeaBaseService<ReportShareParam, Re
      */
     ReportShare getDetail(Long id);
 
-    ReportShare insertShare(ReportShareDto dto);
+    ReportShareDto insertShare(ReportShareDto dto);
 
     ReportShare detailByCode(String shareCode);
 }
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/service/impl/ReportShareServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/service/impl/ReportShareServiceImpl.java
index 6927bcb3..b808765e 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/service/impl/ReportShareServiceImpl.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/service/impl/ReportShareServiceImpl.java
@@ -49,11 +49,14 @@ public class ReportShareServiceImpl implements ReportShareService {
     }
 
     @Override
-    public ReportShare insertShare(ReportShareDto dto) {
+    public ReportShareDto insertShare(ReportShareDto dto) {
+        ReportShareDto reportShareDto = new ReportShareDto();
         ReportShare entity = new ReportShare();
         BeanUtils.copyProperties(dto, entity);
         insert(entity);
-        return entity;
+        //将分享链接返回
+        reportShareDto.setShareUrl(entity.getShareUrl());
+        return reportShareDto;
     }
 
     @Override
@@ -68,26 +71,32 @@ public class ReportShareServiceImpl implements ReportShareService {
     public void processBeforeOperation(ReportShare entity, BaseOperationEnum operationEnum) throws BusinessException {
         switch (operationEnum) {
             case INSERT:
-                //前端地址  window.location.href https://report.anji-plus.com/index.html#/report/bigscreen
-                //截取#之前的内容
-                //http://localhost:9528/#/bigscreen/viewer?reportCode=bigScreen2
-                //http://127.0.0.1:9095/reportDashboard/getData
-                String shareCode = UUID.randomUUID().toString();
-                entity.setShareCode(shareCode);
-                if (entity.getShareUrl().contains(SHARE_URL)) {
-                    String prefix = entity.getShareUrl().substring(0, entity.getShareUrl().indexOf("#"));
-                    entity.setShareUrl(prefix + SHARE_FLAG + shareCode);
-                } else {
-                    entity.setShareUrl(entity.getShareUrl() + SHARE_FLAG + shareCode);
-                }
-                entity.setShareValidTime(DateUtil.getFutureDateTmdHms(entity.getShareValidType()));
-                entity.setShareToken(JwtUtil.createToken(entity.getReportCode(), shareCode, entity.getShareValidTime()));
-                break;
-            case UPDATE:
+                init(entity);
                 break;
             default:
 
                 break;
         }
     }
+
+    /**
+     * 新增初始化
+     * @param entity
+     */
+    private void init(ReportShare entity) {
+        //前端地址  window.location.href https://report.anji-plus.com/index.html#/report/bigscreen
+        //截取#之前的内容
+        //http://localhost:9528/#/bigscreen/viewer?reportCode=bigScreen2
+        //http://127.0.0.1:9095/reportDashboard/getData
+        String shareCode = UUID.randomUUID().toString();
+        entity.setShareCode(shareCode);
+        if (entity.getShareUrl().contains(SHARE_URL)) {
+            String prefix = entity.getShareUrl().substring(0, entity.getShareUrl().indexOf("#"));
+            entity.setShareUrl(prefix + SHARE_FLAG + shareCode);
+        } else {
+            entity.setShareUrl(entity.getShareUrl() + SHARE_FLAG + shareCode);
+        }
+        entity.setShareValidTime(DateUtil.getFutureDateTmdHms(entity.getShareValidType()));
+        entity.setShareToken(JwtUtil.createToken(entity.getReportCode(), shareCode, entity.getShareValidTime()));
+    }
 }