open
/
open-dbtool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

任务相关优化

Browse Source
master
wangbing 5 years ago
parent c2450963b7
commit 27fa822408
19 changed files with 171 additions and 154 deletions
Show Stats Download Patch File Download Diff File

29
src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java
Unescape View File

@ -350,10 +350,10 @@ public class JavaFxApplication extends Application {
int i1 = 0, i2 = 0; int i1 = 0, i2 = 0;
for (int i = 0; i < mds.size(); i++) { for (int i = 0; i < mds.size(); i++) {
if (mds.get(i).getModuleName().equals(m1)) { if (mds.get(i).getName().equals(m1)) {
i1 = i; i1 = i;
} }
if (mds.get(i).getModuleName().equals(m2)) { if (mds.get(i).getName().equals(m2)) {
i2 = i; i2 = i;
} }
} }
@ -416,7 +416,7 @@ public class JavaFxApplication extends Application {
@Override @Override
public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) { public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
if (currentModule != null) { if (currentModule != null) {
currentModule.setModuleComment(newValue); currentModule.setNote(newValue);
} }
} }
}); });
@ -434,7 +434,7 @@ public class JavaFxApplication extends Application {
@Override @Override
public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) { public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
if (currentModule != null) { if (currentModule != null) {
currentModule.setModuleName(newValue); currentModule.setName(newValue);
} }
} }
}); });
@ -761,16 +761,16 @@ public class JavaFxApplication extends Application {
TreeItem moduleTreeItem = new TreeItem(module); TreeItem moduleTreeItem = new TreeItem(module);
moduleTreeItem.setExpanded(true); moduleTreeItem.setExpanded(true);
getTreeItem().getChildren().add(moduleTreeItem); getTreeItem().getChildren().add(moduleTreeItem);
System.out.println("新增模块" + module.getModuleName()); System.out.println("新增模块" + module.getName());
} }
}).build()); }).build());
} else if (item instanceof Module) { } else if (item instanceof Module) {
Module mo = (Module) item; Module mo = (Module) item;
setText(mo.getModuleName()); setText(mo.getName());
mo.moduleNameProperty().addListener(new ChangeListener<String>() { mo.nameProperty().addListener(new ChangeListener<String>() {
@Override @Override
public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) { public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
setText(mo.getModuleName()); setText(mo.getName());
} }
}); });
//region 模块右击菜单 //region 模块右击菜单
@ -799,7 +799,7 @@ public class JavaFxApplication extends Application {
if (currentModule.hashCode() == module.hashCode()) { if (currentModule.hashCode() == module.hashCode()) {
loadProject(); loadProject();
} }
System.out.println("删除模块" + mo.getModuleName()); System.out.println("删除模块" + mo.getName());
} }
}) })
.add("向上调整", new EventHandler<ActionEvent>() { .add("向上调整", new EventHandler<ActionEvent>() {
@ -812,7 +812,7 @@ public class JavaFxApplication extends Application {
if (indexOf > 0) { if (indexOf > 0) {
Tool.exchange(projectTreeItem.getChildren(), indexOf - 1, indexOf); Tool.exchange(projectTreeItem.getChildren(), indexOf - 1, indexOf);
Tool.exchange(project.getModules(), indexOf - 1, indexOf); Tool.exchange(project.getModules(), indexOf - 1, indexOf);
System.out.println("向上调整" + mo.getModuleName()); System.out.println("向上调整" + mo.getName());
} }
} }
}) })
@ -826,7 +826,7 @@ public class JavaFxApplication extends Application {
if (indexOf < project.getModules().size() - 1) { if (indexOf < project.getModules().size() - 1) {
Tool.exchange(projectTreeItem.getChildren(), indexOf, indexOf + 1); Tool.exchange(projectTreeItem.getChildren(), indexOf, indexOf + 1);
Tool.exchange(project.getModules(), indexOf, indexOf + 1); Tool.exchange(project.getModules(), indexOf, indexOf + 1);
System.out.println("向下调整" + mo.getModuleName()); System.out.println("向下调整" + mo.getName());
} }
} }
}).build()); }).build());
@ -898,9 +898,9 @@ public class JavaFxApplication extends Application {
} }
GridPane gridPane = mModuleLoader.getRoot(); GridPane gridPane = mModuleLoader.getRoot();
detailModuleController.getModuleComment().setText(currentModule.getModuleComment()); detailModuleController.getModuleComment().setText(currentModule.getNote());
detailModuleController.getModulePrefix().setText(currentModule.getModulePrefix()); detailModuleController.getModulePrefix().setText(currentModule.getModulePrefix());
detailModuleController.getModuleName().setText(currentModule.getModuleName()); detailModuleController.getModuleName().setText(currentModule.getName());
detailModuleController.getIsGenerate().setSelected(currentModule.getNeedGenerate()); detailModuleController.getIsGenerate().setSelected(currentModule.getNeedGenerate());
if (gridPane != null) { if (gridPane != null) {
@ -1417,6 +1417,9 @@ public class JavaFxApplication extends Application {
int param1 = checkBoxTableCell.getParam(); int param1 = checkBoxTableCell.getParam();
Field field = currentTable.getFields().get(param1); Field field = currentTable.getFields().get(param1);
field.setIsQuery(newValue); field.setIsQuery(newValue);
if (!newValue){
field.setIsUnique(false);
}
} }
}); });
return checkBoxTableCell; return checkBoxTableCell;

