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 119fb361..a74f3a15 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -1,7 +1,6 @@ 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; @@ -17,8 +16,6 @@ import com.jfinal.ext.interceptor.POST; import com.jfinal.kit.Kv; import com.jfinal.plugin.activerecord.Record; import com.jfinal.upload.UploadFile; -import io.github.yedaxia.apidocs.ApiDoc; -import net.sf.json.JSONArray; import net.sf.json.JSONObject; import java.io.IOException; @@ -52,11 +49,14 @@ public class DataEaseController extends Controller { 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/zud8IQ8J?attachParams=" + base64Str); } //http://10.10.21.20:9000/dsBase/dataease/routeFirstPage?type_id=1&area_name=昆明市 + /** * 路由 * 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 725b0984..32ce26b9 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -1,7 +1,6 @@ package com.dsideal.base.DataEase.Model; import com.dsideal.base.Util.ExcelCommonUtil; -import com.dsideal.base.Util.FileUtil; import com.jfinal.kit.Kv; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Record; @@ -367,6 +366,7 @@ public class DataEaseModel { /** * 从Excel中获取列名 + * * @param filePath * @return */ @@ -388,4 +388,24 @@ public class DataEaseModel { } return columnNames; } + + /** + * 记录最后一次操作的是哪个区域 + * + * @param city_name + */ + public void writeLastArea(String city_name) { + String sql = "update t_dataease_last_area set area_name=? where id=1"; + Db.update(sql, city_name); + } + + /** + * 获取最后一次操作的是哪个区域 + * + * @return + */ + public String getLastArea() { + String sql = "select area_name from t_dataease_last_area where id=1"; + return Db.findFirst(sql).getStr("area_name"); + } }