'commit'

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

@@ -64,8 +64,8 @@ public class DataEaseController extends Controller {
      *
      * @param type_id 哪一个仪表盘
      */
+    // http://10.10.21.20:9000/dsBase/dataease/routePage?type_id=1
     @Before({GET.class})
-    @EmptyInterface({"area_name"})
     @IsNumericInterface({"type_id"})
     public void routePage(int type_id) {
         //最后一次操作的区域名称
@@ -78,13 +78,13 @@ public class DataEaseController extends Controller {
         String base64Str = Base64.encode(jo.toString());
         switch (type_id) {
             case 1://左侧学前教育规模发展预测，义务教育规模发展预测，普通高中教育规模发展预测
-                publish_url = publish_url + "/#/de-link/VQViqSjL";
+                publish_url = publish_url + "/#/de-link/TgShVA0z";
                 break;
             case 2://最底下，人口
                 publish_url = publish_url + "/#/de-link/QZVOyXqD";
                 break;
             case 3://教育资源配置发展预测
-                publish_url = publish_url + "/#/de-link/ufRSlWmB";
+                publish_url = publish_url + "/#/de-link/oitjXDlA";
                 break;
         }
         //跳转

src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java

@@ -205,6 +205,7 @@ public class DataEaseModel {
 
     /**
      * 指定列中有哪些列
+     *
      * @param tableName
      * @return
      */
@@ -404,11 +405,27 @@ public class DataEaseModel {
     /**
      * 记录最后一次操作的是哪个区域
      *
-     * @param city_name
+     * @param area_name 区域名称
      */
-    public void writeLastArea(String city_name) {
+    public void writeLastArea(String area_name) {
         String sql = "update t_dataease_last_area set area_name=? where id=1";
-        Db.update(sql, city_name);
+        String full_name = getFullAreaName(area_name);
+        Db.update(sql, full_name);
+    }
+
+    /**
+     * 获取完整的区域名称
+     *
+     * @param area_name
+     * @return
+     */
+    public String getFullAreaName(String area_name) {
+        String sql = "select * from t_dm_area where full_name = ?";
+        Record record = Db.findFirst(sql, area_name);
+        if (record != null) return area_name;
+        sql = "select * from t_dm_area where area_name=?";
+        record = Db.findFirst(sql, area_name);
+        return record.getStr("full_name");
     }
 
     /**