1、去除多余模块

Former-commit-id: 82ae83653d32cf14376b5e3b17dc4be856a424ee
master
王兵 5 years ago
parent 2c49305854
commit d7f56c6a49

@ -192,9 +192,4 @@ public class MainController {
public void generateAndroid(ActionEvent actionEvent) {
Dialog.showAndroid();
}
@FXML
public void generateSBMDB(ActionEvent actionEvent) {
Dialog.showSBMDB();
}
}

@ -4,7 +4,6 @@ import org.springframework.boot.system.ApplicationHome;
import xyz.wbsite.dbtool.javafx.enums.FieldType;
import xyz.wbsite.dbtool.javafx.manger.callable.AndroidCallable;
import xyz.wbsite.dbtool.javafx.manger.callable.ApiCallable;
import xyz.wbsite.dbtool.javafx.manger.callable.SBMDBCallable;
import xyz.wbsite.dbtool.javafx.manger.callable.SpringBootCallable;
import xyz.wbsite.dbtool.javafx.manger.callable.VueCallable;
import xyz.wbsite.dbtool.javafx.po.AbstractDBmapper;
@ -15,7 +14,6 @@ import xyz.wbsite.dbtool.javafx.po.Module;
import xyz.wbsite.dbtool.javafx.po.MySQLDBmapper;
import xyz.wbsite.dbtool.javafx.po.OracleDBmapper;
import xyz.wbsite.dbtool.javafx.po.Project;
import xyz.wbsite.dbtool.javafx.po.SBMDBOption;
import xyz.wbsite.dbtool.javafx.po.Table;
import xyz.wbsite.dbtool.javafx.po.VueOption;
import xyz.wbsite.dbtool.javafx.tool.Dialog;
@ -430,31 +428,6 @@ public class ProjectManager {
}.start();
}
public void generate(final String path, SBMDBOption option) {
Dialog.showProgress("生成中...");
new Thread() {
@Override
public void run() {
SBMDBCallable callable = new SBMDBCallable(path, option);
Future submit = service.submit(callable);
try {
Boolean b = (Boolean) submit.get();
if (!b) {
Dialog.showError("请确认目录结构是否存在或正确!");
}
} catch (InterruptedException e) {
e.printStackTrace();
} catch (ExecutionException e) {
e.printStackTrace();
}
Dialog.stopPopup();
Dialog.showSuccess("生成完毕.");
}
}.start();
}
/**
*
*/

@ -1,43 +0,0 @@
package xyz.wbsite.dbtool.javafx.manger.callable;
import xyz.wbsite.dbtool.javafx.manger.FreeMarkerManager;
import xyz.wbsite.dbtool.javafx.manger.ManagerFactory;
import xyz.wbsite.dbtool.javafx.po.SBMDBOption;
import xyz.wbsite.dbtool.javafx.tool.Tool;
import xyz.wbsite.dbtool.web.frame.utils.ZipUtil;
import javax.validation.constraints.NotNull;
import java.io.File;
import java.util.concurrent.Callable;
public class SBMDBCallable implements Callable {
private String path;
private SBMDBOption option;
private FreeMarkerManager freeMarkerManager;
public SBMDBCallable(@NotNull String path, SBMDBOption option) {
this.path = path;
this.option = option;
this.freeMarkerManager = ManagerFactory.getFreeMarkerManager();
}
public Boolean call() throws Exception {
// 文件输出文件
File zipFile = new File(path, "SpringBootMDB.zip");
// 文件输出目录
File dir = new File(path, "SpringBootMDB");
// 清空输出目录
Tool.clear(dir);
System.out.println("清空文件" + dir.getAbsolutePath());
// 输出文件
Tool.outputResource("SpringBootMDB/SpringBootMDB.zip", zipFile);
// 解压文件
new ZipUtil().unZip(zipFile, new File(path));
// 删除文件
zipFile.delete();
System.out.println("删除文件" + zipFile.getAbsolutePath());
return true;
}
}

@ -1,4 +0,0 @@
package xyz.wbsite.dbtool.javafx.po;
public class SBMDBOption {
}

@ -571,26 +571,6 @@ public class Dialog {
popup.show();
}
public static void showSBMDB() {
ProjectManager dBmanger = ManagerFactory.getProjectManager();
DirectoryChooser directoryChooser = new DirectoryChooser();
directoryChooser.setInitialDirectory(dBmanger.getPath());
Stage stage = new Stage();
File file = directoryChooser.showDialog(stage);
if (file != null) {
System.out.println("生成目录:" + file.getAbsolutePath());
SBMDBOption option = new SBMDBOption();
dBmanger.generate(file.getAbsolutePath(), option);
Platform.runLater(new Runnable() {
@Override
public void run() {
stage.close();
}
});
}
}
public static void showVue() {
FXMLLoader dbdetailloader = new FXMLLoader(Application.class.getResource("../../../fxml/vueOption.fxml"));
try {

@ -36,7 +36,6 @@
<MenuItem mnemonicParsing="false" onAction="#generateApi" text="生成Api"/>
<MenuItem mnemonicParsing="false" onAction="#generateVue" text="生成Vue"/>
<MenuItem mnemonicParsing="false" onAction="#generateAndroid" text="生成Android"/>
<MenuItem mnemonicParsing="false" onAction="#generateSBMDB" text="生成多库方案"/>
</items>
</Menu>
<Menu mnemonicParsing="false" text="Help">

Loading…
Cancel
Save

Powered by TurnKey Linux.