From f4b8561bb4b0ce3712df954e2fd0e6fc5dcf15da Mon Sep 17 00:00:00 2001 From: wangbing Date: Wed, 2 Sep 2020 17:44:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dbtool/javafx/JavaFxApplication.java | 582 +++++++++--------- .../dbtool/javafx/ctrl/MainController.java | 41 +- .../dbtool/javafx/manger/ManagerFactory.java | 10 - .../dbtool/javafx/manger/ProjectManager.java | 12 +- .../dbtool/javafx/manger/ReflashManager.java | 26 - .../dbtool/javafx/manger/XmlManager.java | 2 + .../java/action/ajax/wsys/RoleAjax.java | 6 + .../java/action/ajax/wsys/UserAjax.java | 6 + .../java/config/FreeMarkerConfig.java | 4 +- .../SpringBoot/java/config/SQLiteConfig.java | 2 +- .../module/wsys/mgr/ProfilesManagerImpl.java | 13 +- .../java/module/wsys/mgr/RoleManager.java | 11 + .../java/module/wsys/mgr/RoleManagerImpl.java | 28 + .../java/module/wsys/mgr/UserManager.java | 11 + .../java/module/wsys/mgr/UserManagerImpl.java | 40 ++ .../java/module/wsys/mpr/DeptMapper.java | 11 +- .../java/module/wsys/mpr/DictItemMapper.java | 11 +- .../java/module/wsys/mpr/DictMapper.java | 11 +- .../java/module/wsys/mpr/FileMapper.java | 11 +- .../java/module/wsys/mpr/LogerrMapper.java | 11 +- .../java/module/wsys/mpr/MySQL_DeptMapper.xml | 27 + .../module/wsys/mpr/MySQL_DictItemMapper.xml | 23 + .../java/module/wsys/mpr/MySQL_DictMapper.xml | 17 + .../java/module/wsys/mpr/MySQL_FileMapper.xml | 20 + .../module/wsys/mpr/MySQL_ProfilesMapper.xml | 14 + .../java/module/wsys/mpr/MySQL_ResMapper.xml | 32 + .../java/module/wsys/mpr/MySQL_RoleMapper.xml | 17 + .../module/wsys/mpr/MySQL_RoleResMapper.xml | 20 + .../module/wsys/mpr/MySQL_SequenceMapper.xml | 20 + .../module/wsys/mpr/MySQL_TaskSqlMapper.xml | 21 + .../module/wsys/mpr/MySQL_TokensMapper.xml | 44 ++ .../java/module/wsys/mpr/MySQL_UserMapper.xml | 29 + .../module/wsys/mpr/MySQL_UserRoleMapper.xml | 20 + .../wsys/mpr/MySQL_VisitorResMapper.xml | 20 + .../module/wsys/mpr/Oracle_DeptMapper.xml | 27 + .../module/wsys/mpr/Oracle_DictItemMapper.xml | 21 + .../module/wsys/mpr/Oracle_DictMapper.xml | 18 + .../module/wsys/mpr/Oracle_FileMapper.xml | 21 + .../java/module/wsys/mpr/Oracle_ResMapper.xml | 33 + .../module/wsys/mpr/Oracle_RoleMapper.xml | 18 + .../module/wsys/mpr/Oracle_RoleResMapper.xml | 21 + .../module/wsys/mpr/Oracle_TaskSqlMapper.xml | 21 + .../module/wsys/mpr/Oracle_TokensMapper.xml | 45 ++ .../module/wsys/mpr/Oracle_UserMapper.xml | 30 + .../module/wsys/mpr/Oracle_UserRoleMapper.xml | 21 + .../java/module/wsys/mpr/ProfilesMapper.java | 11 +- .../java/module/wsys/mpr/ResMapper.java | 11 +- .../java/module/wsys/mpr/RoleMapper.java | 11 +- .../java/module/wsys/mpr/RoleResMapper.java | 11 +- .../module/wsys/mpr/SQLite_DeptMapper.xml | 27 + .../module/wsys/mpr/SQLite_DictItemMapper.xml | 20 + .../module/wsys/mpr/SQLite_DictMapper.xml | 17 + .../module/wsys/mpr/SQLite_FileMapper.xml | 20 + .../module/wsys/mpr/SQLite_LogerrMapper.xml | 17 + .../module/wsys/mpr/SQLite_ProfilesMapper.xml | 14 + .../java/module/wsys/mpr/SQLite_ResMapper.xml | 32 + .../module/wsys/mpr/SQLite_RoleMapper.xml | 17 + .../module/wsys/mpr/SQLite_RoleResMapper.xml | 20 + .../module/wsys/mpr/SQLite_SequenceMapper.xml | 20 + .../module/wsys/mpr/SQLite_TaskSqlMapper.xml | 21 + .../module/wsys/mpr/SQLite_TokensMapper.xml | 44 ++ .../module/wsys/mpr/SQLite_UserMapper.xml | 29 + .../module/wsys/mpr/SQLite_UserRoleMapper.xml | 20 + .../module/wsys/mpr/SQLite_VisitorMapper.xml | 21 + .../wsys/mpr/SQLite_VisitorResMapper.xml | 21 + .../java/module/wsys/mpr/SequenceMapper.java | 11 +- .../java/module/wsys/mpr/TaskSqlMapper.java | 11 +- .../java/module/wsys/mpr/TokensMapper.java | 11 +- .../java/module/wsys/mpr/UserMapper.java | 11 +- .../java/module/wsys/mpr/UserRoleMapper.java | 11 +- .../java/module/wsys/mpr/VisitorMapper.java | 11 +- .../module/wsys/mpr/VisitorResMapper.java | 11 +- .../java/module/wsys/req/RoleLoadRequest.java | 80 +++ .../module/wsys/req/UserResetPwdRequest.java | 26 + .../module/wsys/rsp/RoleLoadResponse.java | 14 + .../module/wsys/rsp/UserResetPwdResponse.java | 26 + .../resources/templates/screen/index.ftl | 14 +- .../templates/screen/module/wsys/user.ftl | 14 +- .../modules/SpringBoot/test/DataInit.java | 85 +-- 79 files changed, 1774 insertions(+), 415 deletions(-) delete mode 100644 src/main/java/xyz/wbsite/dbtool/javafx/manger/ReflashManager.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/wsys/req/RoleLoadRequest.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/wsys/req/UserResetPwdRequest.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/wsys/rsp/RoleLoadResponse.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/wsys/rsp/UserResetPwdResponse.java diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java b/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java index 48a3c90f..1778b1af 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java @@ -63,7 +63,6 @@ import xyz.wbsite.dbtool.javafx.tool.Tool; import xyz.wbsite.dbtool.javafx.view.DBCheckBoxTableCell; import xyz.wbsite.dbtool.web.frame.utils.ResourceUtil; -import java.io.InputStream; import java.net.URL; import java.util.ArrayList; import java.util.HashSet; @@ -104,7 +103,6 @@ public class JavaFxApplication extends Application { primaryStage.setScene(new Scene(root)); primaryStage.centerOnScreen(); primaryStage.show(); - primaryStage.setOnCloseRequest(new EventHandler() { @Override public void handle(WindowEvent event) { @@ -124,15 +122,6 @@ public class JavaFxApplication extends Application { mainController.setMain(this); mTree = mainController.getDbtree(); mDetail = mainController.getDetail(); - mFields = mainController.getFields(); - mFields.setEditable(true); - mFields.setSortPolicy(new Callback() { - @Override - public Boolean call(TableView param) { - //禁止点击列头排序 - return false; - } - }); add = mainController.getAdd(); add.setOnMouseClicked(new EventHandler() { @Override @@ -148,308 +137,157 @@ public class JavaFxApplication extends Application { } }); - mFields.setOnMouseClicked(new EventHandler() { - @Override - public void handle(MouseEvent event) { - int selectedIndex = mFields.getSelectionModel().getSelectedIndex(); - if (currentTable == null || selectedIndex == -1) { - return; - } - Field field = currentTable.getFields().get(selectedIndex); - ContextMenuBuilder builder = new ContextMenuBuilder(); - builder.add("新增", new EventHandler() { - @Override - public void handle(ActionEvent event) { - addField(); - } - }); - builder.add("删除", new EventHandler() { - @Override - public void handle(ActionEvent event) { - subField(); - } - }); - if (field.getFieldType().equals(FieldType.Dict.name())) { - builder.add("编辑字典", new EventHandler() { - @Override - public void handle(ActionEvent event) { - MenuItem target = (MenuItem) event.getTarget(); - int index = mFields.getSelectionModel().getSelectedIndex(); - List fields = currentTable.getFields(); - Field field = fields.get(index); - Dialog.showSelectEdit(field); - } - }); - } else if (field.getFieldType().equals(FieldType.Select.name())) { - builder.add("编辑选项", new EventHandler() { - @Override - public void handle(ActionEvent event) { - int index = mFields.getSelectionModel().getSelectedIndex(); - List fields = currentTable.getFields(); - Field field = fields.get(index); - Dialog.showSelectEdit(field); - } - }); - } else if (field.getFieldType().equals(FieldType.Boolean.name())) { - builder.add("编辑是否", new EventHandler() { + //region 初始化项目树 + { + mTree.setShowRoot(true); + mTree.setEditable(true); + mTree.setDisable(false); + mTree.setCellFactory(new Callback() { + @Override + public TreeCell call(TreeView param) { + TextFieldTreeCell textFieldTreeCell = new TextFieldTreeCell(new DefaultStringConverter()); + textFieldTreeCell.setEditable(false); + // creating cell from deafult factory + TreeCell treeCell = TextFieldTreeCell.forTreeView().call(param); + // setting handlers + textFieldTreeCell.setOnDragDetected(new EventHandler() { @Override - public void handle(ActionEvent event) { - int index = mFields.getSelectionModel().getSelectedIndex(); - List fields = currentTable.getFields(); - Field field = fields.get(index); - if (field.getSelectItems().size() == 2) { - + public void handle(MouseEvent event) { + TextFieldTreeCell source = (TextFieldTreeCell) event.getSource(); + String text = source.getText(); + Module dbByDBName = projectManager.findDBByDBName(text); + dragMD = dbByDBName != null; + if (dragMD) { + System.out.println("拖拽模块:" + text); } else { - { - SelectItem selectItem = new SelectItem(); - selectItem.setValue("true"); - selectItem.setLabel("是"); - field.getSelectItems().add(selectItem); - } - { - SelectItem selectItem = new SelectItem(); - selectItem.setValue("false"); - selectItem.setLabel("否"); - field.getSelectItems().add(selectItem); - } - + System.out.println("拖拽对象:" + text); } - Dialog.showSelectEdit(field); + Dragboard md = source.startDragAndDrop(TransferMode.ANY); + ClipboardContent content = new ClipboardContent(); + content.putString(source.getText()); + md.setContent(content); + event.consume(); } }); - } - builder.add("向上调整", new EventHandler() { - @Override - public void handle(ActionEvent event) { - int index = mFields.getSelectionModel().getSelectedIndex(); - List fields = currentTable.getFields(); - if (index > 0) { - fields.add(index - 1, fields.get(index)); - fields.add(index + 1, fields.get(index)); - fields.remove(index); - fields.remove(index + 1); - } - } - }); - builder.add("向下调整", new EventHandler() { - @Override - public void handle(ActionEvent event) { - int index = mFields.getSelectionModel().getSelectedIndex(); - List fields = currentTable.getFields(); - if (index < fields.size() - 1) { - fields.add(index, fields.get(index + 1)); - fields.add(index + 2, fields.get(index + 1)); - fields.remove(index + 1); - fields.remove(index + 2); - } - } - }); - ContextMenu con = builder.build(); - mFields.setContextMenu(con); - } - }); - - URL projectdetail = JavaFxApplication.class.getClassLoader().getResource("fxml/DetailProject.fxml"); - if (projectdetail == null) { - projectdetail = getClass().getResource("../../../fxml/DetailProject.fxml"); - } - mProjectLoader = new FXMLLoader(projectdetail); - mProjectLoader.load(); - detailProjectController = mProjectLoader.getController(); - - URL mddetail = JavaFxApplication.class.getClassLoader().getResource("fxml/DetailModule.fxml"); - if (mddetail == null) { - mddetail = getClass().getResource("../../../fxml/DetailModule.fxml"); - } - mModuleLoader = new FXMLLoader(mddetail); - mModuleLoader.load(); - detailModuleController = mModuleLoader.getController(); - - - URL tabledetail = JavaFxApplication.class.getClassLoader().getResource("fxml/DetailTable.fxml"); - if (tabledetail == null) { - tabledetail = getClass().getResource("../../../fxml/DetailTable.fxml"); - } - mTableLoader = new FXMLLoader(tabledetail); - mTableLoader.load(); - detailTableController = mTableLoader.getController(); - - mTree.setShowRoot(true); - mTree.setEditable(true); - mTree.setDisable(false); - mTree.setCellFactory(new Callback() { - @Override - public TreeCell call(TreeView param) { - TextFieldTreeCell textFieldTreeCell = new TextFieldTreeCell(new DefaultStringConverter()); - textFieldTreeCell.setEditable(false); - // creating cell from deafult factory - TreeCell treeCell = TextFieldTreeCell.forTreeView().call(param); - // setting handlers - textFieldTreeCell.setOnDragDetected(new EventHandler() { - @Override - public void handle(MouseEvent event) { - TextFieldTreeCell source = (TextFieldTreeCell) event.getSource(); - String text = source.getText(); - Module dbByDBName = projectManager.findDBByDBName(text); - dragMD = dbByDBName != null; - if (dragMD) { - System.out.println("拖拽模块:" + text); - } else { - System.out.println("拖拽对象:" + text); - } - Dragboard md = source.startDragAndDrop(TransferMode.ANY); - ClipboardContent content = new ClipboardContent(); - content.putString(source.getText()); - md.setContent(content); - event.consume(); - } - }); - textFieldTreeCell.setOnDragOver(new EventHandler() { - @Override - public void handle(DragEvent event) { - Dragboard md = event.getDragboard(); - TextFieldTreeCell source = (TextFieldTreeCell) event.getSource(); + textFieldTreeCell.setOnDragOver(new EventHandler() { + @Override + public void handle(DragEvent event) { + Dragboard md = event.getDragboard(); + TextFieldTreeCell source = (TextFieldTreeCell) event.getSource(); - Module dbByDBName = projectManager.findDBByDBName(source.getText()); + Module dbByDBName = projectManager.findDBByDBName(source.getText()); - if (dragMD && dbByDBName != null) { - double y = event.getY(); - double height = textFieldTreeCell.getHeight(); + if (dragMD && dbByDBName != null) { + double y = event.getY(); + double height = textFieldTreeCell.getHeight(); - if (source.getText().equals(md.getString())) { - event.acceptTransferModes(TransferMode.MOVE); - } else if (y >= height / 4 && y < height * 3 / 4) { - event.acceptTransferModes(TransferMode.MOVE); + if (source.getText().equals(md.getString())) { + event.acceptTransferModes(TransferMode.MOVE); + } else if (y >= height / 4 && y < height * 3 / 4) { + event.acceptTransferModes(TransferMode.MOVE); + } } - } - if (!dragMD && dbByDBName == null) { - double y = event.getY(); - double height = textFieldTreeCell.getHeight(); + if (!dragMD && dbByDBName == null) { + double y = event.getY(); + double height = textFieldTreeCell.getHeight(); - if (y >= height / 4 && y < height * 3 / 4) { - event.acceptTransferModes(TransferMode.MOVE); - } else { - event.acceptTransferModes(TransferMode.COPY); + if (y >= height / 4 && y < height * 3 / 4) { + event.acceptTransferModes(TransferMode.MOVE); + } else { + event.acceptTransferModes(TransferMode.COPY); + } } + event.consume(); } - event.consume(); - } - }); - textFieldTreeCell.setOnDragDropped(new EventHandler() { - @Override - public void handle(DragEvent event) { - Dragboard md = event.getDragboard(); - String m1 = md.getString(); - - TreeCell source = (TreeCell) event.getSource(); - String m2 = ((TreeCell) event.getGestureTarget()).getItem(); - - if (dragMD) { - List mds = projectManager.getMds(); + }); + textFieldTreeCell.setOnDragDropped(new EventHandler() { + @Override + public void handle(DragEvent event) { + Dragboard md = event.getDragboard(); + String m1 = md.getString(); - int i1 = 0, i2 = 0; - for (int i = 0; i < mds.size(); i++) { - if (mds.get(i).getName().equals(m1)) { - i1 = i; - } - if (mds.get(i).getName().equals(m2)) { - i2 = i; - } - } + TreeCell source = (TreeCell) event.getSource(); + String m2 = ((TreeCell) event.getGestureTarget()).getItem(); - if (event.getTransferMode().equals(TransferMode.COPY)) {//插入 + if (dragMD) { + List mds = projectManager.getMds(); - } else if (event.getTransferMode().equals(TransferMode.MOVE)) {//交换 - Tool.exchange(mds, i1, i2); - } - } else { - if (currentModule != null) { int i1 = 0, i2 = 0; - Table t1 = null, t2 = null; - for (int i = 0; i < currentModule.getTables().size(); i++) { - if (currentModule.getTables().get(i).getTableName().equals(m1)) { + for (int i = 0; i < mds.size(); i++) { + if (mds.get(i).getName().equals(m1)) { i1 = i; - t1 = currentModule.getTables().get(i); } - if (currentModule.getTables().get(i).getTableName().equals(m2)) { + if (mds.get(i).getName().equals(m2)) { i2 = i; - t2 = currentModule.getTables().get(i); } } - if (t1 == null || t2 == null) { - return; - } if (event.getTransferMode().equals(TransferMode.COPY)) {//插入 - double y = event.getY(); - double height = textFieldTreeCell.getHeight(); - if (y < height / 2) { - currentModule.getTables().add(i2, t1); - } else { - currentModule.getTables().add(i2 + 1, t1); + + } else if (event.getTransferMode().equals(TransferMode.MOVE)) {//交换 + Tool.exchange(mds, i1, i2); + } + } else { + if (currentModule != null) { + int i1 = 0, i2 = 0; + Table t1 = null, t2 = null; + for (int i = 0; i < currentModule.getTables().size(); i++) { + if (currentModule.getTables().get(i).getTableName().equals(m1)) { + i1 = i; + t1 = currentModule.getTables().get(i); + } + if (currentModule.getTables().get(i).getTableName().equals(m2)) { + i2 = i; + t2 = currentModule.getTables().get(i); + } } - if (i1 < i2) { - currentModule.getTables().remove(i1); - } else { - currentModule.getTables().remove(i1 + 1); + if (t1 == null || t2 == null) { + return; } - } else if (event.getTransferMode().equals(TransferMode.MOVE)) {//交换 - Tool.exchange(currentModule.getTables(), i1, i2); + if (event.getTransferMode().equals(TransferMode.COPY)) {//插入 + double y = event.getY(); + double height = textFieldTreeCell.getHeight(); + if (y < height / 2) { + currentModule.getTables().add(i2, t1); + } else { + currentModule.getTables().add(i2 + 1, t1); + } + if (i1 < i2) { + currentModule.getTables().remove(i1); + } else { + currentModule.getTables().remove(i1 + 1); + } + + } else if (event.getTransferMode().equals(TransferMode.MOVE)) {//交换 + Tool.exchange(currentModule.getTables(), i1, i2); + } } } + event.setDropCompleted(true); + event.consume(); + mTree.getSelectionModel().clearSelection(); + int focusedIndex = mTree.getFocusModel().getFocusedIndex(); + System.out.println(focusedIndex); } - event.setDropCompleted(true); - event.consume(); - mTree.getSelectionModel().clearSelection(); - int focusedIndex = mTree.getFocusModel().getFocusedIndex(); - System.out.println(focusedIndex); - } - }); - return textFieldTreeCell; - } - }); - - {//初始化模块面板 - detailModuleController.getModuleComment().textProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, String oldValue, String newValue) { - if (currentModule != null) { - currentModule.setNote(newValue); - } - } - }); - - detailModuleController.getModulePrefix().textProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, String oldValue, String newValue) { - if (currentModule != null) { - currentModule.setModulePrefix(newValue); - } - } - }); - - detailModuleController.getModuleName().textProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, String oldValue, String newValue) { - if (currentModule != null) { - currentModule.setName(newValue); - } - } - }); - - detailModuleController.getIsGenerate().selectedProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, Boolean oldValue, Boolean newValue) { - if (currentModule != null) { - currentModule.setNeedGenerate(newValue); - } + }); + return textFieldTreeCell; } }); } + //endregion + + //region 初始化项目面板 + { + URL projectdetail = JavaFxApplication.class.getClassLoader().getResource("fxml/DetailProject.fxml"); + if (projectdetail == null) { + projectdetail = getClass().getResource("../../../fxml/DetailProject.fxml"); + } + mProjectLoader = new FXMLLoader(projectdetail); + mProjectLoader.load(); + detailProjectController = mProjectLoader.getController(); - {// 初始化项目面板 detailProjectController.getName().textProperty().addListener(new ChangeListener() { @Override public void changed(ObservableValue observable, String oldValue, String newValue) { @@ -503,8 +341,65 @@ public class JavaFxApplication extends Application { } }); } + //endregion + + //region 初始化模块面板 + { + URL mddetail = JavaFxApplication.class.getClassLoader().getResource("fxml/DetailModule.fxml"); + if (mddetail == null) { + mddetail = getClass().getResource("../../../fxml/DetailModule.fxml"); + } + mModuleLoader = new FXMLLoader(mddetail); + mModuleLoader.load(); + detailModuleController = mModuleLoader.getController(); + detailModuleController.getModuleComment().textProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, String oldValue, String newValue) { + if (currentModule != null) { + currentModule.setNote(newValue); + } + } + }); + + detailModuleController.getModulePrefix().textProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, String oldValue, String newValue) { + if (currentModule != null) { + currentModule.setModulePrefix(newValue); + } + } + }); + + detailModuleController.getModuleName().textProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, String oldValue, String newValue) { + if (currentModule != null) { + currentModule.setName(newValue); + } + } + }); + + detailModuleController.getIsGenerate().selectedProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, Boolean oldValue, Boolean newValue) { + if (currentModule != null) { + currentModule.setNeedGenerate(newValue); + } + } + }); + } + //endregion + + //region 初始化表面板 + { + URL tabledetail = JavaFxApplication.class.getClassLoader().getResource("fxml/DetailTable.fxml"); + if (tabledetail == null) { + tabledetail = getClass().getResource("../../../fxml/DetailTable.fxml"); + } + mTableLoader = new FXMLLoader(tabledetail); + mTableLoader.load(); + detailTableController = mTableLoader.getController(); - {//初始化表面板 detailTableController.getTablename().textProperty().addListener(new ChangeListener() { @Override public void changed(ObservableValue observable, String oldValue, String newValue) { @@ -664,9 +559,126 @@ public class JavaFxApplication extends Application { } }); } - ManagerFactory.getReflashManager(this).start(); + //endregion + + //region 初始化字段面板 + { + + mFields = mainController.getFields(); + mFields.setEditable(true); + mFields.setSortPolicy(new Callback() { + @Override + public Boolean call(TableView param) { + //禁止点击列头排序 + return false; + } + }); + mFields.setOnMouseClicked(new EventHandler() { + @Override + public void handle(MouseEvent event) { + int selectedIndex = mFields.getSelectionModel().getSelectedIndex(); + if (currentTable == null || selectedIndex == -1) { + return; + } + Field field = currentTable.getFields().get(selectedIndex); + ContextMenuBuilder builder = new ContextMenuBuilder(); + builder.add("新增", new EventHandler() { + @Override + public void handle(ActionEvent event) { + addField(); + } + }); + builder.add("删除", new EventHandler() { + @Override + public void handle(ActionEvent event) { + subField(); + } + }); + if (field.getFieldType().equals(FieldType.Dict.name())) { + builder.add("编辑字典", new EventHandler() { + @Override + public void handle(ActionEvent event) { + MenuItem target = (MenuItem) event.getTarget(); + int index = mFields.getSelectionModel().getSelectedIndex(); + List fields = currentTable.getFields(); + Field field = fields.get(index); + Dialog.showSelectEdit(field); + } + }); + } else if (field.getFieldType().equals(FieldType.Select.name())) { + builder.add("编辑选项", new EventHandler() { + @Override + public void handle(ActionEvent event) { + int index = mFields.getSelectionModel().getSelectedIndex(); + List fields = currentTable.getFields(); + Field field = fields.get(index); + Dialog.showSelectEdit(field); + } + }); + } else if (field.getFieldType().equals(FieldType.Boolean.name())) { + builder.add("编辑是否", new EventHandler() { + @Override + public void handle(ActionEvent event) { + int index = mFields.getSelectionModel().getSelectedIndex(); + List fields = currentTable.getFields(); + Field field = fields.get(index); + if (field.getSelectItems().size() == 2) { + + } else { + { + SelectItem selectItem = new SelectItem(); + selectItem.setValue("true"); + selectItem.setLabel("是"); + field.getSelectItems().add(selectItem); + } + { + SelectItem selectItem = new SelectItem(); + selectItem.setValue("false"); + selectItem.setLabel("否"); + field.getSelectItems().add(selectItem); + } + + } + Dialog.showSelectEdit(field); + } + }); + } + builder.add("向上调整", new EventHandler() { + @Override + public void handle(ActionEvent event) { + int index = mFields.getSelectionModel().getSelectedIndex(); + List fields = currentTable.getFields(); + if (index > 0) { + fields.add(index - 1, fields.get(index)); + fields.add(index + 1, fields.get(index)); + fields.remove(index); + fields.remove(index + 1); + } + } + }); + builder.add("向下调整", new EventHandler() { + @Override + public void handle(ActionEvent event) { + int index = mFields.getSelectionModel().getSelectedIndex(); + List fields = currentTable.getFields(); + if (index < fields.size() - 1) { + fields.add(index, fields.get(index + 1)); + fields.add(index + 2, fields.get(index + 1)); + fields.remove(index + 1); + fields.remove(index + 2); + } + } + }); + ContextMenu con = builder.build(); + mFields.setContextMenu(con); + } + }); + + } + //endregion - initProjectTree(); + // 尝试加载一个项目树，project文件夹有则默认加载第一个，否则创建一个新项目树 + initProjectTree(projectManager.invalidate()); super.init(); } @@ -692,8 +704,8 @@ public class JavaFxApplication extends Application { } } - public void initProjectTree() { - currentProject = projectManager.getProject(); + public void initProjectTree(Project project) { + currentProject = project; TreeItem projectTreeItem = new TreeItem(currentProject); mTree.setRoot(projectTreeItem); projectTreeItem.setExpanded(true); @@ -1417,7 +1429,7 @@ public class JavaFxApplication extends Application { int param1 = checkBoxTableCell.getParam(); Field field = currentTable.getFields().get(param1); field.setIsQuery(newValue); - if (!newValue){ + if (!newValue) { field.setIsUnique(false); } } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java index a15db154..8339dae5 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java @@ -19,7 +19,7 @@ import xyz.wbsite.dbtool.javafx.tool.Dialog; import java.io.File; public class MainController { - private ProjectManager dBmanger = ManagerFactory.getProjectManager(); + private ProjectManager projectManager = ManagerFactory.getProjectManager(); @FXML private TreeView dbtree; @@ -40,12 +40,12 @@ public class MainController { private JavaFxApplication main; - public ProjectManager getdBmanger() { - return dBmanger; + public ProjectManager getProjectManager() { + return projectManager; } - public void setdBmanger(ProjectManager dBmanger) { - this.dBmanger = dBmanger; + public void setProjectManager(ProjectManager projectManager) { + this.projectManager = projectManager; } public JavaFxApplication getMain() { @@ -116,7 +116,7 @@ public class MainController { public void modelOpen(ActionEvent actionEvent) { FileChooser fileChooser = new FileChooser(); fileChooser.setTitle("选择模型文件"); - fileChooser.setInitialDirectory(dBmanger.getPath()); + fileChooser.setInitialDirectory(projectManager.getPath()); fileChooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("模型文件", "*.xml", "*.XML")); @@ -124,23 +124,22 @@ public class MainController { File file = fileChooser.showOpenDialog(stage); if (file != null && file.exists()) { - dBmanger.invalidate(file);//初始化模型树 - 到内容 - main.initProjectTree();//加载模型树 - 到组件 - main.loadProject(); + main.initProjectTree(projectManager.invalidate(file));//加载模型树 + main.loadProject();//显示项目面板 } } @FXML public void modelSave(ActionEvent actionEvent) { - if (dBmanger.getPath() == null || "".equals(dBmanger.getPath())) { + if (projectManager.getPath() == null || "".equals(projectManager.getPath())) { Dialog.showDirectoryChooser(null, new Dialog.DirectoryCall() { @Override public void call(File result) { - dBmanger.setPath(result.getAbsoluteFile()); + projectManager.setPath(result.getAbsoluteFile()); } }); } - dBmanger.save(); + projectManager.save(); } @FXML @@ -148,15 +147,14 @@ public class MainController { Dialog.showDirectoryChooser(null, new Dialog.DirectoryCall() { @Override public void call(File result) { - dBmanger.save(result); + projectManager.save(result); } }); } @FXML public void modelCreate(ActionEvent actionEvent) { - dBmanger.modelCreate(); - main.initProjectTree(); + main.initProjectTree(projectManager.invalidate()); main.loadProject(); } @@ -165,10 +163,9 @@ public class MainController { Dialog.showYesNo("", "确认删除当前模型?", new Dialog.ConfirmCall() { @Override public void call(boolean result) { - if (result){ - dBmanger.delete(); - dBmanger.invalidate(); - main.initProjectTree(); + if (result) { + projectManager.delete(); + main.initProjectTree(projectManager.invalidate()); main.loadProject(); } } @@ -183,12 +180,12 @@ public class MainController { @FXML public void modelGenerate(ActionEvent actionEvent) { this.modelSave(null); - if (dBmanger.doCheck()) { - Dialog.showDirectoryChooser(dBmanger.getPath(), new Dialog.DirectoryCall() { + if (projectManager.doCheck()) { + Dialog.showDirectoryChooser(projectManager.getPath(), new Dialog.DirectoryCall() { @Override public void call(File result) { System.out.println("生成目录:" + result.getAbsolutePath()); - dBmanger.generate(ManagerFactory.getProjectManager().getProject(), result); + projectManager.generate(ManagerFactory.getProjectManager().getProject(), result); } }); } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ManagerFactory.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ManagerFactory.java index 245f892e..af0a35e7 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ManagerFactory.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ManagerFactory.java @@ -1,11 +1,8 @@ package xyz.wbsite.dbtool.javafx.manger; -import xyz.wbsite.dbtool.javafx.JavaFxApplication; - public class ManagerFactory { private static XmlManager xmlManager = null; private static JsonManager jsonManager = null; - private static ReflashManager reflashManager = null; private static ProjectManager projectManager = null; private static FreeMarkerManager freeMarkerManager; @@ -31,11 +28,4 @@ public class ManagerFactory { public static JsonManager getJsonManager() { return jsonManager; } - - public static ReflashManager getReflashManager(JavaFxApplication main) { - if (reflashManager == null) { - reflashManager = new ReflashManager(main); - } - return reflashManager; - } } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java index 01bc9075..4764a5ca 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java @@ -60,7 +60,6 @@ public class ProjectManager { if (!path.exists()) { path.mkdirs(); } - invalidate(); } public static File getPath() { @@ -71,10 +70,6 @@ public class ProjectManager { ProjectManager.path = path; } - public void modelCreate() { - project = new Project(); - } - public Module findDBByDBName(String name) { for (Module md : project.getModules()) { if (md.getName().equals(name)) { @@ -466,7 +461,7 @@ public class ProjectManager { /** * 初始化模型树，当存在多个时，默认第一个 */ - public void invalidate() { + public Project invalidate() { File[] files = path.listFiles(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".xml") || name.endsWith(".XML"); @@ -478,17 +473,18 @@ public class ProjectManager { } else { project = xmlService.inflate(files[0]); } + return project; } /** * 初始化模型树，当存在多个时，默认第一个 */ - public void invalidate(File xmlFile) { + public Project invalidate(File xmlFile) { project = xmlService.inflate(xmlFile); + return project; } public static boolean testConnect(Map properties) { - String url = properties.get("url"); String username = properties.get("username"); String password = properties.get("password"); diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ReflashManager.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ReflashManager.java deleted file mode 100644 index 5a6ba111..00000000 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ReflashManager.java +++ /dev/null @@ -1,26 +0,0 @@ -package xyz.wbsite.dbtool.javafx.manger; - -import xyz.wbsite.dbtool.javafx.JavaFxApplication; - -public class ReflashManager extends Thread { - private JavaFxApplication main; - - public ReflashManager(JavaFxApplication main) { - this.main = main; - } - - @Override - public void run() { - while (true) { - try { - Thread.sleep(200); - } catch (InterruptedException e) { - e.printStackTrace(); - } - if (ProjectManager.isUpdate) { - main.initProjectTree(); - ProjectManager.isUpdate = false; - } - } - } -} diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java index d2ff3f01..f23b52b6 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java @@ -108,6 +108,8 @@ public class XmlManager { } } table.setdBhandle(module); + ProjectManager projectManager = ManagerFactory.getProjectManager(); + projectManager.checkSysFields(table); module.putTable(table); } } diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java index 79844df1..7719a28f 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java @@ -16,10 +16,12 @@ import ${domain}.module.wsys.mgr.RoleManager; import ${domain}.module.wsys.req.RoleCreateRequest; import ${domain}.module.wsys.req.RoleDeleteRequest; import ${domain}.module.wsys.req.RoleFindRequest; +import ${domain}.module.wsys.req.RoleLoadRequest; import ${domain}.module.wsys.req.RoleUpdateRequest; import ${domain}.module.wsys.rsp.RoleCreateResponse; import ${domain}.module.wsys.rsp.RoleDeleteResponse; import ${domain}.module.wsys.rsp.RoleFindResponse; +import ${domain}.module.wsys.rsp.RoleLoadResponse; import ${domain}.module.wsys.rsp.RoleUpdateResponse; import java.io.IOException; @@ -46,6 +48,10 @@ public class RoleAjax { return roleManager.find(request, LocalData.getToken()); } + public RoleLoadResponse load(RoleLoadRequest request) { + return roleManager.load(request, LocalData.getToken()); + } + public Object template() { return ResponseUtil.apply(new WExcel<>(Role.class)); } diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java index 41ecb5d0..142cebed 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java @@ -16,6 +16,7 @@ import ${domain}.module.wsys.mgr.TokensManager; import ${domain}.module.wsys.mgr.UserManager; import ${domain}.module.wsys.req.TokensLogoutRequest; import ${domain}.module.wsys.req.UserChangePwdRequest; +import ${domain}.module.wsys.req.UserResetPwdRequest; import ${domain}.module.wsys.req.UserCreateRequest; import ${domain}.module.wsys.req.UserDeleteRequest; import ${domain}.module.wsys.req.UserFindRequest; @@ -24,6 +25,7 @@ import ${domain}.module.wsys.req.UserLogoutRequest; import ${domain}.module.wsys.req.UserUpdateRequest; import ${domain}.module.wsys.rsp.TokensLogoutResponse; import ${domain}.module.wsys.rsp.UserChangePwdResponse; +import ${domain}.module.wsys.rsp.UserResetPwdResponse; import ${domain}.module.wsys.rsp.UserCreateResponse; import ${domain}.module.wsys.rsp.UserDeleteResponse; import ${domain}.module.wsys.rsp.UserFindResponse; @@ -67,6 +69,10 @@ public class UserAjax { return userManager.changePwd(request, LocalData.getToken()); } + public UserResetPwdResponse resetPwd(UserResetPwdRequest request) { + return userManager.resetPwd(request, LocalData.getToken()); + } + public UserFindResponse find(UserFindRequest request) { return userManager.find(request, LocalData.getToken()); } diff --git a/src/main/resources/modules/SpringBoot/java/config/FreeMarkerConfig.java b/src/main/resources/modules/SpringBoot/java/config/FreeMarkerConfig.java index 9d9af398..2cd6805e 100644 --- a/src/main/resources/modules/SpringBoot/java/config/FreeMarkerConfig.java +++ b/src/main/resources/modules/SpringBoot/java/config/FreeMarkerConfig.java @@ -26,8 +26,8 @@ import java.io.File; import java.util.List; import java.util.Locale; -import static com.example.config.ActionConfig.CONTROL_PREFIX; -import static com.example.config.ActionConfig.SCREEN_PREFIX; +import static ${domain}.config.ActionConfig.CONTROL_PREFIX; +import static ${domain}.config.ActionConfig.SCREEN_PREFIX; @Configuration public class FreeMarkerConfig { diff --git a/src/main/resources/modules/SpringBoot/java/config/SQLiteConfig.java b/src/main/resources/modules/SpringBoot/java/config/SQLiteConfig.java index 806a4b20..42c9d4fb 100644 --- a/src/main/resources/modules/SpringBoot/java/config/SQLiteConfig.java +++ b/src/main/resources/modules/SpringBoot/java/config/SQLiteConfig.java @@ -28,7 +28,7 @@ public class SQLiteConfig { File path = file.getAbsoluteFile().getParentFile(); if (!path.exists()) path.mkdirs(); if (!file.exists()) file.createNewFile(); - ResourceUtil.copyToFile("example-web.db3", file); + ResourceUtil.copyToFile("${projectName}.db3", file); } } } catch (IOException e) { diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java index 2770e7d5..be6369b9 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java @@ -13,6 +13,7 @@ import ${domain}.frame.utils.IDgenerator; import ${domain}.frame.utils.MapperUtil; import ${domain}.frame.utils.Message; import ${domain}.frame.utils.ValidationUtil; +import ${domain}.module.wsys.ent.Profiles; import ${domain}.module.wsys.mpr.ProfilesMapper; import ${domain}.module.wsys.req.ProfilesCreateRequest; import ${domain}.module.wsys.req.ProfilesDeleteRequest; @@ -179,7 +180,17 @@ public class ProfilesManagerImpl implements ${domain}.module.wsys.mgr.ProfilesMa profilesFindRequest.setActive(LocalData.getActive()); profilesFindRequest.setKey(key); ProfilesFindResponse profilesFindResponse = this.find(profilesFindRequest, LocalData.getSysToken()); - if (profilesFindResponse.hasError() || profilesFindResponse.getResult().size() == 0) { + if (profilesFindResponse.hasError()) { + return defaultValue; + } + + if (profilesFindResponse.getResult().size() == 0) { + // 主动保存未设置的键值 + Profiles entity = new Profiles(); + entity.setActive(LocalData.getActive()); + entity.setKey(key); + entity.setValue(defaultValue); + profilesMapper.insert(entity, LocalData.getSysToken()); return defaultValue; } diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/RoleManager.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/RoleManager.java index 6b5aa791..53a8986d 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/RoleManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/RoleManager.java @@ -4,10 +4,12 @@ import ${domain}.frame.auth.Token; import ${domain}.module.wsys.req.RoleCreateRequest; import ${domain}.module.wsys.req.RoleDeleteRequest; import ${domain}.module.wsys.req.RoleFindRequest; +import ${domain}.module.wsys.req.RoleLoadRequest; import ${domain}.module.wsys.req.RoleUpdateRequest; import ${domain}.module.wsys.rsp.RoleCreateResponse; import ${domain}.module.wsys.rsp.RoleDeleteResponse; import ${domain}.module.wsys.rsp.RoleFindResponse; +import ${domain}.module.wsys.rsp.RoleLoadResponse; import ${domain}.module.wsys.rsp.RoleUpdateResponse; /** @@ -54,4 +56,13 @@ public interface RoleManager { * @return */ RoleFindResponse find(RoleFindRequest request, Token token); + + /** + * 加载 + * + * @param request 请求对象 + * @param token 令牌 + * @return + */ + RoleLoadResponse load(RoleLoadRequest request, Token token); } diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/RoleManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/RoleManagerImpl.java index 77e887ed..bdb0def7 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/RoleManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/RoleManagerImpl.java @@ -17,12 +17,16 @@ import ${domain}.module.wsys.mpr.RoleMapper; import ${domain}.module.wsys.req.RoleCreateRequest; import ${domain}.module.wsys.req.RoleDeleteRequest; import ${domain}.module.wsys.req.RoleFindRequest; +import ${domain}.module.wsys.req.RoleLoadRequest; import ${domain}.module.wsys.req.RoleUpdateRequest; import ${domain}.module.wsys.rsp.RoleCreateResponse; import ${domain}.module.wsys.rsp.RoleDeleteResponse; import ${domain}.module.wsys.rsp.RoleFindResponse; +import ${domain}.module.wsys.rsp.RoleLoadResponse; import ${domain}.module.wsys.rsp.RoleUpdateResponse; +import java.util.List; + /** * ROLE - 角色 * @@ -165,4 +169,28 @@ public class RoleManagerImpl implements RoleManager { return response; } + + /** + * 加载 + * + * @param request 请求对象 + * @param token 令牌 + * @return 响应 + */ + @Transactional(readOnly = true) + public RoleLoadResponse load(RoleLoadRequest request, Token token) { + RoleLoadResponse response = new RoleLoadResponse(); + + ValidationUtil.validate(request, response); + if (response.hasError()) { + return response; + } + + List result = roleMapper.select(new Role(), token); + + response.setResult(result); + response.setTotalCount((long) result.size()); + + return response; + } } diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/UserManager.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/UserManager.java index 849d21e9..bcc5efc7 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/UserManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/UserManager.java @@ -2,12 +2,14 @@ package ${domain}.module.wsys.mgr; import ${domain}.frame.auth.Token; import ${domain}.module.wsys.req.UserChangePwdRequest; +import ${domain}.module.wsys.req.UserResetPwdRequest; import ${domain}.module.wsys.req.UserCreateRequest; import ${domain}.module.wsys.req.UserDeleteRequest; import ${domain}.module.wsys.req.UserFindRequest; import ${domain}.module.wsys.req.UserLoginRequest; import ${domain}.module.wsys.req.UserUpdateRequest; import ${domain}.module.wsys.rsp.UserChangePwdResponse; +import ${domain}.module.wsys.rsp.UserResetPwdResponse; import ${domain}.module.wsys.rsp.UserCreateResponse; import ${domain}.module.wsys.rsp.UserDeleteResponse; import ${domain}.module.wsys.rsp.UserFindResponse; @@ -59,6 +61,15 @@ public interface UserManager { */ UserChangePwdResponse changePwd(UserChangePwdRequest request, Token token); + /** + * 重置密码 + * + * @param request 请求对象 + * @param token 令牌 + * @return 响应 + */ + UserResetPwdResponse resetPwd(UserResetPwdRequest request, Token token); + /** * 查询 * diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/UserManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/UserManagerImpl.java index a40af176..a277435a 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/UserManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/UserManagerImpl.java @@ -17,6 +17,7 @@ import ${domain}.module.wsys.req.DeptFindRequest; import ${domain}.module.wsys.req.RoleFindRequest; import ${domain}.module.wsys.req.TokensCreateRequest; import ${domain}.module.wsys.req.UserChangePwdRequest; +import ${domain}.module.wsys.req.UserResetPwdRequest; import ${domain}.module.wsys.req.UserCreateRequest; import ${domain}.module.wsys.req.UserDeleteRequest; import ${domain}.module.wsys.req.UserFindRequest; @@ -27,6 +28,7 @@ import ${domain}.module.wsys.rsp.DeptFindResponse; import ${domain}.module.wsys.rsp.RoleFindResponse; import ${domain}.module.wsys.rsp.TokensCreateResponse; import ${domain}.module.wsys.rsp.UserChangePwdResponse; +import ${domain}.module.wsys.rsp.UserResetPwdResponse; import ${domain}.module.wsys.rsp.UserCreateResponse; import ${domain}.module.wsys.rsp.UserDeleteResponse; import ${domain}.module.wsys.rsp.UserFindResponse; @@ -71,6 +73,8 @@ public class UserManagerImpl implements UserManager { private RoleManager roleManager; @Autowired private UserRoleManager userRoleManager; + @Autowired + private ProfilesManager profilesManager; /** * 插入 @@ -253,6 +257,42 @@ public class UserManagerImpl implements UserManager { return response; } + /** + * 重置密码 + * + * @param request 请求对象 + * @param token 令牌 + * @return 响应 + */ + public UserResetPwdResponse resetPwd(UserResetPwdRequest request, Token token) { + UserResetPwdResponse response = new UserResetPwdResponse(); + + ValidationUtil.validate(request, response); + if (response.hasError()) { + return response; + } + + User entity = userMapper.getById(request.getId(), token); + if (entity == null) { + response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE); + return response; + } + + // 获取默认密码 + String userDefaultPassword = profilesManager.getString("user.default.password", "123456"); + entity.setUserPwd(MD5Util.generatePwd(userDefaultPassword)); + entity.setRowVersion(request.getRowVersion()); + + long result = userMapper.changePwd(entity, token); + if (1L != result) { + response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE); + return response; + } + response.setResult(result); + + return response; + } + /** * 查询 * diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DeptMapper.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DeptMapper.java index 98d2d95d..6b11e8b1 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DeptMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DeptMapper.java @@ -63,7 +63,16 @@ public interface DeptMapper { long update(@Param("request") Dept request, @Param("token") Token token); /** - * 查询 + * 普通查询 + * + * @param request 请求对象 + * @param token 令牌 + * @return 返回对象 + */ + List select(@Param("request") Dept request, @Param("token") Token token); + + /** + * 高级查询 * * @param request 请求对象 * @param token 令牌 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DictItemMapper.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DictItemMapper.java index d89048a6..d57ec5f6 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DictItemMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DictItemMapper.java @@ -63,7 +63,16 @@ public interface DictItemMapper { long update(@Param("request") DictItem request, @Param("token") Token token); /** - * 查询 + * 普通查询 + * + * @param request 请求对象 + * @param token 令牌 + * @return 返回对象 + */ + List select(@Param("request") DictItem request, @Param("token") Token token); + + /** + * 高级查询 * * @param request 请求对象 * @param token 令牌 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DictMapper.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DictMapper.java index 690a1fba..6aa69ffe 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DictMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DictMapper.java @@ -63,7 +63,16 @@ public interface DictMapper { long update(@Param("request") Dict request, @Param("token") Token token); /** - * 查询 + * 普通查询 + * + * @param request 请求对象 + * @param token 令牌 + * @return 返回对象 + */ + List select(@Param("request") Dict request, @Param("token") Token token); + + /** + * 高级查询 * * @param request 请求对象 * @param token 令牌 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/FileMapper.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/FileMapper.java index 90d38bc7..632c5e84 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/FileMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/FileMapper.java @@ -63,7 +63,16 @@ public interface FileMapper { long update(@Param("request") File request, @Param("token") Token token); /** - * 查询 + * 普通查询 + * + * @param request 请求对象 + * @param token 令牌 + * @return 返回对象 + */ + List select(@Param("request") File request, @Param("token") Token token); + + /** + * 高级查询 * * @param request 请求对象 * @param token 令牌 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/LogerrMapper.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/LogerrMapper.java index a52f1681..88d6862b 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/LogerrMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/LogerrMapper.java @@ -63,7 +63,16 @@ public interface LogerrMapper { long update(@Param("request") Logerr request, @Param("token") Token token); /** - * 查询 + * 普通查询 + * + * @param request 请求对象 + * @param token 令牌 + * @return 返回对象 + */ + List select(@Param("request") Logerr request, @Param("token") Token token); + + /** + * 高级查询 * * @param request 请求对象 * @param token 令牌 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DeptMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DeptMapper.xml index 0070aef0..f547b712 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DeptMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DeptMapper.xml @@ -112,6 +112,33 @@ AND `ROW_VERSION` = ${r"#"}{request.rowVersion} + + + SELECT + + FROM + + WHERE `IS_DELETED` = 0 + + AND `DICT_NAME` = ${r"#"}{request.dictName} + + + AND `KEY` = ${r"#"}{request.key} + + + AND `VALUE` = ${r"#"}{request.value} + + + AND `SORT` = ${r"#"}{request.sort} + + + AND `VALID` = ${r"#"}{request.valid} + + + + SELECT + + FROM + + WHERE `IS_DELETED` = 0 + + AND `DICT_NAME` = ${r"#"}{request.dictName} + + + AND `DICT_COMMENT` = ${r"#"}{request.dictComment} + + + AND `VALID` = ${r"#"}{request.valid} + + + + SELECT + + FROM + + WHERE `IS_DELETED` = 0 + + AND `NAME` = ${r"#"}{request.name} + + + AND `FILE_TYPE` = ${r"#"}{request.fileType} + + + AND `ATTRIBUTE1` = ${r"#"}{request.attribute1} + + + AND `ATTRIBUTE2` = ${r"#"}{request.attribute2} + + + + + + SELECT + + FROM + + WHERE `IS_DELETED` = 0 + + AND `RES_CODE` = ${r'#'}{request.resCode} + + + AND `RES_NAME` = ${r'#'}{request.resName} + + + AND `RES_TYPE` = ${r'#'}{request.resType} + + + AND `RES_VALUE` = ${r'#'}{request.resValue} + + + AND `SUP_CODE` = ${r'#'}{request.supCode} + + + AND `SUP_NAME` = ${r'#'}{request.supName} + + + AND `FREE` = ${r'#'}{request.free} + + + AND `VALID` = ${r'#'}{request.valid} + + + + SELECT + + FROM + + WHERE `IS_DELETED` = 0 + + AND `CODE` = ${r"#"}{request.code} + + + AND `NAME` = ${r"#"}{request.name} + + + AND `COMMENT` = ${r"#"}{request.comment} + + + + SELECT + + FROM + + WHERE `IS_DELETED` = 0 + + AND `ROLE_ID` = ${r'#'}{request.roleId} + + + AND `ROLE_CODE` = ${r'#'}{request.roleCode} + + + AND `RES_ID` = ${r'#'}{request.resId} + + + AND `RES_CODE` = ${r'#'}{request.resCode} + + + + + + SELECT + + FROM + + WHERE + `IS_DELETED` = 0 + + AND `TASK_NAME` = ${r"#"}{request.taskName} + + + AND `TASK_NOTE` = ${r"#"}{request.taskNote} + + + AND `TASK_TYPE` = ${r"#"}{request.taskType} + + + AND `VALID` = ${r"#"}{request.valid} + + + + SELECT + + FROM + + WHERE `IS_DELETED` = 0 + + AND `TOKEN` = ${r"#"}{request.token} + + + AND `USER_ID` = ${r"#"}{request.userId} + + + AND `USER_NAME` = ${r"#"}{request.userName} + + + AND DATE_FORMAT(`LOGIN_TIME`,"%Y-%m-%d %T") = DATE_FORMAT(${r"#"}{request.loginTime},"%Y-%m-%d %T") + + + AND DATE_FORMAT(`VALID_TIME`,"%Y-%m-%d %T") = DATE_FORMAT(${r"#"}{request.validTime},"%Y-%m-%d %T") + + + AND `VALID` = ${r"#"}{request.valid} + + + AND `DEPT_ID` = ${r"#"}{request.deptId} + + + AND `DEPT_CODE` = ${r"#"}{request.deptCode} + + + AND `DEPT_NAME` = ${r"#"}{request.deptName} + + + AND `TERMINAL` = ${r"#"}{request.terminal} + + + AND `TERMINAL_IP` = ${r"#"}{request.terminalIp} + + + AND `TERMINAL_INFO` = ${r"#"}{request.terminalInfo} + + + + SELECT + + FROM + + WHERE `IS_DELETED` = 0 + + AND `USER_NAME` = ${r"#"}{request.userName} + + + AND `USER_CODE` = ${r"#"}{request.userCode} + + + AND `USER_ALIAS` = ${r"#"}{request.userAlias} + + + AND `USER_STATUS` = ${r"#"}{request.userStatus} + + + AND `DEPT_ID` = ${r"#"}{request.deptId} + + + AND `DEPT_CODE` = ${r"#"}{request.deptCode} + + + AND `DEPT_NAME` = ${r"#"}{request.deptName} + + + + SELECT + + FROM + + WHERE `IS_DELETED` = 0 + + AND `USER_ID` = ${r'#'}{request.userId} + + + AND `USER_CODE` = ${r'#'}{request.userCode} + + + AND `ROLE_ID` = ${r'#'}{request.roleId} + + + AND `ROLE_CODE` = ${r'#'}{request.roleCode} + + + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "DEPT_CODE" = ${r'#'}{request.deptCode} + + + AND "DEPT_NAME" = ${r'#'}{request.deptName} + + + AND "DEPT_ALIAS" = ${r'#'}{request.deptAlias} + + + AND "SUP_CODE" = ${r'#'}{request.supCode} + + + AND "SUP_NAME" = ${r'#'}{request.supName} + + + AND "VALID" = ${r'#'}{request.valid} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "DICT_NAME" = ${r'#'}{request.dictName} + + + AND "KEY" = ${r'#'}{request.key} + + + AND "VALUE" = ${r'#'}{request.value} + + + AND "VALID" = ${r'#'}{request.valid} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "DICT_NAME" = ${r'#'}{request.dictName} + + + AND "DICT_COMMENT" = ${r'#'}{request.dictComment} + + + AND "VALID" = ${r'#'}{request.valid} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "NAME" = ${r'#'}{request.name} + + + AND "FILE_TYPE" = ${r'#'}{request.fileType} + + + AND "ATTRIBUTE1" = ${r'#'}{request.attribute1} + + + AND "ATTRIBUTE2" = ${r'#'}{request.attribute2} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "RES_CODE" = ${r'#'}{request.resCode} + + + AND "RES_NAME" = ${r'#'}{request.resName} + + + AND "RES_TYPE" = ${r'#'}{request.resType} + + + AND "RES_VALUE" = ${r'#'}{request.resValue} + + + AND "SUP_CODE" = ${r'#'}{request.supCode} + + + AND "SUP_NAME" = ${r'#'}{request.supName} + + + AND "FREE" = ${r'#'}{request.free} + + + AND "VALID" = ${r'#'}{request.valid} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "CODE" = ${r'#'}{request.code} + + + AND "NAME" = ${r'#'}{request.name} + + + AND "COMMENT" = ${r'#'}{request.comment} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "ROLE_ID" = ${r'#'}{request.roleId} + + + AND "ROLE_CODE" = ${r'#'}{request.roleCode} + + + AND "RES_ID" = ${r'#'}{request.resId} + + + AND "RES_CODE" = ${r'#'}{request.resCode} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "TASK_NAME" = ${r'#'}{request.taskName} + + + AND "TASK_NOTE" = ${r'#'}{request.taskNote} + + + AND "TASK_TYPE" = ${r'#'}{request.taskType} + + + AND "VALID" = ${r'#'}{request.valid} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "TOKEN" = ${r'#'}{request.token} + + + AND "USER_ID" = ${r'#'}{request.userId} + + + AND "USER_NAME" = ${r'#'}{request.userName} + + + AND to_char("LOGIN_TIME",'yyyy-MM-dd HH24:mi:ss') = to_char(${r'#'}{request.loginTime},'yyyy-MM-dd HH24:mi:ss') + + + AND to_char("VALID_TIME",'yyyy-MM-dd HH24:mi:ss') = to_char(${r'#'}{request.validTime},'yyyy-MM-dd HH24:mi:ss') + + + AND "VALID" = ${r'#'}{request.valid} + + + AND "DEPT_ID" = ${r'#'}{request.deptId} + + + AND "DEPT_CODE" = ${r'#'}{request.deptCode} + + + AND "DEPT_NAME" = ${r'#'}{request.deptName} + + + AND "TERMINAL" = ${r'#'}{request.terminal} + + + AND "TERMINAL_IP" = ${r'#'}{request.terminalIp} + + + AND "TERMINAL_INFO" = ${r'#'}{request.terminalInfo} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "USER_NAME" = ${r'#'}{request.userName} + + + AND "USER_CODE" = ${r'#'}{request.userCode} + + + AND "USER_ALIAS" = ${r'#'}{request.userAlias} + + + AND t1."USER_STATUS" = ${r'#'}{request.userStatus} + + + AND "DEPT_ID" = ${r'#'}{request.deptId} + + + AND "DEPT_CODE" = ${r'#'}{request.deptCode} + + + AND "DEPT_NAME" = ${r'#'}{request.deptName} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "USER_ID" = ${r'#'}{request.userId} + + + AND "USER_CODE" = ${r'#'}{request.userCode} + + + AND "ROLE_ID" = ${r'#'}{request.roleId} + + + AND "ROLE_CODE" = ${r'#'}{request.roleCode} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "DEPT_CODE" = ${r'#'}{request.deptCode} + + + AND "DEPT_NAME" = ${r'#'}{request.deptName} + + + AND "DEPT_ALIAS" = ${r'#'}{request.deptAlias} + + + AND "SUP_CODE" = ${r'#'}{request.supCode} + + + AND "SUP_NAME" = ${r'#'}{request.supName} + + + AND "VALID" = ${r'#'}{request.valid} + + + + SELECT + + FROM + + WHERE "IS_DELETED" = 0 + + AND DICT_NAME = ${r"#"}{request.dictName} + + + AND KEY = ${r"#"}{request.key} + + + AND VALUE = ${r"#"}{request.value} + + + AND VALID = ${r"#"}{request.valid} + + + + SELECT + + FROM + + WHERE "IS_DELETED" = 0 + + AND DICT_NAME = ${r"#"}{request.dictName} + + + AND DICT_COMMENT = ${r"#"}{request.dictComment} + + + AND VALID = ${r"#"}{request.valid} + + + + SELECT + + FROM + + WHERE "IS_DELETED" = 0 + + AND NAME = ${r"#"}{request.name} + + + AND FILE_TYPE = ${r"#"}{request.fileType} + + + AND ATTRIBUTE1 = ${r"#"}{request.attribute1} + + + AND ATTRIBUTE2 = ${r"#"}{request.attribute2} + + + + SELECT + + FROM + + WHERE "IS_DELETED" = 0 + + AND "LOG_TYPE" = ${r'#'}{request.logType} + + + AND "LOG_TITLE" = ${r'#'}{request.logTitle} + + + AND "LOG_STATE" = ${r'#'}{request.logState} + + + + SELECT + + FROM + + WHERE "IS_DELETED" = 0 + + AND "ACTIVE" = ${r'#'}{request.active} + + + AND "KEY" = ${r'#'}{request.key} + + + + SELECT + + FROM + + WHERE "IS_DELETED" = 0 + + AND RES_CODE = ${r"#"}{request.resCode} + + + AND RES_NAME = ${r"#"}{request.resName} + + + AND RES_TYPE = ${r"#"}{request.resType} + + + AND RES_VALUE = ${r"#"}{request.resValue} + + + AND SUP_CODE = ${r"#"}{request.supCode} + + + AND SUP_NAME = ${r"#"}{request.supName} + + + AND FREE = ${r"#"}{request.free} + + + AND VALID = ${r"#"}{request.valid} + + + + SELECT + + FROM + + WHERE "IS_DELETED" = 0 + + AND CODE = ${r"#"}{request.code} + + + AND NAME = ${r"#"}{request.name} + + + AND COMMENT = ${r"#"}{request.comment} + + + + SELECT + + FROM + + WHERE "IS_DELETED" = 0 + + AND ROLE_ID = ${r"#"}{request.roleId} + + + AND ROLE_CODE = ${r"#"}{request.roleCode} + + + AND RES_ID = ${r"#"}{request.resId} + + + AND RES_CODE = ${r"#"}{request.resCode} + + + + SELECT + + FROM + + WHERE "IS_DELETED" = 0 + + AND "SEQ_NAME" = ${r'#'}{request.seqName} + + + AND "YEAR" = ${r'#'}{request.year} + + + AND "MONTH" = ${r'#'}{request.month} + + + AND "DATE" = ${r'#'}{request.date} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND "TASK_NAME" = ${r"#"}{request.taskName} + + + AND "TASK_NOTE" = ${r"#"}{request.taskNote} + + + AND "TASK_TYPE" = ${r"#"}{request.taskType} + + + AND "VALID" = ${r"#"}{request.valid} + + + + SELECT + + FROM + + WHERE "IS_DELETED" = 0 + + AND TOKEN = ${r"#"}{request.token} + + + AND USER_ID = ${r"#"}{request.userId} + + + AND USER_NAME = ${r"#"}{request.userName} + + + AND LOGIN_TIME = ${r"#"}{request.loginTime} + + + AND VALID_TIME = ${r"#"}{request.validTime} + + + AND VALID = ${r"#"}{request.valid} + + + AND DEPT_ID = ${r"#"}{request.deptId} + + + AND DEPT_CODE = ${r"#"}{request.deptCode} + + + AND DEPT_NAME = ${r"#"}{request.deptName} + + + AND TERMINAL = ${r"#"}{request.terminal} + + + AND TERMINAL_IP = ${r"#"}{request.terminalIp} + + + AND TERMINAL_INFO = ${r"#"}{request.terminalInfo} + + + + SELECT + + FROM + + WHERE "IS_DELETED" = 0 + + AND "USER_NAME" = ${r'#'}{request.userName} + + + AND "USER_CODE" = ${r'#'}{request.userCode} + + + AND "USER_ALIAS" = ${r'#'}{request.userAlias} + + + AND "USER_STATUS" = ${r'#'}{request.userStatus} + + + AND "DEPT_ID" = ${r'#'}{request.deptId} + + + AND "DEPT_CODE" = ${r'#'}{request.deptCode} + + + AND "DEPT_NAME" = ${r'#'}{request.deptName} + + + + SELECT + + FROM + + WHERE "IS_DELETED" = 0 + + AND USER_ID = ${r"#"}{request.userId} + + + AND USER_CODE = ${r"#"}{request.userCode} + + + AND ROLE_ID = ${r"#"}{request.roleId} + + + AND ROLE_CODE = ${r"#"}{request.roleCode} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND APP_NAME = ${r'#'}{request.appName} + + + AND APP_KEY = ${r'#'}{request.appKey} + + + AND APP_SECRET = ${r'#'}{request.appSecret} + + + AND VALID = ${r'#'}{request.valid} + + + + SELECT + + FROM + + WHERE + "IS_DELETED" = 0 + + AND APP_ID = ${r'#'}{request.appId} + + + AND APP_KEY = ${r'#'}{request.appKey} + + + AND RES_ID = ${r'#'}{request.resId} + + + AND RES_CODE = ${r'#'}{request.resCode} + + +