diff --git a/Doc/20250210要求修改/133个县区数据表.xlsx b/Doc/20250210要求修改/133个县区数据表.xlsx new file mode 100644 index 00000000..0856b77e Binary files /dev/null and b/Doc/20250210要求修改/133个县区数据表.xlsx differ diff --git a/Doc/20250210要求修改/16个州市数据表(20250103).xls b/Doc/20250210要求修改/16个州市数据表(20250103).xls new file mode 100644 index 00000000..1d1ac467 Binary files /dev/null and b/Doc/20250210要求修改/16个州市数据表(20250103).xls differ diff --git a/Doc/20250210要求修改/云南省教育决策支持系统会议记录(20250207).doc b/Doc/20250210要求修改/云南省教育决策支持系统会议记录(20250207).doc new file mode 100644 index 00000000..d84d3a68 Binary files /dev/null and b/Doc/20250210要求修改/云南省教育决策支持系统会议记录(20250207).doc differ 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 5765791d..94a90087 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -45,7 +45,7 @@ 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.21.20:9000/dsBase/dataease/YxRoute?area_name=南关区&type_id=1 //http://10.10.14.14:9000/dsBase/dataease/YxRoute?area_name=南关区 /** @@ -55,11 +55,11 @@ public class DataEaseController extends Controller { */ @Before({GET.class}) @EmptyInterface({"area_name"}) - public void YxRoute(String area_name,int type_id) { - if(type_id == 0) type_id=1; + public void YxRoute(String area_name, int type_id) { //发布的地址 - String publish_url = BaseApplication.PropKit.get("YunXiao.yingyong_publish_url"); - if(type_id==2)publish_url=BaseApplication.PropKit.get("YunXiao.jianshe_publish_url"); + String publish_url = BaseApplication.PropKit.get("dataEase.publish_url"); + if (type_id == 0) type_id = 1; + publish_url += BaseApplication.PropKit.get("YunXiao.t" + type_id); //拼接一下URL的最终地址 JSONObject jo = new JSONObject(); jo.put("area_name", area_name); @@ -70,6 +70,7 @@ public class DataEaseController extends Controller { redirect(publish_url + "?attachParams=" + base64Str); } + /** * 云校仪表盘路由 * @@ -86,13 +87,7 @@ public class DataEaseController extends Controller { 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"); - } else if (type_id == 3) { //区县-访客应用统计 - publish_url = publish_url + BaseApplication.PropKit.get("dataEase.YxAreaFangKeYingYong"); - } + publish_url = publish_url + BaseApplication.PropKit.get("routeYxPage.t" + type_id); //跳转 redirect(publish_url + "?attachParams=" + base64Str); } diff --git a/src/main/java/com/dsideal/base/Tools/YunXiao/YunXiaoFillData.java b/src/main/java/com/dsideal/base/Tools/YunXiao/YunXiaoFillData.java new file mode 100644 index 00000000..50a3811e --- /dev/null +++ b/src/main/java/com/dsideal/base/Tools/YunXiao/YunXiaoFillData.java @@ -0,0 +1,9 @@ +package com.dsideal.base.Tools.YunXiao; + +import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil; + +public class YunXiaoFillData { + public static void main(String[] args) { + LocalMysqlConnectUtil.Init(); + } +} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 3fe74c33..0ff91e1c 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -42,19 +42,31 @@ dataEase: AreaBottom_url: /#/de-link/j3vwbtKm AreaRight_url: /#/de-link/ufRSlWmB - # 云校 - # 区县-班级学生教师应用统计 - YxAreaClassStudentTeacher: /#/de-link/h15XBsLH - # 区县-课程应用统计 - YxKeCheng: /#/de-link/vO7gtJmw - # 区县-访客应用统计 - YxAreaFangKeYingYong: /#/de-link/ThsQhSHC + # ============================================================== # 长春云校配置 YunXiao: - yingyong_publish_url: http://10.10.14.203:8100/#/de-link/mOFfS3Ot - jianshe_publish_url: http://10.10.14.203:8100/#/de-link/A0RKwWBP + # 应用统计 + t1: /#/de-link/mOFfS3Ot + # 建设统计 + t2: /#/de-link/A0RKwWBP +# 云校 +routeYxPage: + # 区县-班级学生教师应用统计 + t1: /#/de-link/h15XBsLH + # 区县-课程应用统计 + t2: /#/de-link/vO7gtJmw + # 区县-访客应用统计 + t3: /#/de-link/ThsQhSHC + # 学校建设统计 + t4: /#/de-link/6QSTUS0V + # 课程建设统计 + t5: /#/de-link/zZR3pYhV + # 章节建设统计 + t6: /#/de-link/t8Ksk8Q5 + # 知识点建设统计 + t7: /#/de-link/MSFgtlfG excel: # 导出excel 的模板配置路径