14
src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java
Unescape View File

@ -77,7 +77,7 @@ public class ProjectManager {
public Module findDBByDBName(String name) { public Module findDBByDBName(String name) {
for (Module md : project.getModules()) { for (Module md : project.getModules()) {
if (md.getModuleName().equals(name)) { if (md.getName().equals(name)) {
return md; return md;
} }
} }
@ -86,7 +86,7 @@ public class ProjectManager {
public boolean removeDBByDBName(String name) { public boolean removeDBByDBName(String name) {
for (Module md : project.getModules()) { for (Module md : project.getModules()) {
if (md.getModuleName().equals(name)) { if (md.getName().equals(name)) {
project.getModules().remove(md); project.getModules().remove(md);
return true; return true;
} }
@ -190,7 +190,7 @@ public class ProjectManager {
do { do {
int i; int i;
for (i = 0; i < project.getModules().size(); i++) { for (i = 0; i < project.getModules().size(); i++) {
if (name.equals(project.getModules().get(i).getModuleName())) { if (name.equals(project.getModules().get(i).getName())) {
break; break;
} }
} }
@ -199,8 +199,8 @@ public class ProjectManager {
name = base + k; name = base + k;
} else { } else {
Module md = new Module(name); Module md = new Module(name);
md.setModuleName(name); md.setName(name);
md.setModuleComment("注释"); md.setNote("注释");
md.setNeedGenerate(true); md.setNeedGenerate(true);
project.putModule(md); project.putModule(md);
return md; return md;
@ -294,10 +294,10 @@ public class ProjectManager {
return false; return false;
} }
for (Module md : project.getModules()) { for (Module md : project.getModules()) {
if (md.getModuleName() == null || "".equals(md.getModuleName())) { if (md.getName() == null || "".equals(md.getName())) {
Dialog.showYesNo("项目" + project.getName() + "没有填写模块名!"); Dialog.showYesNo("项目" + project.getName() + "没有填写模块名!");
return false; return false;
} else if (md.getModuleComment() == null || "".equals(md.getModuleComment())) { } else if (md.getNote() == null || "".equals(md.getNote())) {
Dialog.showYesNo("项目" + project.getName() + "没有模块注释!"); Dialog.showYesNo("项目" + project.getName() + "没有模块注释!");
return false; return false;
} }

40
src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java
Unescape View File

@ -146,8 +146,8 @@ public class SpringBootCallable implements Callable {
if (!module.getNeedGenerate()) { if (!module.getNeedGenerate()) {
continue; continue;
} }
File m = Tool.createPath(ajax, module.getModuleName()); File m = Tool.createPath(ajax, module.getName());
ctxss.put("moduleName", module.getModuleName()); ctxss.put("moduleName", module.getName());
for (Table table : module.getTables()) { for (Table table : module.getTables()) {
if (table.getAjax()) { if (table.getAjax()) {
ctxss.put("table", table); ctxss.put("table", table);
@ -175,8 +175,8 @@ public class SpringBootCallable implements Callable {
ctxss.put("project",project); ctxss.put("project",project);
ctxss.put("domain",project.getDomain()); ctxss.put("domain",project.getDomain());
ctxss.put("author", project.getAuthor()); ctxss.put("author", project.getAuthor());
ctxss.put("module", module.getModuleName()); ctxss.put("module", module.getName());
File m = Tool.createPath(api, module.getModuleName()); File m = Tool.createPath(api, module.getName());
for (Table table : module.getTables()) { for (Table table : module.getTables()) {
if (table.getApi()) { if (table.getApi()) {
ctxss.put("table", table); ctxss.put("table", table);
@ -245,14 +245,14 @@ public class SpringBootCallable implements Callable {
ctx.put("module", module); ctx.put("module", module);
ctx.put("domain", project.getDomain()); ctx.put("domain", project.getDomain());
ctx.put("author", project.getAuthor()); ctx.put("author", project.getAuthor());
ctx.put("moduleName", module.getModuleName()); ctx.put("moduleName", module.getName());
ctx.put("dataBase", project.getDatabase().toString()); ctx.put("dataBase", project.getDatabase().toString());
File ent = Tool.createPath(Tool.createPath(root, module.getModuleName()), "ent"); File ent = Tool.createPath(Tool.createPath(root, module.getName()), "ent");
File mpr = Tool.createPath(Tool.createPath(root, module.getModuleName()), "mpr"); File mpr = Tool.createPath(Tool.createPath(root, module.getName()), "mpr");
File mgr = Tool.createPath(Tool.createPath(root, module.getModuleName()), "mgr"); File mgr = Tool.createPath(Tool.createPath(root, module.getName()), "mgr");
File req = Tool.createPath(Tool.createPath(root, module.getModuleName()), "req"); File req = Tool.createPath(Tool.createPath(root, module.getName()), "req");
File rsp = Tool.createPath(Tool.createPath(root, module.getModuleName()), "rsp"); File rsp = Tool.createPath(Tool.createPath(root, module.getName()), "rsp");
module.setProjectAuthor(project.getAuthor()); module.setProjectAuthor(project.getAuthor());
module.setProjectBasePackage(project.getDomain()); module.setProjectBasePackage(project.getDomain());
@ -533,9 +533,9 @@ public class SpringBootCallable implements Callable {
for (Module module : project.getModules()) { for (Module module : project.getModules()) {
if (module.getNeedGenerate()) { if (module.getNeedGenerate()) {
ctx.put("moduleName", module.getModuleName()); ctx.put("moduleName", module.getName());
ctx.put("module", module); ctx.put("module", module);
File tableDir = Tool.createPath(dbtool, module.getModuleName() + "_table"); File tableDir = Tool.createPath(dbtool, module.getName() + "_table");
for (Table table : module.getTables()) { for (Table table : module.getTables()) {
ctx.put("table", table); ctx.put("table", table);
freeMarkerManager.outputTemp(Tool.createFile(tableDir, project.getDatabase().name() + "_" + table.getTableName() + ".sql"), "SpringBoot/resources/dbtool/table.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(tableDir, project.getDatabase().name() + "_" + table.getTableName() + ".sql"), "SpringBoot/resources/dbtool/table.ftl", ctx);
@ -639,15 +639,15 @@ public class SpringBootCallable implements Callable {
freeMarkerManager.outputTemp(Tool.createFile(screen, "index.ftl"), "SpringBoot/resources/templates/screen/index.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(screen, "index.ftl"), "SpringBoot/resources/templates/screen/index.ftl", ctx);
for (Module mo : project.getModules()) { for (Module module : project.getModules()) {
if (mo.getNeedGenerate()) { if (module.getNeedGenerate()) {
for (Table table : mo.getTables()) { File modulePath = Tool.createPath(screen, module.getName());
for (Table table : module.getTables()) {
if (table.getHtml()) { if (table.getHtml()) {
File module = Tool.createPath(screen, mo.getModuleName());
ctx.put("table", table); ctx.put("table", table);
ctx.put("module", module); ctx.put("module", module);
ctx.put("fields", table.getFields()); ctx.put("fields", table.getFields());
File file = Tool.createFile(module, table.getFName() + ".ftl"); File file = Tool.createFile(modulePath, table.getFName() + ".ftl");
freeMarkerManager.outputTemp(file, "SpringBoot/resources/templates/screen/module/mgr.ftl", ctx); freeMarkerManager.outputTemp(file, "SpringBoot/resources/templates/screen/module/mgr.ftl", ctx);
} }
} }
@ -707,14 +707,14 @@ public class SpringBootCallable implements Callable {
for (Module md : project.getModules()) { for (Module md : project.getModules()) {
if (md.getNeedGenerate()) { if (md.getNeedGenerate()) {
File module = Tool.createPath(root, md.getModuleName()); File module = Tool.createPath(root, md.getName());
for (Table table : md.getTables()) { for (Table table : md.getTables()) {
HashMap<String, Object> ctx = new HashMap<String, Object>(); HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("domain", project.getDomain()); ctx.put("domain", project.getDomain());
ctx.put("module", md); ctx.put("module", md);
ctx.put("moduleName", md.getModuleName()); ctx.put("moduleName", md.getName());
ctx.put("table", table); ctx.put("table", table);
ctx.put("author", md.getProjectAuthor()); ctx.put("author", md.getProjectAuthor());
@ -742,7 +742,7 @@ public class SpringBootCallable implements Callable {
private Module tryGetModule(Project project, String moduleName) { private Module tryGetModule(Project project, String moduleName) {
for (Module module : project.getModules()) { for (Module module : project.getModules()) {
if (module.getModuleName().equals(moduleName)) { if (module.getName().equals(moduleName)) {
return module; return module;
} }
} }

20
src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringMVCCallable.java
Unescape View File

@ -115,7 +115,7 @@ public class SpringMVCCallable implements Callable {
generateController(new File(src.getParentFile().getAbsolutePath() + File.separator + "controller"), project, dataBase, option); generateController(new File(src.getParentFile().getAbsolutePath() + File.separator + "controller"), project, dataBase, option);
for (Module module : project.getModules()) { for (Module module : project.getModules()) {
File moduleFile = new File(src, module.getModuleName()); File moduleFile = new File(src, module.getName());
//module //module
System.out.println("生成模块:Entity"); System.out.println("生成模块:Entity");
@ -196,7 +196,7 @@ public class SpringMVCCallable implements Callable {
HashMap<String, Object> ctx = new HashMap<String, Object>(); HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("tool", Tool.class); ctx.put("tool", Tool.class);
ctx.put("domain", project.getProjectBasePackage()); ctx.put("domain", project.getProjectBasePackage());
ctx.put("moduleName", project.getModuleName()); ctx.put("moduleName", project.getName());
ctx.put("table", table); ctx.put("table", table);
ctx.put("author", project.getProjectAuthor()); ctx.put("author", project.getProjectAuthor());
@ -225,7 +225,7 @@ public class SpringMVCCallable implements Callable {
HashMap<String, Object> ctx = new HashMap<String, Object>(); HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("tool", Tool.class); ctx.put("tool", Tool.class);
ctx.put("domain", project.getProjectBasePackage()); ctx.put("domain", project.getProjectBasePackage());
ctx.put("moduleName", project.getModuleName()); ctx.put("moduleName", project.getName());
ctx.put("author", project.getProjectAuthor()); ctx.put("author", project.getProjectAuthor());
freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + "Type.java"), option + "/java/enums/Type.ftl", ctx); freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + "Type.java"), option + "/java/enums/Type.ftl", ctx);
@ -254,7 +254,7 @@ public class SpringMVCCallable implements Callable {
ctx.put("tool", Tool.class); ctx.put("tool", Tool.class);
ctx.put("domain", project.getProjectBasePackage()); ctx.put("domain", project.getProjectBasePackage());
ctx.put("moduleName", project.getModuleName()); ctx.put("moduleName", project.getName());
freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + "Authorizations" + ".java"), option + "/java/filter/Authorizations.ftl", ctx); freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + "Authorizations" + ".java"), option + "/java/filter/Authorizations.ftl", ctx);
} catch (Exception e) { } catch (Exception e) {
@ -281,7 +281,7 @@ public class SpringMVCCallable implements Callable {
ctx.put("project", project); ctx.put("project", project);
ctx.put("dataBase", dataBase.toString()); ctx.put("dataBase", dataBase.toString());
ctx.put("domain", project.getProjectBasePackage()); ctx.put("domain", project.getProjectBasePackage());
ctx.put("moduleName", project.getModuleName()); ctx.put("moduleName", project.getName());
ctx.put("author", project.getProjectAuthor()); ctx.put("author", project.getProjectAuthor());
for (Table table : project.getTables()) { for (Table table : project.getTables()) {
@ -308,7 +308,7 @@ public class SpringMVCCallable implements Callable {
ctx.put("tool", Tool.class); ctx.put("tool", Tool.class);
ctx.put("domain", project.getProjectBasePackage()); ctx.put("domain", project.getProjectBasePackage());
ctx.put("moduleName", project.getModuleName()); ctx.put("moduleName", project.getName());
ctx.put("author", project.getProjectAuthor()); ctx.put("author", project.getProjectAuthor());
for (Table table : project.getTables()) { for (Table table : project.getTables()) {
@ -341,7 +341,7 @@ public class SpringMVCCallable implements Callable {
HashMap<String, Object> ctx = new HashMap<String, Object>(); HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("tool", Tool.class); ctx.put("tool", Tool.class);
ctx.put("domain", project.getProjectBasePackage()); ctx.put("domain", project.getProjectBasePackage());
ctx.put("moduleName", project.getModuleName()); ctx.put("moduleName", project.getName());
ctx.put("author", project.getProjectAuthor()); ctx.put("author", project.getProjectAuthor());
for (Table table : project.getTables()) { for (Table table : project.getTables()) {
@ -376,7 +376,7 @@ public class SpringMVCCallable implements Callable {
HashMap<String, Object> ctx = new HashMap<String, Object>(); HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("tool", Tool.class); ctx.put("tool", Tool.class);
ctx.put("domain", project.getProjectBasePackage()); ctx.put("domain", project.getProjectBasePackage());
ctx.put("moduleName", project.getModuleName()); ctx.put("moduleName", project.getName());
ctx.put("author", project.getProjectAuthor()); ctx.put("author", project.getProjectAuthor());
for (Table table : project.getTables()) { for (Table table : project.getTables()) {
@ -536,7 +536,7 @@ public class SpringMVCCallable implements Callable {
for (Module table : project.getModules()) { for (Module table : project.getModules()) {
ctx.put("table", table); ctx.put("table", table);
freeMarkerManager.outputTemp(new File(tableDir.getAbsolutePath() + File.separator + table.getModuleName() + ".sql"), option + "/resources/table.ftl", ctx); freeMarkerManager.outputTemp(new File(tableDir.getAbsolutePath() + File.separator + table.getName() + ".sql"), option + "/resources/table.ftl", ctx);
} }
} catch (Exception e) { } catch (Exception e) {
@ -563,7 +563,7 @@ public class SpringMVCCallable implements Callable {
ctx.put("moduleName", project.getName()); ctx.put("moduleName", project.getName());
for (Module table : project.getModules()) { for (Module table : project.getModules()) {
ctx.put("table", table); ctx.put("table", table);
freeMarkerManager.outputTemp(new File(module.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getModuleName()) + "Test" + ".java"), option + "/test/test.ftl", ctx); freeMarkerManager.outputTemp(new File(module.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getName()) + "Test" + ".java"), option + "/test/test.ftl", ctx);
} }
} }

28
src/main/java/xyz/wbsite/dbtool/javafx/po/Module.java
Unescape View File

@ -11,14 +11,14 @@ public class Module {
} }
public Module(String moduleName) { public Module(String name) {
setModuleName(moduleName); setName(name);
} }
@Property("name") @Property("name")
private SimpleStringProperty moduleName = new SimpleStringProperty(); private SimpleStringProperty name = new SimpleStringProperty();
@Property("note") @Property("note")
private String moduleComment; private String note;
@Property("prefix") @Property("prefix")
private String modulePrefix; private String modulePrefix;
@Property("needGenerate") @Property("needGenerate")
@ -30,16 +30,16 @@ public class Module {
private List<Table> tables = new ArrayList(); private List<Table> tables = new ArrayList();
public String getModuleName() { public String getName() {
return moduleName.get(); return name.get();
} }
public SimpleStringProperty moduleNameProperty() { public SimpleStringProperty nameProperty() {
return moduleName; return name;
} }
public void setModuleName(String moduleName) { public void setName(String name) {
this.moduleName.set(moduleName); this.name.set(name);
} }
public boolean putTable(Table table) { public boolean putTable(Table table) {
@ -65,12 +65,12 @@ public class Module {
this.tables = tables; this.tables = tables;
} }
public String getModuleComment() { public String getNote() {
return moduleComment; return note;
} }
public void setModuleComment(String moduleComment) { public void setNote(String note) {
this.moduleComment = moduleComment; this.note = note;
} }
public String getModulePrefix() { public String getModulePrefix() {

2
src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java
Unescape View File

@ -311,7 +311,7 @@ public class Dialog {
} }
for (Module db : ManagerFactory.getProjectManager().getMds()) { for (Module db : ManagerFactory.getProjectManager().getMds()) {
if (db.getModuleName().equals(userName)) { if (db.getName().equals(userName)) {
Dialog.showYesNo("已经存的模块!"); Dialog.showYesNo("已经存的模块!");
return; return;
} }

45
src/main/resources/modules/SpringBoot/java/frame/schedule/RunTask.java
Unescape View File

@ -1,9 +1,7 @@
package ${domain}.frame.schedule; package ${domain}.frame.schedule;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import java.util.Date;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
/** /**
@ -17,20 +15,51 @@ public abstract class RunTask implements Runnable {
public abstract String taskId(); public abstract String taskId();
public String taskName(){ protected abstract void task();
public String taskName() {
return ""; return "";
} }
public String taskNote(){ public String taskNote() {
return ""; return "";
} }
public abstract ScheduledFuture<?> schedule(ThreadPoolTaskScheduler poolTaskScheduler); @Override
public void run() {
try {
boolean before = before();
if (before) {
task();
}
after();
} catch (Exception e) {
exception(e);
}
}
public void configChange(ThreadPoolTaskScheduler scheduler) { /**
ScheduledFuture<?> schedule = scheduler.schedule(this, new Date()); * 任务执行前执行
if (!schedule.cancel(true)) { *
* @return 是否继续执行任务
*/
protected boolean before() {
return true;
}
/**
* 任务执行后执行
*/
protected void after() {
} }
/**
* 执行任务异常处理
*/
protected void exception(Exception e) {
e.printStackTrace();
} }
public abstract ScheduledFuture<?> schedule(ThreadPoolTaskScheduler poolTaskScheduler);
} }

16
src/main/resources/modules/SpringBoot/java/frame/schedule/Scheduler.java
Unescape View File

@ -85,20 +85,12 @@ public class Scheduler extends ThreadPoolTaskScheduler implements ErrorHandler {
@Override @Override
public void handleError(Throwable throwable) { public void handleError(Throwable throwable) {
LogUtil.dumpException(throwable); String title = throwable.getMessage();
String message = LogUtil.getTrace(throwable);
<#if project.frameValue() = 1> LogUtil.e(message);
String message = throwable.getMessage();
Pattern compile = Pattern.compile("(\\[.*])执行异常！任务ID(\\(.*\\))");
Matcher matcher = compile.matcher(message);
if (matcher.find()) {
String taskName = matcher.group(1);
String taskId = matcher.group(2);
LogerrManager logerrManager = LocalData.getBean(LogerrManager.class); LogerrManager logerrManager = LocalData.getBean(LogerrManager.class);
if (logerrManager != null) if (logerrManager != null)
logerrManager.addErr("任务错误", "任务" + taskName + "执行错误", "任务" + taskName + "执行错误" + "，任务ID" + taskId); logerrManager.addErr("任务错误", title, message);
}
</#if>
} }
class TaskWrapper { class TaskWrapper {

4
src/main/resources/modules/SpringBoot/java/module/mpr/Mapper.java
Unescape View File

@ -110,9 +110,9 @@ public interface ${table.getCName()}Mapper {
/** /**
* 获得对象 * 获得对象
* *
* @param list 主键集合 * @param ids 主键集合
* @param token 令牌 * @param token 令牌
* @return 返回对象 * @return 返回对象
*/ */
List<${table.getCName()}> getByIds(@Param("list") List<Long> list, @Param("token") Token token); List<${table.getCName()}> getByIds(@Param("ids") Long[] ids, @Param("token") Token token);
} }

2
src/main/resources/modules/SpringBoot/java/module/mpr/MySQL_mapper.xml
Unescape View File

@ -272,7 +272,7 @@
<include refid="table"/> <include refid="table"/>
WHERE `IS_DELETED` = 0 WHERE `IS_DELETED` = 0
AND `ID` IN AND `ID` IN
<foreach collection="list" item="item" index="index" separator="," open="(" close=")"> <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
${r"#{"}item} ${r"#{"}item}
</foreach> </foreach>
</select> </select>

2
src/main/resources/modules/SpringBoot/java/module/mpr/Oracle_mapper.xml
Unescape View File

@ -274,7 +274,7 @@
<include refid="table"/> <include refid="table"/>
WHERE "IS_DELETED" = 0 WHERE "IS_DELETED" = 0
AND "ID" IN AND "ID" IN
<foreach collection="list" item="item" index="index" separator="," open="(" close=")"> <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
${r"#{"}item} ${r"#{"}item}
</foreach> </foreach>
</select> </select>

2
src/main/resources/modules/SpringBoot/java/module/mpr/SQLite_mapper.xml
Unescape View File

@ -272,7 +272,7 @@
<include refid="table"/> <include refid="table"/>
WHERE "IS_DELETED" = 0 WHERE "IS_DELETED" = 0
AND "ID" IN AND "ID" IN
<foreach collection="list" item="item" index="index" separator="," open="(" close=")"> <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
${r"#{"}item} ${r"#{"}item}
</foreach> </foreach>
</select> </select>

6
src/main/resources/modules/SpringBoot/java/module/wsys/mgr/TaskSqlManagerImpl.java
Unescape View File

@ -233,7 +233,7 @@ public class TaskSqlManagerImpl implements TaskSqlManager {
} }
@Override @Override
public void run() { protected void task() {
try { try {
SqlUtil.exec(taskSql.getTaskSql()); SqlUtil.exec(taskSql.getTaskSql());
} catch (Exception e) { } catch (Exception e) {
@ -262,7 +262,7 @@ public class TaskSqlManagerImpl implements TaskSqlManager {
} }
@Override @Override
public void run() { protected void task() {
try { try {
SqlUtil.exec(taskSql.getTaskSql()); SqlUtil.exec(taskSql.getTaskSql());
} catch (Exception e) { } catch (Exception e) {
@ -291,7 +291,7 @@ public class TaskSqlManagerImpl implements TaskSqlManager {
} }
@Override @Override
public void run() { protected void task() {
try { try {
SqlUtil.exec(taskSql.getTaskSql()); SqlUtil.exec(taskSql.getTaskSql());
} catch (Exception e) { } catch (Exception e) {

29
src/main/resources/modules/SpringBoot/java/task/TokenTask.java
Unescape View File

@ -2,16 +2,15 @@ package ${domain}.task;
import ${domain}.frame.auth.LocalData; import ${domain}.frame.auth.LocalData;
import ${domain}.frame.schedule.RunDelayRepeatTask; import ${domain}.frame.schedule.RunDelayRepeatTask;
import ${domain}.frame.utils.IDgenerator; import ${domain}.frame.utils.SqlUtil;
import ${domain}.module.wsys.ent.Tokens; import ${domain}.module.wsys.mgr.LogerrManager;
import ${domain}.module.wsys.mgr.TokensManager; import ${domain}.module.wsys.mgr.TokensManager;
import ${domain}.module.wsys.req.TokensFindRequest;
import ${domain}.module.wsys.req.TokensLogoutRequest; import ${domain}.module.wsys.req.TokensLogoutRequest;
import ${domain}.module.wsys.rsp.TokensFindResponse;
import ${domain}.module.wsys.rsp.TokensLogoutResponse; import ${domain}.module.wsys.rsp.TokensLogoutResponse;
import java.time.Duration; import java.time.Duration;
import java.util.Date; import java.util.Date;
import java.util.List;
public class TokenTask extends RunDelayRepeatTask { public class TokenTask extends RunDelayRepeatTask {
@ -26,7 +25,7 @@ public class TokenTask extends RunDelayRepeatTask {
} }
@Override @Override
public String taskNote () { public String taskNote() {
return "处理过期登录凭证状态，及时注销。"; return "处理过期登录凭证状态，及时注销。";
} }
@ -36,23 +35,17 @@ public class TokenTask extends RunDelayRepeatTask {
} }
@Override @Override
public void run() { protected void task() {
TokensManager tokensManager = LocalData.getBean(TokensManager.class); TokensManager tokensManager = LocalData.getBean(TokensManager.class);
LogerrManager logerrManager = LocalData.getBean(LogerrManager.class);
if (tokensManager == null) { if (tokensManager == null) {
return; return;
} }
List<TokensLogoutRequest> select = SqlUtil.select("SELECT TOKEN FROM SYS_TOKENS WHERE VALID = '1' AND IS_DELETED = '0' AND VALID_TIME < " + new Date().getTime(), TokensLogoutRequest.class);
TokensFindRequest tokensFindRequest = new TokensFindRequest(); for (TokensLogoutRequest request : select) {
tokensFindRequest.setPageSize(0); TokensLogoutResponse tokensLogoutResponse = tokensManager.logout(request, LocalData.getSysToken());
tokensFindRequest.setValid(true); if (tokensLogoutResponse.hasError()) {
TokensFindResponse tokensFindResponse = tokensManager.find(tokensFindRequest, LocalData.getSysToken()); logerrManager.addErr("任务错误", "登录凭证注销错误", tokensLogoutResponse.getErrors().get(0).getMessage());
Date current = new Date();
for (Tokens tokens : tokensFindResponse.getResult()) {
if (tokens.getValidTime().before(current)) {
TokensLogoutRequest tokensLogoutRequest = new TokensLogoutRequest();
tokensLogoutRequest.setToken(tokens.getToken());
TokensLogoutResponse tokensLogoutResponse = tokensManager.logout(tokensLogoutRequest, LocalData.getSysToken());
} }
} }
} }

8
src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl
Unescape View File

@ -73,16 +73,16 @@
${print('</#if>')} ${print('</#if>')}
<#list project.modules as module> <#list project.modules as module>
<#if module.hasHtml() && module.needGenerate> <#if module.hasHtml() && module.needGenerate>
${print('<#if token.hasRes("${module.moduleName?upper_case}")>')} ${print('<#if token.hasRes("${module.name?upper_case}")>')}
<el-submenu index="${uuid()}"> <el-submenu index="${uuid()}">
<template slot="title"> <template slot="title">
<i class="el-icon-document-copy"></i> <i class="el-icon-document-copy"></i>
<span slot="title">${module.moduleComment}</span> <span slot="title">${module.note}</span>
</template> </template>
<#list module.tables as table> <#list module.tables as table>
<#if table.getHtml()> <#if table.getHtml()>
${print('<#if token.hasRes("${module.moduleName?upper_case}_${table.tableName?upper_case}")>')} ${print('<#if token.hasRes("${module.name?upper_case}_${table.tableName?upper_case}")>')}
<el-menu-item index="${uuid()}" @click="addTab({title: '${table.tableComment}', name: '${table.tableName}', url: '${r"${context}"}/${module.moduleName}/${table.getFName()}.htm'})">${table.tableComment}</el-menu-item> <el-menu-item index="${uuid()}" @click="addTab({title: '${table.tableComment}', name: '${table.tableName}', url: '${r"${context}"}/${module.name}/${table.getFName()}.htm'})">${table.tableComment}</el-menu-item>
${print('</#if>')} ${print('</#if>')}
</#if> </#if>
</#list> </#list>

2
src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
Unescape View File

@ -513,7 +513,7 @@
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function () { }).then(function () {
new Ajax("${module}", "${table.getFName()}").delete({id: item.id}, function (response) { new Ajax("${module.name}", "${table.getFName()}").delete({id: item.id}, function (response) {
if (response.errors.length > 0) { if (response.errors.length > 0) {
nav.e(response.errors[0].message); nav.e(response.errors[0].message);
} else { } else {

42
src/main/resources/modules/SpringBoot/test/DataInit.java
Unescape View File

@ -71,7 +71,7 @@ public class DataInit {
<#list project.modules as module> <#list project.modules as module>
<#list module.tables as table> <#list module.tables as table>
<#list table.fields as field> <#list table.fields as field>
<#if field.fieldType == 'Dict' && module.moduleName != 'wsys'> <#if field.fieldType == 'Dict' && module.name != 'wsys'>
{// ${field.fieldComment?default('')} {// ${field.fieldComment?default('')}
createDict("${field.fieldName?default('')}", "${field.fieldComment?default('')}", new String[][]{ createDict("${field.fieldName?default('')}", "${field.fieldComment?default('')}", new String[][]{
<#list field.selectItems as item> <#list field.selectItems as item>
@ -230,32 +230,32 @@ public class DataInit {
<#assign index = "0"+index/> <#assign index = "0"+index/>
</#if> </#if>
<#if module.getNeedGenerate()> <#if module.getNeedGenerate()>
forMgr.add(createRes("${index}", "${module.moduleComment}菜单", "WEB", "${module.moduleName?upper_case}")); forMgr.add(createRes("${index}", "${module.note}菜单", "WEB", "${module.name?upper_case}"));
<#list module.tables as table> <#list module.tables as table>
<#if table.html> <#if table.html>
forMgr.add(createRes("${index}01", "${table.tableComment}管理菜单", "WEB", "${module.moduleName?upper_case}_${table.tableName?upper_case}")); forMgr.add(createRes("${index}01", "${table.tableComment}管理菜单", "WEB", "${module.name?upper_case}_${table.tableName?upper_case}"));
forMgr.add(createRes("${index}0101", "${table.tableComment}管理页", "WEB", "/${module.moduleName}/${table.getFName()}.htm")); forMgr.add(createRes("${index}0101", "${table.tableComment}管理页", "WEB", "/${module.name}/${table.getFName()}.htm"));
forMgr.add(createRes("${index}010101", "${table.tableComment}模板", "WEB", "/ajax/${module.moduleName}/${table.getFName()}/template")); forMgr.add(createRes("${index}010101", "${table.tableComment}模板", "WEB", "/ajax/${module.name}/${table.getFName()}/template"));
forMgr.add(createRes("${index}010102", "${table.tableComment}导入", "WEB", "/ajax/${module.moduleName}/${table.getFName()}/imports")); forMgr.add(createRes("${index}010102", "${table.tableComment}导入", "WEB", "/ajax/${module.name}/${table.getFName()}/imports"));
forMgr.add(createRes("${index}010103", "${table.tableComment}导出", "WEB", "/ajax/${module.moduleName}/${table.getFName()}/exports")); forMgr.add(createRes("${index}010103", "${table.tableComment}导出", "WEB", "/ajax/${module.name}/${table.getFName()}/exports"));
</#if> </#if>
<#if table.create> <#if table.create>
forMgr.add(createRes("${index}010104", "${table.tableComment}新增", "WEB", "/ajax/${module.moduleName}/${table.getFName()}/create")); forMgr.add(createRes("${index}010104", "${table.tableComment}新增", "WEB", "/ajax/${module.name}/${table.getFName()}/create"));
</#if> </#if>
<#if table.delete> <#if table.delete>
forMgr.add(createRes("${index}010105", "${table.tableComment}删除", "WEB", "/ajax/${module.moduleName}/${table.getFName()}/delete")); forMgr.add(createRes("${index}010105", "${table.tableComment}删除", "WEB", "/ajax/${module.name}/${table.getFName()}/delete"));
</#if> </#if>
<#if table.update> <#if table.update>
forMgr.add(createRes("${index}010106", "${table.tableComment}更新", "WEB", "/ajax/${module.moduleName}/${table.getFName()}/update")); forMgr.add(createRes("${index}010106", "${table.tableComment}更新", "WEB", "/ajax/${module.name}/${table.getFName()}/update"));
</#if> </#if>
<#if table.find> <#if table.find>
forMgr.add(createRes("${index}010107", "${table.tableComment}查询", "WEB", "/ajax/${module.moduleName}/${table.getFName()}/find")); forMgr.add(createRes("${index}010107", "${table.tableComment}查询", "WEB", "/ajax/${module.name}/${table.getFName()}/find"));
</#if> </#if>
<#if table.get> <#if table.get>
forMgr.add(createRes("${index}010108", "${table.tableComment}获取", "WEB", "/ajax/${module.moduleName}/${table.getFName()}/get")); forMgr.add(createRes("${index}010108", "${table.tableComment}获取", "WEB", "/ajax/${module.name}/${table.getFName()}/get"));
</#if> </#if>
<#if table.search> <#if table.search>
forMgr.add(createRes("${index}010109", "${table.tableComment}搜索", "WEB", "/ajax/${module.moduleName}/${table.getFName()}/search")); forMgr.add(createRes("${index}010109", "${table.tableComment}搜索", "WEB", "/ajax/${module.name}/${table.getFName()}/search"));
</#if> </#if>
</#list> </#list>
</#if> </#if>
@ -276,26 +276,26 @@ public class DataInit {
<#if index<10> <#if index<10>
<#assign index = "0"+index/> <#assign index = "0"+index/>
</#if> </#if>
forMgr.add(createRes("A${index}", "${module.moduleComment}", "API", "A${module.moduleName?upper_case}")); forMgr.add(createRes("A${index}", "${module.note}", "API", "A${module.name?upper_case}"));
<#list module.tables as table> <#list module.tables as table>
forMgr.add(createRes("A${index}01", "${table.tableComment}", "API", "A${module.moduleName?upper_case}_${table.tableName?upper_case}")); forMgr.add(createRes("A${index}01", "${table.tableComment}", "API", "A${module.name?upper_case}_${table.tableName?upper_case}"));
<#if table.create> <#if table.create>
forMgr.add(createRes("A${index}0101", "${table.tableComment}新增", "API", "/api/${module.moduleName}/${table.getFName()}/create")); forMgr.add(createRes("A${index}0101", "${table.tableComment}新增", "API", "/api/${module.name}/${table.getFName()}/create"));
</#if> </#if>
<#if table.delete> <#if table.delete>
forMgr.add(createRes("A${index}0102", "${table.tableComment}删除", "API", "/api/${module.moduleName}/${table.getFName()}/delete")); forMgr.add(createRes("A${index}0102", "${table.tableComment}删除", "API", "/api/${module.name}/${table.getFName()}/delete"));
</#if> </#if>
<#if table.update> <#if table.update>
forMgr.add(createRes("A${index}0103", "${table.tableComment}更新", "API", "/api/${module.moduleName}/${table.getFName()}/update")); forMgr.add(createRes("A${index}0103", "${table.tableComment}更新", "API", "/api/${module.name}/${table.getFName()}/update"));
</#if> </#if>
<#if table.find> <#if table.find>
forMgr.add(createRes("A${index}0104", "${table.tableComment}查询", "API", "/api/${module.moduleName}/${table.getFName()}/find")); forMgr.add(createRes("A${index}0104", "${table.tableComment}查询", "API", "/api/${module.name}/${table.getFName()}/find"));
</#if> </#if>
<#if table.get> <#if table.get>
forMgr.add(createRes("A${index}0105", "${table.tableComment}获取", "API", "/api/${module.moduleName}/${table.getFName()}/get")); forMgr.add(createRes("A${index}0105", "${table.tableComment}获取", "API", "/api/${module.name}/${table.getFName()}/get"));
</#if> </#if>
<#if table.search> <#if table.search>
forMgr.add(createRes("A${index}0107", "${table.tableComment}搜索", "API", "/api/${module.moduleName}/${table.getFName()}/search")); forMgr.add(createRes("A${index}0107", "${table.tableComment}搜索", "API", "/api/${module.name}/${table.getFName()}/search"));
</#if> </#if>
</#list> </#list>
</#list> </#list>

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.