From d6d5037a6d7303b08f541a662f3368049a8ef545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 14 Jan 2025 11:02:07 +0800
Subject: [PATCH] 'commit'

---
 .../Controller/DataEaseController.java        | 28 +++++++++++++++++++
 .../base/DataEase/Model/DataEaseModel.java    | 19 +++++++++++++
 src/main/resources/application.yaml           |  6 ++++
 3 files changed, 53 insertions(+)

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 8f7cf5e2..262d22a4 100644
--- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
+++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
@@ -47,8 +47,10 @@ public class DataEaseController extends Controller {
     //http://10.10.14.203/#/de-link/mOFfS3Ot?area_id=[区域]
     //http://10.10.21.20:9000/dsBase/dataease/YxRoute?area_name=南关区
     //http://10.10.14.14:9000/dsBase/dataease/YxRoute?area_name=南关区
+
     /**
      * 长春云校的路由
+     *
      * @param area_name 区域名称
      */
     @Before({GET.class})
@@ -60,6 +62,32 @@ public class DataEaseController extends Controller {
         JSONObject jo = new JSONObject();
         jo.put("area_name", area_name);
         String base64Str = Base64.encode(jo.toString());
+        //记录最后一次操作的是哪个县区
+        dm.writeYxLastArea(area_name);
+        //跳转
+        redirect(publish_url + "?attachParams=" + base64Str);
+    }
+
+    /**
+     * 云校仪表盘路由
+     * @param type_id 类型id
+     */
+    //http://10.10.14.14:9000/dsBase/dataease/routeYxPage?type_id=1
+    @Before({GET.class})
+    public void routeYxPage(int type_id) {
+        //最后一次操作的区域名称
+        String area_name = dm.getLastYxArea();
+        //发布的地址
+        String publish_url = BaseApplication.PropKit.get("dataEase.publish_url");
+        //拼接一下URL的最终地址
+        JSONObject jo = new JSONObject();
+        jo.put("area_name", area_name);
+        String base64Str = Base64.encode(jo.toString());
+        if(type_id == 1){
+            publish_url = publish_url + BaseApplication.PropKit.get("dataEase.YxAreaClassStudentTeacher");
+        }else if(type_id == 2){
+            publish_url = publish_url + BaseApplication.PropKit.get("dataEase.YxKeCheng");
+        }
         //跳转
         redirect(publish_url + "?attachParams=" + base64Str);
     }
diff --git a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
index 5a0822db..d778c569 100644
--- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
+++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
@@ -518,6 +518,16 @@ public class DataEaseModel {
         Db.update(sql, area_name);
     }
 
+    /**
+     * 记录云校最后一次操作的是哪个县区
+     *
+     * @param area_name
+     */
+    public void writeYxLastArea(String area_name) {
+        String sql = "update t_dataease_yx_last_area set area_name=? where id=1";
+        Db.update(sql, area_name);
+    }
+
 
     /**
      * 获取最后一次操作的是哪个区域
@@ -529,6 +539,15 @@ public class DataEaseModel {
         return Db.findFirst(sql).getStr("area_name");
     }
 
+    /**
+     * 云校最后一次操作的是哪个县区
+     * @return
+     */
+    public String getLastYxArea() {
+        String sql = "select area_name from t_dataease_yx_last_area where id=1";
+        return Db.findFirst(sql).getStr("area_name");
+    }
+
     /**
      * 获取云南教科院项目的根节点
      *
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index c916d113..cd6c4349 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -41,6 +41,12 @@ dataEase:
   AreaLeft_url: /#/de-link/WTtaPIn6
   AreaBottom_url: /#/de-link/j3vwbtKm
   AreaRight_url: /#/de-link/ufRSlWmB
+
+  # 云校
+  # 区县-班级学生教师应用统计
+  YxAreaClassStudentTeacher: /#/de-link/KuuuHsMp
+  # 区县-课程应用统计
+  YxKeCheng: /#/de-link/vO7gtJmw
 # ==============================================================
 # 长春云校配置
 YunXiao: