'commit'

src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java

@@ -5,6 +5,7 @@ import com.dsideal.base.BaseApplication;
 import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.DataEase.Model.ExcelReader;
 import com.dsideal.base.DataEase.Model.ExcelRow;
+import com.dsideal.base.DataEase.Util.CopyBigScreen;
 import com.dsideal.base.Interceptor.EmptyInterface;
 import com.dsideal.base.Interceptor.IsLoginInterface;
 import com.dsideal.base.Interceptor.IsNumericInterface;
@@ -71,6 +72,25 @@ public class DataEaseController extends Controller {
         redirect(publish_url + BaseApplication.PropKit.get("dataEase.ShiZhou_url") + "?attachParams=" + base64Str);
     }
 
+    @Before({GET.class})
+    @EmptyInterface({"city_name"})
+    public void routeV2(String city_name) {
+        //大屏名称
+        String dataVisualizationNameCity = BaseApplication.PropKit.get("dataEase.dataVisualizationNameCity");
+        //发布的地址
+        String publish_url = BaseApplication.PropKit.get("dataEase.publish_url");
+        //共享地址
+        String shareUrl = CopyBigScreen.getCityShare(dataVisualizationNameCity, city_name);
+        //拼接一下URL的最终地址
+        JSONObject jo = new JSONObject();
+        jo.put("city_name", city_name);
+        String base64Str = Base64.encode(jo.toString());
+        //记录最后一次操作的是哪个市或者县区
+        dm.writeLastArea(city_name);
+        //跳转
+        redirect(publish_url + "/#/de-link/" + shareUrl + "?attachParams=" + base64Str);
+    }
+
     /**
      * 为OpenResty拦截器写的更新城市地图的接口
      *
@@ -91,7 +111,6 @@ public class DataEaseController extends Controller {
     }
 
 
-
     /**
      * 市级路由
      *

src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java

@@ -81,6 +81,17 @@ public class CopyBigScreen {
         System.out.println("成功删除大屏数据" + toDelList.size() + "条~");
     }
 
+    /**
+     * 获取指定大屏的信息
+     *
+     * @param dataVisualizationNameCity
+     * @return
+     */
+    public static Record getVisualizationByName(String dataVisualizationNameCity) {
+        String sql = "select * from data_visualization_info where name =?";
+        return Db.use(DataEaseModel.DB_NAME).findFirst(sql, dataVisualizationNameCity);
+    }
+
     /**
      * 拷贝城市大屏
      *
@@ -90,12 +101,12 @@ public class CopyBigScreen {
         //清理掉旧的数据
         clearScreen(dataVisualizationNameCity);
         //母屏信息
-        String sql = "select * from data_visualization_info where name =?";
-        Record motherRecord = Db.use(DataEaseModel.DB_NAME).findFirst(sql, dataVisualizationNameCity);
+        Record motherRecord = getVisualizationByName(dataVisualizationNameCity);
         long motherId = motherRecord.getLong("id");//母屏ID
         long pid = motherRecord.getLong("pid");  //隶属文件夹
+
         //母屏共享链接
-        sql = "select *  from xpack_share where resource_id=?";
+        String sql = "select *  from xpack_share where resource_id=?";
         Record motherShareRecord = Db.use(DataEaseModel.DB_NAME).findFirst(sql, motherId);
 
         //按16个市州进行生成
@@ -242,5 +253,11 @@ public class CopyBigScreen {
         for (String cityName : dm.getCityNameList()) {
             System.out.println(cityName + ":" + getCityShare(dataVisualizationNameCity, cityName));
         }
+
+        //更新复制出的省级大屏的链接路由
+        Record motherRecord = getVisualizationByName(dataVisualizationNameCity);
+        long motherId = motherRecord.getLong("id");//母屏ID
+        String sql = "update visualization_link_jump_info set content=REPLACE(content,'/dsBase/dataease/route?city_name=','/dsBase/dataease/routeV2?city_name=') where  link_jump_id in (select id from visualization_link_jump where source_dv_id=?)";
+        Db.use(DB_NAME).update(sql, motherId);
     }
 }