From 51b05f67306ba1f358f3b37f3c46979954d9b075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 1 Nov 2024 09:09:39 +0800
Subject: [PATCH] 'commit'

---
 .../Controller/DataEaseController.java        | 53 +++++++++----------
 src/main/resources/application_dev.yaml       |  4 ++
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
index 54e4a854..ae2a8a5e 100644
--- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
+++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
@@ -1,6 +1,8 @@
 package com.dsideal.base.DataEase.Controller;
 
+import cn.hutool.core.codec.Base64;
 import com.dsideal.base.Base.Model.BaseModel;
+import com.dsideal.base.BaseApplication;
 import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Interceptor.EmptyInterface;
 import com.dsideal.base.Interceptor.IsLoginInterface;
@@ -14,6 +16,7 @@ import com.jfinal.ext.interceptor.POST;
 import com.jfinal.plugin.activerecord.Record;
 import io.github.yedaxia.apidocs.ApiDoc;
 import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 
 import java.util.List;
 
@@ -22,37 +25,33 @@ public class DataEaseController extends Controller {
     DataEaseModel dm = new DataEaseModel();
     BaseModel bm = new BaseModel();
 
-    // http://10.10.21.20:9000/dsBase/dataease/route?city_name=昆明市&r=1234234
-    // http://10.10.21.20:9000/dsBase/dataease/route?city_name=楚雄彝族自治州&r=1234234
-    /**
-     * DataEase仪表板外部参数传递
-     * https://www.jianshu.com/p/cc9982e986f5
-     *
-     * https://base64.us/
-     *
-     *
-     * {"city_name":"昆明市"}
-     * http://10.10.14.203:8100/#/de-link/zud8IQ8J?attachParams=eyJjaXR5X25hbWUiOiLmmIbmmI7luIIifQ==
-     *
-     *
-     * {"city_name":"楚雄彝族自治州"}
-     * http://10.10.14.203:8100/#/de-link/zud8IQ8J?attachParams=eyJjaXR5X25hbWUiOiLmpZrpm4TlvZ3ml4/oh6rmsrvlt54ifQ==
-     */
+    // http://10.10.21.20:9000/dsBase/dataease/route?city_name=昆明市
+    // http://10.10.21.20:9000/dsBase/dataease/route?city_name=楚雄彝族自治州
+    // http://10.10.21.20:9000/dsBase/dataease/route?city_name=西双版纳傣族自治州
+    // !!!必须发布后访问才能做到进入此接口，否则浏览器就走缓存，不进来这个接口了！!!
     /**
      * 路由跳转
+     *
      * @param city_name 城市名称
      */
-//    @Before({GET.class})
-//    @EmptyInterface({"city_name"})
-//    public void route(String city_name) {
-//        if(city_name.equals("昆明市")){
-//            dm.updateCity("156530100");
-//            redirect301("http://10.10.14.203:8100/#/de-link/zud8IQ8J?attachParams=eyJjaXR5X25hbWUiOiLmmIbmmI7luIIifQ==");
-//        }else{
-//            dm.updateCity("156532300");
-//            redirect301("http://10.10.14.203:8100/#/de-link/zud8IQ8J?attachParams=eyJjaXR5X25hbWUiOiLmpZrpm4TlvZ3ml4/oh6rmsrvlt54ifQ==");
-//        }
-//    }
+    @Before({GET.class})
+    @EmptyInterface({"city_name"})
+    public void route(String city_name) {
+        //大屏名称
+        String dataVisualizationName = BaseApplication.PropKit.get("dataEase.dataVisualizationName");
+        //发布的地址
+        String publish_url = BaseApplication.PropKit.get("dataEase.publish_url");
+
+        //先更新一下数据表
+        dm.updateCity(dataVisualizationName, city_name);
+        //再拼接一下URL的最终地址
+        JSONObject jo = new JSONObject();
+        jo.put("city_name", city_name);
+        String base64Str = Base64.encode(jo.toString());
+        //跳转
+        redirect(publish_url + "/#/de-link/zud8IQ8J?attachParams=" + base64Str);
+    }
+
     /**
      * 根据当前登录人员的identity_id,获取此人员可以维护的数据集名称
      */
diff --git a/src/main/resources/application_dev.yaml b/src/main/resources/application_dev.yaml
index a68a6105..5d54a5da 100644
--- a/src/main/resources/application_dev.yaml
+++ b/src/main/resources/application_dev.yaml
@@ -18,6 +18,10 @@ redis:
   port: 18890
   password:
 
+# 数据可视化
+dataEase:
+  dataVisualizationName: 黄海测试的市州地图
+  publish_url: http://10.10.14.203:8100
 # ==============================================================
 
 excel: