Zhenfei.Li
/
plugin-bi-excel-database
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

refactor: 适配一份7.7final直连的插件

upgrade-final
Zhenfei.Li 5 years ago
parent
02199a96c8
commit
400f66202a
3 changed files with 65 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      build.xml
  2. 26
      pom.xml
  3. 29
      src/main/java/com/fr/plugin/decision/request/handler/UpgradeHandler.java

84
build.xml
Unescape View File

@ -14,9 +14,9 @@
<property name="plugin-version" value="${current-version}"/>
<property name="plugin-name" value="hwExcelExport"/>
<property name="plugin-jar" value="fr-plugin-${plugin-name}-${plugin-version}.jar"/>
<!-- <target name="prepare">-->
<!-- <delete dir="${classes}"/>-->
<!-- </target>-->
<target name="prepare">
<delete dir="${classes}"/>
</target>
<path id="compile.classpath">
<!-- <fileset dir="${FRLibs}">-->
<!-- <include name="**/*.jar"/>-->
@ -38,36 +38,36 @@
<exclude name="**/*.g"/>
<exclude name="**/package.html"/>
</patternset>
<!-- <target name="copy_resources">-->
<!-- <echo message="从${resources_from}拷贝图片,JS,CSS等资源文件"/>-->
<!-- <delete dir="tmp"/>-->
<!-- <copy todir="tmp">-->
<!-- <fileset dir="${resources_from}\src\main\java">-->
<!-- <patternset refid="resources4Jar"/>-->
<!-- </fileset>-->
<!-- </copy>-->
<!-- <copy todir="tmp">-->
<!-- <fileset dir="${resources_from}\src\main\resources">-->
<!-- <patternset refid="resources4Jar"/>-->
<!-- </fileset>-->
<!-- </copy>-->
<!-- <copy todir="${classes}">-->
<!-- <fileset dir="tmp"/>-->
<!-- </copy>-->
<!-- <delete dir="tmp"/>-->
<!-- </target>-->
<!-- <target name="compile_javas">-->
<!-- <echo message="编译${compile_files}下的Java文件"/>-->
<!-- <javac destdir="${classes}" debug="true" optimize="on" source="${source_jdk_version}"-->
<!-- target="${target_jdk_version}"-->
<!-- fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}"-->
<!-- executable="${compile_jdk_version}/bin/javac" includeantruntime="on">-->
<!-- <src path="${basedir}/src"/>-->
<!-- <exclude name="**/.svn/**"/>-->
<!-- <compilerarg line="-encoding UTF8 "/>-->
<!-- <classpath refid="compile.classpath"/>-->
<!-- </javac>-->
<!-- </target>-->
<target name="copy_resources">
<echo message="从${resources_from}拷贝图片,JS,CSS等资源文件"/>
<delete dir="tmp"/>
<copy todir="tmp">
<fileset dir="${resources_from}\src\main\java">
<patternset refid="resources4Jar"/>
</fileset>
</copy>
<copy todir="tmp">
<fileset dir="${resources_from}\src\main\resources">
<patternset refid="resources4Jar"/>
</fileset>
</copy>
<copy todir="${classes}">
<fileset dir="tmp"/>
</copy>
<delete dir="tmp"/>
</target>
<target name="compile_javas">
<echo message="编译${compile_files}下的Java文件"/>
<javac destdir="${classes}" debug="true" optimize="on" source="${source_jdk_version}"
target="${target_jdk_version}"
fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}"
executable="${compile_jdk_version}/bin/javac" includeantruntime="on">
<src path="${basedir}/src"/>
<exclude name="**/.svn/**"/>
<compilerarg line="-encoding UTF8 "/>
<classpath refid="compile.classpath"/>
</javac>
</target>
<target name="jar_classes">
<echo message="打Jar包:${jar_name}"/>
@ -79,15 +79,15 @@
</target>
<target name="super_jar">
<!-- <antcall target="copy_resources">-->
<!-- <param name="resources_from" value="${basedir}"/>-->
<!-- </antcall>-->
<!-- <antcall target="compile_javas">-->
<!-- <param name="source_jdk_version" value="1.8"/>-->
<!-- <param name="target_jdk_version" value="1.8"/>-->
<!-- <param name="compile_jdk_version" value="${jdk.home}"/>-->
<!-- <param name="compile_files" value="${basedir}/src"/>-->
<!-- </antcall>-->
<antcall target="copy_resources">
<param name="resources_from" value="${basedir}"/>
</antcall>
<antcall target="compile_javas">
<param name="source_jdk_version" value="1.8"/>
<param name="target_jdk_version" value="1.8"/>
<param name="compile_jdk_version" value="${jdk.home}"/>
<param name="compile_files" value="${basedir}/src"/>
</antcall>
<echo message="compile plugin success!"/>
<antcall target="jar_classes">

26
pom.xml
Unescape View File

@ -3,29 +3,29 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.finebi.project</groupId>
<artifactId>nuclear-maven</artifactId>
<version>5.0-RELEASE-SNAPSHOT</version>
<relativePath>../nuclear-maven/pom.xml</relativePath>
</parent>
<!-- <parent>-->
<!-- <groupId>com.finebi.project</groupId>-->
<!-- <artifactId>nuclear-maven</artifactId>-->
<!-- <version>5.0-RELEASE-SNAPSHOT</version>-->
<!-- <relativePath>../nuclear-maven/pom.xml</relativePath>-->
<!-- </parent>-->
<modelVersion>4.0.0</modelVersion>
<artifactId>plugin-exceldatamanagement</artifactId>
<dependencies>
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>com.finebi</groupId>-->
<!-- <artifactId>spider-adapter-sdk</artifactId>-->
<!-- <version>${foundation-version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.finebi</groupId>
<artifactId>direct-adapter-sdk</artifactId>
<version>${foundation-version}</version>
</dependency>
</dependencies>
<!-- <dependency>-->
<!-- <groupId>com.finebi</groupId>-->
<!-- <artifactId>direct-adapter-sdk</artifactId>-->
<!-- <version>${foundation-version}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<build>
<plugins>

29
src/main/java/com/fr/plugin/decision/request/handler/UpgradeHandler.java
Unescape View File

@ -1,15 +1,16 @@
package com.fr.plugin.decision.request.handler;
import com.finebi.activate.foundation.StableManager;
import com.finebi.activate.foudation.StableManager;
import com.finebi.burger.api.bean.configuration.table.attachment.FineAttachment;
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.DataBaseAddTableRequestBean;
import com.finebi.burger.api.response.configuration.table.TableAddResponseBean;
import com.finebi.burger.api.service.FineTableService;
import com.finebi.common.api.cell.context.CellCreator;
import com.finebi.common.authority.api.FineAuthorityUtils;
import com.finebi.common.authority.decision.role.FineAuthorityUser;
import com.finebi.common.impl.vo.table.FineDBBusinessTable;
import com.finebi.direct.burger.api.service.FineTableService;
import com.finebi.direct.burger.api.service.FineUserInfoService;
import com.finebi.direct.common.api.cell.user.authority.UserAuthority;
import com.finebi.foundation.api.reponse.FineRespond;
import com.finebi.foundation.api.service.FineService;
import com.finebi.foundation.api.service.context.BaseContext;
@ -32,7 +33,6 @@ import com.fr.third.org.apache.poi.hssf.usermodel.HSSFSheet;
import com.fr.third.org.apache.poi.hssf.usermodel.HSSFWorkbook;
import com.fr.third.v2.org.apache.poi.xssf.usermodel.XSSFSheet;
import com.fr.third.v2.org.apache.poi.xssf.usermodel.XSSFWorkbook;
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.fr.web.utils.WebUtils;
@ -139,7 +139,7 @@ public class UpgradeHandler extends HWAbstractHandler {
if (StringUtils.equals("success", dmlResult.getString("status")) && dmlResult.getBoolean("addLink")) {
ExcelLinkService.getInstance().addLink(name, connection, schema, tableName, createUser);
FineLoggerFactory.getLogger().info("HW_excel导入：FineDB 新增数据成功" + name);
CellCreator.getCellProvider().tableCell().removeTable(fineBusinessTable.getName(), CellCreator.getCellProvider().userCellProvider().authorityCell().getSuperAuthority());
CellCreator.getCellProvider().tableCell().removeTable(fineBusinessTable.getName(), FineAuthorityUser.ROOT_USER_ID);
}
} catch(Exception e){
e.printStackTrace();
@ -150,11 +150,11 @@ public class UpgradeHandler extends HWAbstractHandler {
JSONArray tables = JSONArray.create().put(table);
JSONObject tablesBean = JSONObject.create().put("tables", tables);
try{
UserAuthority authorityUser = getFineUserInfoService().getUserAuthority(req);
String packid = "__my_analysis__" + authorityUser.getUser().getInfo().getUserId() + "1";
FineAuthorityUser authorityUser = FineAuthorityUtils.getAuth(req);
String packid = "__my_analysis__" + authorityUser.getUserId();
try {
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.getUserId());
TableAddResponseBean responed = getTableService().addNewTable(packid, authorityUser, businessTables);
addDbResult.put(FineRespond.success(responed));
} catch (JsonMappingException e) {
@ -181,15 +181,12 @@ public class UpgradeHandler extends HWAbstractHandler {
}
protected static FineTableService getTableService() {
return getBean(FineTableService.class);
return (FineTableService)getBean(FineTableService.class);
}
private static <T extends FineService> T getBean(Class<T> annotatedClass) {
return getContext().getServiceBean(annotatedClass);
}
/**
* service获取集合
*/
private static BaseContext getContext() {
return StableManager.getContext();
}
@ -233,12 +230,6 @@ public class UpgradeHandler extends HWAbstractHandler {
}
private static String getTableNameWithConnection(DataBaseAddTableItemRequestBean itemBean) {
// return com.finebi.utils.StringUtils.join("_", itemBean.getConnectionName(), itemBean.getDbTableName());
return itemBean.getDbTableName();
}
protected static FineUserInfoService getFineUserInfoService() {
return getBean(FineUserInfoService.class);
}
}

Write Preview
Loading…
Cancel
Save