diff --git a/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java b/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java index 9172188b..50285c45 100644 --- a/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java +++ b/src/main/java/com/dsideal/base/DataEase/Util/CopyBigScreen.java @@ -71,10 +71,19 @@ public class CopyBigScreen { // (6) 外部参数关联关系表 sql = "select params_id from visualization_outer_params where visualization_id=?"; String paramsId = Db.use(DB_NAME).queryStr(sql, id); + + sql="select params_info_id from visualization_outer_params_info where params_id=?"; + String params_info_id=Db.use(DB_NAME).queryStr(sql, paramsId); + + sql = "delete from visualization_outer_params_target_view_info where params_info_id=?"; + Db.use(DB_NAME).update(sql, params_info_id); + sql = "delete from visualization_outer_params_info where params_id=?"; Db.use(DB_NAME).update(sql, paramsId); + sql = "delete from visualization_outer_params where visualization_id=?"; Db.use(DB_NAME).update(sql, id); + //(7) 删除主表数据 Db.use(DB_NAME).deleteById("data_visualization_info", id); } @@ -99,7 +108,7 @@ public class CopyBigScreen { * @param pid 源大屏所属文件夹id * @return */ - public static long callApiToCopy(String screenName, long id, long pid) { + public static long callApiToCopy(String screenName, long id, long pid) throws InterruptedException { //拷贝API String url = urlPrefix + "/de2api/dataVisualization/copy"; JSONObject jo = new JSONObject(); @@ -111,6 +120,7 @@ public class CopyBigScreen { String res = HttpUtil.createPost(url).contentType("application/json") .header("x-de-token", getToken()).body(jo.toString()).execute().body(); System.out.println(res); + Thread.sleep(1000); long childId = Long.parseLong(JSONObject.parseObject(res).getString("data")); //更新pid,没有这步的话,在界面上看不到拷贝出来的大屏! @@ -139,7 +149,7 @@ public class CopyBigScreen { * * @param dataVisualizationNameCity */ - public static void copyCityScreen(String dataVisualizationNameCity) { + public static void copyCityScreen(String dataVisualizationNameCity) throws InterruptedException { //清理掉旧的数据 clearScreen(dataVisualizationNameCity); //母屏信息 @@ -192,6 +202,7 @@ public class CopyBigScreen { cityParamsInfoRecord.set("params_id", cityOuterParamsRecord.getStr("params_id")); cityParamsInfoRecord.set("params_info_id", UUID.randomUUID().toString()); Db.use(DB_NAME).save("visualization_outer_params_info", "params_info_id", cityParamsInfoRecord); + //这里缺少visualization_outer_params_target_view_info //发布共享链接 publishShare(motherShareRecord, childId); @@ -205,7 +216,7 @@ public class CopyBigScreen { * * @param dataVisualizationProvince 省级大屏的名称 */ - public static void copyProvinceScreen(String dataVisualizationProvince) { + public static void copyProvinceScreen(String dataVisualizationProvince) throws InterruptedException { //清理掉旧的数据 clearScreen(dataVisualizationProvince); //母屏信息