|
|
@ -6,6 +6,7 @@ import com.finebi.burger.api.bean.configuration.table.field.FineBusinessField; |
|
|
|
import com.finebi.burger.api.request.configuration.table.DataBaseAddTableItemRequestBean; |
|
|
|
import com.finebi.burger.api.request.configuration.table.DataBaseAddTableItemRequestBean; |
|
|
|
import com.finebi.burger.api.request.configuration.table.DataBaseAddTableRequestBean; |
|
|
|
import com.finebi.burger.api.request.configuration.table.DataBaseAddTableRequestBean; |
|
|
|
import com.finebi.burger.api.response.configuration.table.TableAddResponseBean; |
|
|
|
import com.finebi.burger.api.response.configuration.table.TableAddResponseBean; |
|
|
|
|
|
|
|
import com.finebi.common.impl.vo.relation.FineBusinessRelation; |
|
|
|
import com.finebi.common.impl.vo.table.FineDBBusinessTable; |
|
|
|
import com.finebi.common.impl.vo.table.FineDBBusinessTable; |
|
|
|
import com.finebi.direct.burger.api.service.FineTableService; |
|
|
|
import com.finebi.direct.burger.api.service.FineTableService; |
|
|
|
import com.finebi.direct.burger.api.service.FineUserInfoService; |
|
|
|
import com.finebi.direct.burger.api.service.FineUserInfoService; |
|
|
@ -137,11 +138,8 @@ public class UpgradeHandler extends HWAbstractHandler { |
|
|
|
if (StringUtils.equals("success", dmlResult.getString("status")) && dmlResult.getBoolean("addLink")) { |
|
|
|
if (StringUtils.equals("success", dmlResult.getString("status")) && dmlResult.getBoolean("addLink")) { |
|
|
|
ExcelLinkService.getInstance().addLink(name, connection, schema, tableName, createUser); |
|
|
|
ExcelLinkService.getInstance().addLink(name, connection, schema, tableName, createUser); |
|
|
|
FineLoggerFactory.getLogger().info("HW_excel导入:FineDB 新增数据成功" + name); |
|
|
|
FineLoggerFactory.getLogger().info("HW_excel导入:FineDB 新增数据成功" + name); |
|
|
|
|
|
|
|
List<FineBusinessRelation> fineBusinessRelations = CellCreator.getCellProvider().relationPathCell().getRelationsByTableNameWithoutAuth(fineBusinessTable.getName()); |
|
|
|
CellCreator.getCellProvider().tableCell().removeTable(fineBusinessTable.getName(), CellCreator.getCellProvider().userCellProvider().authorityCell().getSuperAuthority()); |
|
|
|
CellCreator.getCellProvider().tableCell().removeTable(fineBusinessTable.getName(), CellCreator.getCellProvider().userCellProvider().authorityCell().getSuperAuthority()); |
|
|
|
} |
|
|
|
|
|
|
|
} catch(Exception e){ |
|
|
|
|
|
|
|
e.printStackTrace(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ObjectMapper mapper = new ObjectMapper(); |
|
|
|
ObjectMapper mapper = new ObjectMapper(); |
|
|
|
JSONObject table = JSONObject.create().put("tableName", fineBusinessTable.getName()).put("connectionName", connection); |
|
|
|
JSONObject table = JSONObject.create().put("tableName", fineBusinessTable.getName()).put("connectionName", connection); |
|
|
@ -150,10 +148,12 @@ public class UpgradeHandler extends HWAbstractHandler { |
|
|
|
try{ |
|
|
|
try{ |
|
|
|
UserAuthority authorityUser = getFineUserInfoService().getUserAuthority(req); |
|
|
|
UserAuthority authorityUser = getFineUserInfoService().getUserAuthority(req); |
|
|
|
String packid = "__my_analysis__" + authorityUser.getUser().getInfo().getUserId() + "1"; |
|
|
|
String packid = "__my_analysis__" + authorityUser.getUser().getInfo().getUserId() + "1"; |
|
|
|
|
|
|
|
// String packid = "a94ee0f2b79f4a1e907e4def59a23454";
|
|
|
|
try { |
|
|
|
try { |
|
|
|
String tableString = tablesBean.toString(); |
|
|
|
String tableString = tablesBean.toString(); |
|
|
|
FineBusinessTable[] businessTables = createBusinessTablesFromDBNewAddTableInfo(mapper.readValue(tableString, DataBaseAddTableRequestBean.class), authorityUser.getUser().getInfo().getUserId()); |
|
|
|
FineBusinessTable[] businessTables = createBusinessTablesFromDBNewAddTableInfo(mapper.readValue(tableString, DataBaseAddTableRequestBean.class), authorityUser.getUser().getInfo().getUserId()); |
|
|
|
TableAddResponseBean responed = getTableService().addNewTable(packid, authorityUser, businessTables); |
|
|
|
TableAddResponseBean responed = getTableService().addNewTable(packid, authorityUser, businessTables); |
|
|
|
|
|
|
|
CellCreator.getCellProvider().relationPathCell().addRelations(fineBusinessRelations, authorityUser); |
|
|
|
addDbResult.put(FineRespond.success(responed)); |
|
|
|
addDbResult.put(FineRespond.success(responed)); |
|
|
|
} catch (JsonMappingException e) { |
|
|
|
} catch (JsonMappingException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
e.printStackTrace(); |
|
|
@ -166,6 +166,11 @@ public class UpgradeHandler extends HWAbstractHandler { |
|
|
|
catch(Exception e){ |
|
|
|
catch(Exception e){ |
|
|
|
e.printStackTrace(); |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} catch(Exception e){ |
|
|
|
|
|
|
|
e.printStackTrace(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|