'commit'

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

@@ -47,7 +47,7 @@ public class DataEaseController extends Controller {
     /**
      * 省级路由
      *
-     * @param city_name 城市名称
+     * @param city_name 市州名称
      */
     @Before({GET.class})
     @EmptyInterface({"city_name"})
@@ -72,6 +72,10 @@ public class DataEaseController extends Controller {
         redirect(publish_url + BaseApplication.PropKit.get("dataEase.ShiZhou_url") + "?attachParams=" + base64Str);
     }
 
+    /**
+     * 省级路由，配合市州的大屏文档拷贝使用，每个市州大屏的仪表盘都拷贝一份出来，然后修改名称和数据源即可
+     * @param city_name 市州名称
+     */
     @Before({GET.class})
     @EmptyInterface({"city_name"})
     public void routeV2(String city_name) {
@@ -92,25 +96,6 @@ public class DataEaseController extends Controller {
         redirect(publish_url + "/#/de-link/" + shareUrl + "?attachParams=" + base64Str);
     }
 
-    /**
-     * 为OpenResty拦截器写的更新城市地图的接口
-     *
-     * @param city_name 城市名称
-     */
-    @Before({POST.class})
-    @EmptyInterface({"city_name"})
-    public void updateCityArea(String city_name) {
-        //大屏名称
-        String dataVisualizationNameCity = BaseApplication.PropKit.get("dataEase.dataVisualizationNameCity");
-        //先更新一下数据表
-        int res = dm.updateCityArea(dataVisualizationNameCity, city_name);
-        if (res == -1) {
-            renderJson(CommonUtil.returnMessageJson(false, dataVisualizationNameCity + "名称的大屏不唯一，无法完成更新操作！"));
-            return;
-        }
-        renderJson(CommonUtil.returnMessageJson(true, "更新成功！"));
-    }
-
 
     /**
      * 市级路由
@@ -375,8 +360,6 @@ public class DataEaseController extends Controller {
         String area_code = rm.getAreaCode(identity_id, person_id);
         //根据区域码，获取区域名称
         String area_name = rm.getAreaName(area_code);
-        //父亲的区域名称
-        String parent_area_name = rm.getParentAreaName(area_name);
 
         List<Record> list = dm.getDataSetContent(id, identity_id, area_name);
         renderJson(CommonUtil.renderJsonForLayUI(list));
@@ -698,5 +681,4 @@ public class DataEaseController extends Controller {
         kv.set("message", "上传成功");
         renderJson(kv);
     }
-
 }

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

@@ -671,7 +671,16 @@ public class DataEaseModel {
         Record record = Db.findById("t_dp_dataset", "id", id);
         String tableName = record.getStr("table_name");
 
-        String sql = "delete from `" + tableName + "` where `上级行政区划`=?";
+        String sql = "select max(id) as id from " + tableName;
+        Record r = Db.use(DB_NAME).findFirst(sql);
+        int start = 0;
+        if (r == null) {
+            start = 1;
+        } else {
+            start = r.getInt("id") + 1;
+        }
+
+        sql = "delete from `" + tableName + "` where `上级行政区划`=?";
         Db.use(DB_NAME).update(sql, area_name);
 
         List<Record> list = new ArrayList<>();
@@ -686,7 +695,7 @@ public class DataEaseModel {
                 if (value == null || value.equals("")) value = null;
                 record.set(key.toString(), value);
             }
-            record.set("id", i + 1);
+            record.set("id", ++start);
             list.add(record);
         }
         Db.use(DB_NAME).batchSave(tableName, list, 100);