diff --git a/src/main/java/com/fr/plugin/decision/request/handler/CheckNameHandler.java b/src/main/java/com/fr/plugin/decision/request/handler/CheckNameHandler.java index 1b84750..cbc666d 100644 --- a/src/main/java/com/fr/plugin/decision/request/handler/CheckNameHandler.java +++ b/src/main/java/com/fr/plugin/decision/request/handler/CheckNameHandler.java @@ -1,8 +1,8 @@ package com.fr.plugin.decision.request.handler; import com.finebi.activate.foundation.StableManager; -import com.finebi.common.impl.vo.table.FineBusinessTable; -import com.finebi.common.impl.vo.table.FineExcelBusinessTable; +import com.finebi.common.api.vo.table.FineBusinessTable; +import com.finebi.common.api.vo.table.FineExcelBusinessTable; import com.finebi.direct.common.api.cell.context.CellCreator; import com.finebi.foundation.api.service.context.BaseContext; import com.fr.json.JSONObject; diff --git a/src/main/java/com/fr/plugin/decision/request/handler/CheckSizeHandler.java b/src/main/java/com/fr/plugin/decision/request/handler/CheckSizeHandler.java index 64052c2..aa4fe8c 100644 --- a/src/main/java/com/fr/plugin/decision/request/handler/CheckSizeHandler.java +++ b/src/main/java/com/fr/plugin/decision/request/handler/CheckSizeHandler.java @@ -1,8 +1,8 @@ package com.fr.plugin.decision.request.handler; import com.finebi.activate.foundation.StableManager; -import com.finebi.common.impl.vo.table.FineBusinessTable; -import com.finebi.common.impl.vo.table.FineExcelBusinessTable; +import com.finebi.common.api.vo.table.FineBusinessTable; +import com.finebi.common.api.vo.table.FineExcelBusinessTable; import com.finebi.dashboard.impl.service.helper.FineDashBoardTableHelper; import com.finebi.direct.burger.api.service.FineUserInfoService; import com.finebi.direct.common.api.cell.context.CellCreator; diff --git a/src/main/java/com/fr/plugin/decision/request/handler/UpgradeHandler.java b/src/main/java/com/fr/plugin/decision/request/handler/UpgradeHandler.java index 080979f..54d6e78 100644 --- a/src/main/java/com/fr/plugin/decision/request/handler/UpgradeHandler.java +++ b/src/main/java/com/fr/plugin/decision/request/handler/UpgradeHandler.java @@ -7,9 +7,9 @@ import com.finebi.burger.api.bean.configuration.table.page.ConfPageInfo; import com.finebi.burger.api.request.configuration.table.DataBaseAddTableItemRequestBean; import com.finebi.burger.api.request.configuration.table.DataBaseAddTableRequestBean; import com.finebi.burger.api.response.configuration.table.TableAddResponseBean; -import com.finebi.common.impl.vo.pack.FineBusinessPackage; -import com.finebi.common.impl.vo.relation.FineBusinessRelation; -import com.finebi.common.impl.vo.table.FineDBBusinessTable; +import com.finebi.common.api.vo.pack.FineBusinessPackage; +import com.finebi.common.api.vo.relation.FineBusinessRelation; +import com.finebi.common.api.vo.table.FineDBBusinessTable; import com.finebi.direct.burger.api.service.FineTableService; import com.finebi.direct.burger.api.service.FineUserInfoService; import com.finebi.common.api.cell.user.authority.UserAuthority; @@ -34,8 +34,8 @@ import com.fr.third.fasterxml.jackson.core.JsonGenerationException; import com.fr.third.fasterxml.jackson.databind.JsonMappingException; import com.fr.third.fasterxml.jackson.databind.ObjectMapper; import com.finebi.direct.common.api.cell.context.CellCreator; -import com.finebi.common.impl.vo.table.FineBusinessTable; -import com.finebi.common.impl.vo.table.FineExcelBusinessTable; +import com.finebi.common.api.vo.table.FineBusinessTable; +import com.finebi.common.api.vo.table.FineExcelBusinessTable; import com.fr.web.utils.WebUtils; import javax.servlet.http.HttpServletRequest; @@ -111,7 +111,7 @@ public class UpgradeHandler extends HWAbstractHandler { FineLoggerFactory.getLogger().info("HW_excel导入:FineDB 新增数据成功" + tableName); } - if (StringUtils.equals("success", dmlResult.getString("status")) || StringUtils.contains(dmlResult.getString("errorText"), "exist")) { + if (StringUtils.equals("success", dmlResult.getString("status")) || StringUtils.contains(dmlResult.getString("errorText"), "existed")) { ObjectMapper mapper = new ObjectMapper(); JSONObject table = JSONObject.create().put("tableName", fineBusinessTable.getName()).put("connectionName", connection); JSONArray tables = JSONArray.create().put(table); @@ -125,7 +125,6 @@ public class UpgradeHandler extends HWAbstractHandler { CellCreator.getCellProvider().tableCell().removeTable(fineBusinessTable.getName(), CellCreator.getCellProvider().userCellProvider().authorityCell().getSuperAuthority()); -// String packId = "__my_analysis__" + fineBusinessTable.getCreateByWithId() + "1"; try { String tableString = tablesBean.toString(); FineBusinessTable[] businessTables = createBusinessTablesFromDBNewAddTableInfo(mapper.readValue(tableString, DataBaseAddTableRequestBean.class), authorityUser.getUser().getInfo().getUserId());