优化

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<WindowEvent>() {
             @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<TableView, Boolean>() {
-            @Override
-            public Boolean call(TableView param) {
-                //禁止点击列头排序
-                return false;
-            }
-        });
         add = mainController.getAdd();
         add.setOnMouseClicked(new EventHandler<MouseEvent>() {
             @Override
@@ -148,308 +137,157 @@ public class JavaFxApplication extends Application {
             }
         });
 
-        mFields.setOnMouseClicked(new EventHandler<MouseEvent>() {
+        //region 初始化项目树
-            @Override
+        {
-            public void handle(MouseEvent event) {
+            mTree.setShowRoot(true);
-                int selectedIndex = mFields.getSelectionModel().getSelectedIndex();
+            mTree.setEditable(true);
-                if (currentTable == null || selectedIndex == -1) {
+            mTree.setDisable(false);
-                    return;
+            mTree.setCellFactory(new Callback<TreeView, TreeCell>() {
-                }
+                @Override
-                Field field = currentTable.getFields().get(selectedIndex);
+                public TreeCell call(TreeView param) {
-                ContextMenuBuilder builder = new ContextMenuBuilder();
+                    TextFieldTreeCell textFieldTreeCell = new TextFieldTreeCell(new DefaultStringConverter());
-                builder.add("新增", new EventHandler<ActionEvent>() {
+                    textFieldTreeCell.setEditable(false);
-                    @Override
+                    // creating cell from deafult factory
-                    public void handle(ActionEvent event) {
+                    TreeCell treeCell = TextFieldTreeCell.forTreeView().call(param);
-                        addField();
+                    // setting handlers
-                    }
+                    textFieldTreeCell.setOnDragDetected(new EventHandler<MouseEvent>() {
-                });
-                builder.add("删除", new EventHandler<ActionEvent>() {
-                    @Override
-                    public void handle(ActionEvent event) {
-                        subField();
-                    }
-                });
-                if (field.getFieldType().equals(FieldType.Dict.name())) {
-                    builder.add("编辑字典", new EventHandler<ActionEvent>() {
-                        @Override
-                        public void handle(ActionEvent event) {
-                            MenuItem target = (MenuItem) event.getTarget();
-                            int index = mFields.getSelectionModel().getSelectedIndex();
-                            List<Field> fields = currentTable.getFields();
-                            Field field = fields.get(index);
-                            Dialog.showSelectEdit(field);
-                        }
-                    });
-                } else if (field.getFieldType().equals(FieldType.Select.name())) {
-                    builder.add("编辑选项", new EventHandler<ActionEvent>() {
-                        @Override
-                        public void handle(ActionEvent event) {
-                            int index = mFields.getSelectionModel().getSelectedIndex();
-                            List<Field> fields = currentTable.getFields();
-                            Field field = fields.get(index);
-                            Dialog.showSelectEdit(field);
-                        }
-                    });
-                } else if (field.getFieldType().equals(FieldType.Boolean.name())) {
-                    builder.add("编辑是否", new EventHandler<ActionEvent>() {
                         @Override
-                        public void handle(ActionEvent event) {
+                        public void handle(MouseEvent event) {
-                            int index = mFields.getSelectionModel().getSelectedIndex();
+                            TextFieldTreeCell source = (TextFieldTreeCell) event.getSource();
-                            List<Field> fields = currentTable.getFields();
+                            String text = source.getText();
-                            Field field = fields.get(index);
+                            Module dbByDBName = projectManager.findDBByDBName(text);
-                            if (field.getSelectItems().size() == 2) {
+                            dragMD = dbByDBName != null;
-
+                            if (dragMD) {
+                                System.out.println("拖拽模块:" + text);
                             } else {
-                                {
+                                System.out.println("拖拽对象:" + text);
-                                    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);
+                            Dragboard md = source.startDragAndDrop(TransferMode.ANY);
+                            ClipboardContent content = new ClipboardContent();
+                            content.putString(source.getText());
+                            md.setContent(content);
+                            event.consume();
                         }
                     });
-                }
+                    textFieldTreeCell.setOnDragOver(new EventHandler<DragEvent>() {
-                builder.add("向上调整", new EventHandler<ActionEvent>() {
+                        @Override
-                    @Override
+                        public void handle(DragEvent event) {
-                    public void handle(ActionEvent event) {
+                            Dragboard md = event.getDragboard();
-                        int index = mFields.getSelectionModel().getSelectedIndex();
+                            TextFieldTreeCell source = (TextFieldTreeCell) event.getSource();
-                        List<Field> 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<ActionEvent>() {
-                    @Override
-                    public void handle(ActionEvent event) {
-                        int index = mFields.getSelectionModel().getSelectedIndex();
-                        List<Field> 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<TreeView, TreeCell>() {
-            @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<MouseEvent>() {
-                    @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<DragEvent>() {
-                    @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) {
+                            if (dragMD && dbByDBName != null) {
-                            double y = event.getY();
+                                double y = event.getY();
-                            double height = textFieldTreeCell.getHeight();
+                                double height = textFieldTreeCell.getHeight();
 
-                            if (source.getText().equals(md.getString())) {
+                                if (source.getText().equals(md.getString())) {
-                                event.acceptTransferModes(TransferMode.MOVE);
+                                    event.acceptTransferModes(TransferMode.MOVE);
-                            } else if (y >= height / 4 && y < height * 3 / 4) {
+                                } else if (y >= height / 4 && y < height * 3 / 4) {
-                                event.acceptTransferModes(TransferMode.MOVE);
+                                    event.acceptTransferModes(TransferMode.MOVE);
+                                }
                             }
-                        }
 
-                        if (!dragMD && dbByDBName == null) {
+                            if (!dragMD && dbByDBName == null) {
-                            double y = event.getY();
+                                double y = event.getY();
-                            double height = textFieldTreeCell.getHeight();
+                                double height = textFieldTreeCell.getHeight();
 
-                            if (y >= height / 4 && y < height * 3 / 4) {
+                                if (y >= height / 4 && y < height * 3 / 4) {
-                                event.acceptTransferModes(TransferMode.MOVE);
+                                    event.acceptTransferModes(TransferMode.MOVE);
-                            } else {
+                                } else {
-                                event.acceptTransferModes(TransferMode.COPY);
+                                    event.acceptTransferModes(TransferMode.COPY);
+                                }
                             }
+                            event.consume();
                         }
-                        event.consume();
+                    });
-                    }
+                    textFieldTreeCell.setOnDragDropped(new EventHandler<DragEvent>() {
-                });
+                        @Override
-                textFieldTreeCell.setOnDragDropped(new EventHandler<DragEvent>() {
+                        public void handle(DragEvent event) {
-                    @Override
+                            Dragboard md = event.getDragboard();
-                    public void handle(DragEvent event) {
+                            String m1 = md.getString();
-                        Dragboard md = event.getDragboard();
-                        String m1 = md.getString();
-
-                        TreeCell source = (TreeCell<String>) event.getSource();
-                        String m2 = ((TreeCell<String>) event.getGestureTarget()).getItem();
-
-                        if (dragMD) {
-                            List<Module> mds = projectManager.getMds();
 
-                            int i1 = 0, i2 = 0;
+                            TreeCell source = (TreeCell<String>) event.getSource();
-                            for (int i = 0; i < mds.size(); i++) {
+                            String m2 = ((TreeCell<String>) event.getGestureTarget()).getItem();
-                                if (mds.get(i).getName().equals(m1)) {
-                                    i1 = i;
-                                }
-                                if (mds.get(i).getName().equals(m2)) {
-                                    i2 = i;
-                                }
-                            }
 
-                            if (event.getTransferMode().equals(TransferMode.COPY)) {//插入
+                            if (dragMD) {
+                                List<Module> 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 < mds.size(); i++) {
-                                for (int i = 0; i < currentModule.getTables().size(); i++) {
+                                    if (mds.get(i).getName().equals(m1)) {
-                                    if (currentModule.getTables().get(i).getTableName().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();
+                                } else if (event.getTransferMode().equals(TransferMode.MOVE)) {//交换
-                                    if (y < height / 2) {
+                                    Tool.exchange(mds, i1, i2);
-                                        currentModule.getTables().add(i2, t1);
+                                }
-                                    } else {
+                            } else {
-                                        currentModule.getTables().add(i2 + 1, t1);
+                                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) {
+                                    if (t1 == null || t2 == null) {
-                                        currentModule.getTables().remove(i1);
+                                        return;
-                                    } else {
-                                        currentModule.getTables().remove(i1 + 1);
                                     }
 
-                                } else if (event.getTransferMode().equals(TransferMode.MOVE)) {//交换
+                                    if (event.getTransferMode().equals(TransferMode.COPY)) {//插入
-                                    Tool.exchange(currentModule.getTables(), i1, i2);
+                                        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();
+                    return textFieldTreeCell;
-                        mTree.getSelectionModel().clearSelection();
-                        int focusedIndex = mTree.getFocusModel().getFocusedIndex();
-                        System.out.println(focusedIndex);
-                    }
-                });
-                return textFieldTreeCell;
-            }
-        });
-
-        {//初始化模块面板
-            detailModuleController.getModuleComment().textProperty().addListener(new ChangeListener<String>() {
-                @Override
-                public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
-                    if (currentModule != null) {
-                        currentModule.setNote(newValue);
-                    }
-                }
-            });
-
-            detailModuleController.getModulePrefix().textProperty().addListener(new ChangeListener<String>() {
-                @Override
-                public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
-                    if (currentModule != null) {
-                        currentModule.setModulePrefix(newValue);
-                    }
-                }
-            });
-
-            detailModuleController.getModuleName().textProperty().addListener(new ChangeListener<String>() {
-                @Override
-                public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
-                    if (currentModule != null) {
-                        currentModule.setName(newValue);
-                    }
-                }
-            });
-
-            detailModuleController.getIsGenerate().selectedProperty().addListener(new ChangeListener<Boolean>() {
-                @Override
-                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                    if (currentModule != null) {
-                        currentModule.setNeedGenerate(newValue);
-                    }
                 }
             });
         }
+        //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<String>() {
                 @Override
                 public void changed(ObservableValue<? extends String> 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<String>() {
+                @Override
+                public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
+                    if (currentModule != null) {
+                        currentModule.setNote(newValue);
+                    }
+                }
+            });
+
+            detailModuleController.getModulePrefix().textProperty().addListener(new ChangeListener<String>() {
+                @Override
+                public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
+                    if (currentModule != null) {
+                        currentModule.setModulePrefix(newValue);
+                    }
+                }
+            });
+
+            detailModuleController.getModuleName().textProperty().addListener(new ChangeListener<String>() {
+                @Override
+                public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
+                    if (currentModule != null) {
+                        currentModule.setName(newValue);
+                    }
+                }
+            });
+
+            detailModuleController.getIsGenerate().selectedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> 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<String>() {
                 @Override
                 public void changed(ObservableValue<? extends String> 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<TableView, Boolean>() {
+                @Override
+                public Boolean call(TableView param) {
+                    //禁止点击列头排序
+                    return false;
+                }
+            });
+            mFields.setOnMouseClicked(new EventHandler<MouseEvent>() {
+                @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<ActionEvent>() {
+                        @Override
+                        public void handle(ActionEvent event) {
+                            addField();
+                        }
+                    });
+                    builder.add("删除", new EventHandler<ActionEvent>() {
+                        @Override
+                        public void handle(ActionEvent event) {
+                            subField();
+                        }
+                    });
+                    if (field.getFieldType().equals(FieldType.Dict.name())) {
+                        builder.add("编辑字典", new EventHandler<ActionEvent>() {
+                            @Override
+                            public void handle(ActionEvent event) {
+                                MenuItem target = (MenuItem) event.getTarget();
+                                int index = mFields.getSelectionModel().getSelectedIndex();
+                                List<Field> fields = currentTable.getFields();
+                                Field field = fields.get(index);
+                                Dialog.showSelectEdit(field);
+                            }
+                        });
+                    } else if (field.getFieldType().equals(FieldType.Select.name())) {
+                        builder.add("编辑选项", new EventHandler<ActionEvent>() {
+                            @Override
+                            public void handle(ActionEvent event) {
+                                int index = mFields.getSelectionModel().getSelectedIndex();
+                                List<Field> fields = currentTable.getFields();
+                                Field field = fields.get(index);
+                                Dialog.showSelectEdit(field);
+                            }
+                        });
+                    } else if (field.getFieldType().equals(FieldType.Boolean.name())) {
+                        builder.add("编辑是否", new EventHandler<ActionEvent>() {
+                            @Override
+                            public void handle(ActionEvent event) {
+                                int index = mFields.getSelectionModel().getSelectedIndex();
+                                List<Field> 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<ActionEvent>() {
+                        @Override
+                        public void handle(ActionEvent event) {
+                            int index = mFields.getSelectionModel().getSelectedIndex();
+                            List<Field> 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<ActionEvent>() {
+                        @Override
+                        public void handle(ActionEvent event) {
+                            int index = mFields.getSelectionModel().getSelectedIndex();
+                            List<Field> 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() {
+    public void initProjectTree(Project project) {
-        currentProject = projectManager.getProject();
+        currentProject = project;
         TreeItem<Project> projectTreeItem = new TreeItem<Project>(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);
                         }
                     }

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() {
+    public ProjectManager getProjectManager() {
-        return dBmanger;
+        return projectManager;
     }
 
-    public void setdBmanger(ProjectManager dBmanger) {
+    public void setProjectManager(ProjectManager projectManager) {
-        this.dBmanger = dBmanger;
+        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(projectManager.invalidate(file));//加载模型树
-            main.initProjectTree();//加载模型树 - 到组件
+            main.loadProject();//显示项目面板
-            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(projectManager.invalidate());
-        main.initProjectTree();
         main.loadProject();
     }
 
@@ -165,10 +163,9 @@ public class MainController {
         Dialog.showYesNo("", "确认删除当前模型?", new Dialog.ConfirmCall() {
             @Override
             public void call(boolean result) {
-                if (result){
+                if (result) {
-                    dBmanger.delete();
+                    projectManager.delete();
-                    dBmanger.invalidate();
+                    main.initProjectTree(projectManager.invalidate());
-                    main.initProjectTree();
                     main.loadProject();
                 }
             }
@@ -183,12 +180,12 @@ public class MainController {
     @FXML
     public void modelGenerate(ActionEvent actionEvent) {
         this.modelSave(null);
-        if (dBmanger.doCheck()) {
+        if (projectManager.doCheck()) {
-            Dialog.showDirectoryChooser(dBmanger.getPath(), new Dialog.DirectoryCall() {
+            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);
                 }
             });
         }

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;
-    }
 }

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<String, String> properties) {
-
         String url = properties.get("url");
         String username = properties.get("username");
         String password = properties.get("password");

src/main/java/xyz/wbsite/dbtool/javafx/manger/ReflashManager.java

@@ -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;
-            }
-        }
-    }
-}

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);
                                 }
                             }

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));
     }

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());
     }

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 ${domain}.config.ActionConfig.CONTROL_PREFIX;
-import static com.example.config.ActionConfig.SCREEN_PREFIX;
+import static ${domain}.config.ActionConfig.SCREEN_PREFIX;
 
 @Configuration
 public class FreeMarkerConfig {

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) {

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;
         }
 

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);
 }

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<Role> result = roleMapper.select(new Role(), token);
+
+        response.setResult(result);
+        response.setTotalCount((long) result.size());
+
+        return response;
+    }
 }

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);
+
     /**
      * 查询
      *

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;
+    }
+
     /**
      * 查询
      *

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<Dept> select(@Param("request") Dept request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

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<DictItem> select(@Param("request") DictItem request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

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<Dict> select(@Param("request") Dict request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

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<File> select(@Param("request") File request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

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<Logerr> select(@Param("request") Logerr request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DeptMapper.xml

@@ -112,6 +112,33 @@
         AND `ROW_VERSION` = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="dept">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        `IS_DELETED` = 0
+        <if test="request.deptCode != null and request.deptCode != ''">
+            AND `DEPT_CODE` = ${r"#"}{request.deptCode}
+        </if>
+        <if test="request.deptName != null and request.deptName != ''">
+            AND `DEPT_NAME` = ${r"#"}{request.deptName}
+        </if>
+        <if test="request.deptAlias != null and request.deptAlias != ''">
+            AND `DEPT_ALIAS` = ${r"#"}{request.deptAlias}
+        </if>
+        <if test="request.supCode != null and request.supCode != ''">
+            AND `SUP_CODE` = ${r"#"}{request.supCode}
+        </if>
+        <if test="request.supName != null and request.supName != ''">
+            AND `SUP_NAME` = ${r"#"}{request.supName}
+        </if>
+        <if test="request.valid != null">
+            AND `VALID` = ${r"#"}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="dept">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictItemMapper.xml

@@ -109,6 +109,29 @@
         AND `ROW_VERSION` = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="dictItem">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+        <if test="request.dictName != null and request.dictName != ''">
+            AND `DICT_NAME` = ${r"#"}{request.dictName}
+        </if>
+        <if test="request.key != null and request.key != ''">
+            AND `KEY` = ${r"#"}{request.key}
+        </if>
+        <if test="request.value != null and request.value != ''">
+            AND `VALUE` = ${r"#"}{request.value}
+        </if>
+        <if test="request.sort != null and request.sort != 0">
+            AND `SORT` = ${r"#"}{request.sort}
+        </if>
+        <if test="request.valid != null">
+            AND `VALID` = ${r"#"}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="dictItem">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictMapper.xml

@@ -103,6 +103,23 @@
         AND `ROW_VERSION` = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="dict">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+        <if test="request.dictName != null and request.dictName != ''">
+            AND `DICT_NAME` = ${r"#"}{request.dictName}
+        </if>
+        <if test="request.dictComment != null and request.dictComment != ''">
+            AND `DICT_COMMENT` = ${r"#"}{request.dictComment}
+        </if>
+        <if test="request.valid != null">
+            AND `VALID` = ${r"#"}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="dict">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_FileMapper.xml

@@ -115,6 +115,26 @@
         AND `ROW_VERSION` = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="file">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+        <if test="request.name != null and request.name != ''">
+            AND `NAME` = ${r"#"}{request.name}
+        </if>
+        <if test="request.fileType != null and request.fileType != ''">
+            AND `FILE_TYPE` = ${r"#"}{request.fileType}
+        </if>
+        <if test="request.attribute1 != null and request.attribute1 != ''">
+            AND `ATTRIBUTE1` = ${r"#"}{request.attribute1}
+        </if>
+        <if test="request.attribute2 != null and request.attribute2 != ''">
+            AND `ATTRIBUTE2` = ${r"#"}{request.attribute2}
+        </if>
+    </select>
+
     <select id="find" resultMap="file">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ProfilesMapper.xml

@@ -113,6 +113,20 @@
         </if>
     </select>
 
+    <select id="select" resultMap="profiles">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+        <if test="request.active != null and request.active != ''">
+            AND `ACTIVE` = ${r'#'}{request.active}
+        </if>
+        <if test="request.key != null and request.key != ''">
+            AND `KEY` = ${r'#'}{request.key}
+        </if>
+    </select>
+
     <select id="find" resultMap="profiles">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml

@@ -122,6 +122,38 @@
         AND `ROW_VERSION` = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="res">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+        <if test="request.resCode != null and request.resCode != ''">
+            AND `RES_CODE` = ${r'#'}{request.resCode}
+        </if>
+        <if test="request.resName != null and request.resName != ''">
+            AND `RES_NAME` = ${r'#'}{request.resName}
+        </if>
+        <if test="request.resType != null and request.resType != ''">
+            AND `RES_TYPE` = ${r'#'}{request.resType}
+        </if>
+        <if test="request.resValue != null and request.resValue != ''">
+            AND `RES_VALUE` = ${r'#'}{request.resValue}
+        </if>
+        <if test="request.supCode != null and request.supCode != ''">
+            AND `SUP_CODE` = ${r'#'}{request.supCode}
+        </if>
+        <if test="request.supName != null and request.supName != ''">
+            AND `SUP_NAME` = ${r'#'}{request.supName}
+        </if>
+        <if test="request.free != null">
+            AND `FREE` = ${r'#'}{request.free}
+        </if>
+        <if test="request.valid != null">
+            AND `VALID` = ${r'#'}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="res">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_RoleMapper.xml

@@ -99,6 +99,23 @@
         AND `ROW_VERSION` = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="role">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+        <if test="request.code != null and request.code != ''">
+            AND `CODE` = ${r"#"}{request.code}
+        </if>
+        <if test="request.name != null and request.name != ''">
+            AND `NAME` = ${r"#"}{request.name}
+        </if>
+        <if test="request.comment != null and request.comment != ''">
+            AND `COMMENT` = ${r"#"}{request.comment}
+        </if>
+    </select>
+
     <select id="find" resultMap="role">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_RoleResMapper.xml

@@ -105,6 +105,26 @@
         AND `ROW_VERSION` = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="roleRes">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+        <if test="request.roleId != null and request.roleId != 0">
+            AND `ROLE_ID` = ${r'#'}{request.roleId}
+        </if>
+        <if test="request.roleCode != null and request.roleCode != ''">
+            AND `ROLE_CODE` = ${r'#'}{request.roleCode}
+        </if>
+        <if test="request.resId != null and request.resId != 0">
+            AND `RES_ID` = ${r'#'}{request.resId}
+        </if>
+        <if test="request.resCode != null and request.resCode != ''">
+            AND `RES_CODE` = ${r'#'}{request.resCode}
+        </if>
+    </select>
+
     <select id="find" resultMap="roleRes">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_SequenceMapper.xml

@@ -131,6 +131,26 @@
         </if>
     </select>
 
+    <select id="select" resultMap="sequence">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+        <if test="request.seqName != null and request.seqName != ''">
+            AND `SEQ_NAME` = ${r'#'}{request.seqName}
+        </if>
+        <if test="request.year != null and request.year != ''">
+            AND `YEAR` = ${r'#'}{request.year}
+        </if>
+        <if test="request.month != null and request.month != ''">
+            AND `MONTH` = ${r'#'}{request.month}
+        </if>
+        <if test="request.date != null and request.date != ''">
+            AND `DATE` = ${r'#'}{request.date}
+        </if>
+    </select>
+
     <select id="find" resultMap="sequence">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_TaskSqlMapper.xml

@@ -113,6 +113,27 @@
         AND `ROW_VERSION` = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="taskSql">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        `IS_DELETED` = 0
+        <if test="request.taskName != null and request.taskName != ''">
+            AND `TASK_NAME` = ${r"#"}{request.taskName}
+        </if>
+        <if test="request.taskNote != null and request.taskNote != ''">
+            AND `TASK_NOTE` = ${r"#"}{request.taskNote}
+        </if>
+        <if test="request.taskType != null and request.taskType != ''">
+            AND `TASK_TYPE` = ${r"#"}{request.taskType}
+        </if>
+        <if test="request.valid != null">
+            AND `VALID` = ${r"#"}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="taskSql">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_TokensMapper.xml

@@ -135,6 +135,50 @@
         AND `ROW_VERSION` = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="tokens">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+        <if test="request.token != null and request.token != ''">
+            AND `TOKEN` = ${r"#"}{request.token}
+        </if>
+        <if test="request.userId != null and request.userId != 0">
+            AND `USER_ID` = ${r"#"}{request.userId}
+        </if>
+        <if test="request.userName != null and request.userName != ''">
+            AND `USER_NAME` = ${r"#"}{request.userName}
+        </if>
+        <if test="request.loginTime != null">
+            AND DATE_FORMAT(`LOGIN_TIME`,"%Y-%m-%d %T") = DATE_FORMAT(${r"#"}{request.loginTime},"%Y-%m-%d %T")
+        </if>
+        <if test="request.validTime != null">
+            AND DATE_FORMAT(`VALID_TIME`,"%Y-%m-%d %T") = DATE_FORMAT(${r"#"}{request.validTime},"%Y-%m-%d %T")
+        </if>
+        <if test="request.valid != null">
+            AND `VALID` = ${r"#"}{request.valid}
+        </if>
+        <if test="request.deptId != null and request.deptId != 0">
+            AND `DEPT_ID` = ${r"#"}{request.deptId}
+        </if>
+        <if test="request.deptCode != null and request.deptCode != ''">
+            AND `DEPT_CODE` = ${r"#"}{request.deptCode}
+        </if>
+        <if test="request.deptName != null and request.deptName != ''">
+            AND `DEPT_NAME` = ${r"#"}{request.deptName}
+        </if>
+        <if test="request.terminal != null and request.terminal != ''">
+            AND `TERMINAL` = ${r"#"}{request.terminal}
+        </if>
+        <if test="request.terminalIp != null and request.terminalIp != ''">
+            AND `TERMINAL_IP` = ${r"#"}{request.terminalIp}
+        </if>
+        <if test="request.terminalInfo != null and request.terminalInfo != ''">
+            AND `TERMINAL_INFO` = ${r"#"}{request.terminalInfo}
+        </if>
+    </select>
+
     <select id="find" resultMap="tokens">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_UserMapper.xml

@@ -130,6 +130,35 @@
         AND `ID` = ${r"#"}{request.id}
     </update>
 
+    <select id="select" resultMap="user">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+        <if test="request.userName != null and request.userName != ''">
+            AND `USER_NAME` = ${r"#"}{request.userName}
+        </if>
+        <if test="request.userCode != null and request.userCode != ''">
+            AND `USER_CODE` = ${r"#"}{request.userCode}
+        </if>
+        <if test="request.userAlias != null and request.userAlias != ''">
+            AND `USER_ALIAS` = ${r"#"}{request.userAlias}
+        </if>
+        <if test="request.userStatus != null and request.userStatus != ''">
+            AND `USER_STATUS` = ${r"#"}{request.userStatus}
+        </if>
+        <if test="request.deptId != null and request.deptId != 0">
+            AND `DEPT_ID` = ${r"#"}{request.deptId}
+        </if>
+        <if test="request.deptCode != null and request.deptCode != ''">
+            AND `DEPT_CODE` = ${r"#"}{request.deptCode}
+        </if>
+        <if test="request.deptName != null and request.deptName != ''">
+            AND `DEPT_NAME` = ${r"#"}{request.deptName}
+        </if>
+    </select>
+
     <select id="find" resultMap="user">
         SELECT
           t1.*,t2.ROLE_NAMES, t2.ROLE_CODES

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_UserRoleMapper.xml

@@ -103,6 +103,26 @@
         AND `ROW_VERSION` = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="userRole">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+        <if test="request.userId != null and request.userId != 0">
+            AND `USER_ID` = ${r'#'}{request.userId}
+        </if>
+        <if test="request.userCode != null and request.userCode != ''">
+            AND `USER_CODE` = ${r'#'}{request.userCode}
+        </if>
+        <if test="request.roleId != null and request.roleId != 0">
+            AND `ROLE_ID` = ${r'#'}{request.roleId}
+        </if>
+        <if test="request.roleCode != null and request.roleCode != ''">
+            AND `ROLE_CODE` = ${r'#'}{request.roleCode}
+        </if>
+    </select>
+
     <select id="find" resultMap="userRole">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_VisitorResMapper.xml

@@ -123,6 +123,26 @@
         </if>
     </select>
 
+    <select id="select" resultMap="visitorRes">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+        <if test="request.appId != null and request.appId != 0">
+            AND `APP_ID` = ${r'#'}{request.appId}
+        </if>
+        <if test="request.appKey != null and request.appKey != ''">
+            AND `APP_KEY` = ${r'#'}{request.appKey}
+        </if>
+        <if test="request.resId != null and request.resId != 0">
+            AND `RES_ID` = ${r'#'}{request.resId}
+        </if>
+        <if test="request.resCode != null and request.resCode != ''">
+            AND `RES_CODE` = ${r'#'}{request.resCode}
+        </if>
+    </select>
+
     <select id="find" resultMap="visitorRes">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_DeptMapper.xml

@@ -111,6 +111,33 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="dept">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.deptCode != null and request.deptCode != ''">
+            AND "DEPT_CODE" = ${r'#'}{request.deptCode}
+        </if>
+        <if test="request.deptName != null and request.deptName != ''">
+            AND "DEPT_NAME" = ${r'#'}{request.deptName}
+        </if>
+        <if test="request.deptAlias != null and request.deptAlias != ''">
+            AND "DEPT_ALIAS" = ${r'#'}{request.deptAlias}
+        </if>
+        <if test="request.supCode != null and request.supCode != ''">
+            AND "SUP_CODE" = ${r'#'}{request.supCode}
+        </if>
+        <if test="request.supName != null and request.supName != ''">
+            AND "SUP_NAME" = ${r'#'}{request.supName}
+        </if>
+        <if test="request.valid != null">
+            AND "VALID" = ${r'#'}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="dept">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_DictItemMapper.xml

@@ -107,6 +107,27 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="dictItem">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.dictName != null and request.dictName != ''">
+            AND "DICT_NAME" = ${r'#'}{request.dictName}
+        </if>
+        <if test="request.key != null and request.key != ''">
+            AND "KEY" = ${r'#'}{request.key}
+        </if>
+        <if test="request.value != null and request.value != ''">
+            AND "VALUE" = ${r'#'}{request.value}
+        </if>
+        <if test="request.valid != null">
+            AND "VALID" = ${r'#'}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="dictItem">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_DictMapper.xml

@@ -103,6 +103,24 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="dict">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.dictName != null and request.dictName != ''">
+            AND "DICT_NAME" = ${r'#'}{request.dictName}
+        </if>
+        <if test="request.dictComment != null and request.dictComment != ''">
+            AND "DICT_COMMENT" = ${r'#'}{request.dictComment}
+        </if>
+        <if test="request.valid != null">
+            AND "VALID" = ${r'#'}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="dict">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_FileMapper.xml

@@ -115,6 +115,27 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="file">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.name != null and request.name != ''">
+            AND "NAME" = ${r'#'}{request.name}
+        </if>
+        <if test="request.fileType != null and request.fileType != ''">
+            AND "FILE_TYPE" = ${r'#'}{request.fileType}
+        </if>
+        <if test="request.attribute1 != null and request.attribute1 != ''">
+            AND "ATTRIBUTE1" = ${r'#'}{request.attribute1}
+        </if>
+        <if test="request.attribute2 != null and request.attribute2 != ''">
+            AND "ATTRIBUTE2" = ${r'#'}{request.attribute2}
+        </if>
+    </select>
+
     <select id="find" resultMap="file">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_ResMapper.xml

@@ -119,6 +119,39 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="res">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.resCode != null and request.resCode != ''">
+            AND "RES_CODE" = ${r'#'}{request.resCode}
+        </if>
+        <if test="request.resName != null and request.resName != ''">
+            AND "RES_NAME" = ${r'#'}{request.resName}
+        </if>
+        <if test="request.resType != null and request.resType != ''">
+            AND "RES_TYPE" = ${r'#'}{request.resType}
+        </if>
+        <if test="request.resValue != null and request.resValue != ''">
+            AND "RES_VALUE" = ${r'#'}{request.resValue}
+        </if>
+        <if test="request.supCode != null and request.supCode != ''">
+            AND "SUP_CODE" = ${r'#'}{request.supCode}
+        </if>
+        <if test="request.supName != null and request.supName != ''">
+            AND "SUP_NAME" = ${r'#'}{request.supName}
+        </if>
+        <if test="request.free != null">
+            AND "FREE" = ${r'#'}{request.free}
+        </if>
+        <if test="request.valid != null">
+            AND "VALID" = ${r'#'}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="res">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_RoleMapper.xml

@@ -99,6 +99,24 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="role">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.code != null and request.code != ''">
+            AND "CODE" = ${r'#'}{request.code}
+        </if>
+        <if test="request.name != null and request.name != ''">
+            AND "NAME" = ${r'#'}{request.name}
+        </if>
+        <if test="request.comment != null and request.comment != ''">
+            AND "COMMENT" = ${r'#'}{request.comment}
+        </if>
+    </select>
+
     <select id="find" resultMap="role">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_RoleResMapper.xml

@@ -103,6 +103,27 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="roleRes">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.roleId != null and request.roleId != 0">
+            AND "ROLE_ID" = ${r'#'}{request.roleId}
+        </if>
+        <if test="request.roleCode != null and request.roleCode != ''">
+            AND "ROLE_CODE" = ${r'#'}{request.roleCode}
+        </if>
+        <if test="request.resId != null and request.resId != 0">
+            AND "RES_ID" = ${r'#'}{request.resId}
+        </if>
+        <if test="request.resCode != null and request.resCode != ''">
+            AND "RES_CODE" = ${r'#'}{request.resCode}
+        </if>
+    </select>
+
     <select id="find" resultMap="roleRes">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_TaskSqlMapper.xml

@@ -111,6 +111,27 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="taskSql">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.taskName != null and request.taskName != ''">
+            AND "TASK_NAME" = ${r'#'}{request.taskName}
+        </if>
+        <if test="request.taskNote != null and request.taskNote != ''">
+            AND "TASK_NOTE" = ${r'#'}{request.taskNote}
+        </if>
+        <if test="request.taskType != null and request.taskType != ''">
+            AND "TASK_TYPE" = ${r'#'}{request.taskType}
+        </if>
+        <if test="request.valid != null">
+            AND "VALID" = ${r'#'}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="taskSql">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_TokensMapper.xml

@@ -135,6 +135,51 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="tokens">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.token != null and request.token != ''">
+            AND "TOKEN" = ${r'#'}{request.token}
+        </if>
+        <if test="request.userId != null and request.userId != 0">
+            AND "USER_ID" = ${r'#'}{request.userId}
+        </if>
+        <if test="request.userName != null and request.userName != ''">
+            AND "USER_NAME" = ${r'#'}{request.userName}
+        </if>
+        <if test="request.loginTime != null and request.loginTime != ''">
+            AND to_char("LOGIN_TIME",'yyyy-MM-dd HH24:mi:ss') = to_char(${r'#'}{request.loginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="request.validTime != null and request.validTime != ''">
+            AND to_char("VALID_TIME",'yyyy-MM-dd HH24:mi:ss') = to_char(${r'#'}{request.validTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="request.valid != null">
+            AND "VALID" = ${r'#'}{request.valid}
+        </if>
+        <if test="request.deptId != null and request.deptId != 0">
+            AND "DEPT_ID" = ${r'#'}{request.deptId}
+        </if>
+        <if test="request.deptCode != null and request.deptCode != ''">
+            AND "DEPT_CODE" = ${r'#'}{request.deptCode}
+        </if>
+        <if test="request.deptName != null and request.deptName != ''">
+            AND "DEPT_NAME" = ${r'#'}{request.deptName}
+        </if>
+        <if test="request.terminal != null and request.terminal != ''">
+            AND "TERMINAL" = ${r'#'}{request.terminal}
+        </if>
+        <if test="request.terminalIp != null and request.terminalIp != ''">
+            AND "TERMINAL_IP" = ${r'#'}{request.terminalIp}
+        </if>
+        <if test="request.terminalInfo != null and request.terminalInfo != ''">
+            AND "TERMINAL_INFO" = ${r'#'}{request.terminalInfo}
+        </if>
+    </select>
+
     <select id="find" resultMap="tokens">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_UserMapper.xml

@@ -131,6 +131,36 @@
         AND "ID" = ${r'#'}{request.id}
     </update>
 
+    <select id="select" resultMap="user">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.userName != null and request.userName != ''">
+            AND "USER_NAME" = ${r'#'}{request.userName}
+        </if>
+        <if test="request.userCode != null and request.userCode != ''">
+            AND "USER_CODE" = ${r'#'}{request.userCode}
+        </if>
+        <if test="request.userAlias != null and request.userAlias != ''">
+            AND "USER_ALIAS" = ${r'#'}{request.userAlias}
+        </if>
+        <if test="request.userStatus != null and request.userStatus != ''">
+            AND t1."USER_STATUS" = ${r'#'}{request.userStatus}
+        </if>
+        <if test="request.deptId != null and request.deptId != 0">
+            AND "DEPT_ID" = ${r'#'}{request.deptId}
+        </if>
+        <if test="request.deptCode != null and request.deptCode != ''">
+            AND "DEPT_CODE" = ${r'#'}{request.deptCode}
+        </if>
+        <if test="request.deptName != null and request.deptName != ''">
+            AND "DEPT_NAME" = ${r'#'}{request.deptName}
+        </if>
+    </select>
+
     <select id="find" resultMap="user">
         SELECT
         t1.*,t2.ROLE_NAMES, t2.ROLE_CODES

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_UserRoleMapper.xml

@@ -103,6 +103,27 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="userRole">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.userId != null and request.userId != 0">
+            AND "USER_ID" = ${r'#'}{request.userId}
+        </if>
+        <if test="request.userCode != null and request.userCode != ''">
+            AND "USER_CODE" = ${r'#'}{request.userCode}
+        </if>
+        <if test="request.roleId != null and request.roleId != 0">
+            AND "ROLE_ID" = ${r'#'}{request.roleId}
+        </if>
+        <if test="request.roleCode != null and request.roleCode != ''">
+            AND "ROLE_CODE" = ${r'#'}{request.roleCode}
+        </if>
+    </select>
+
     <select id="find" resultMap="userRole">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/ProfilesMapper.java

@@ -63,7 +63,16 @@ public interface ProfilesMapper {
     long update(@Param("request") Profiles request, @Param("token") Token token);
 
     /**
-     * 查询
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<Profiles> select(@Param("request") Profiles request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/ResMapper.java

@@ -64,7 +64,16 @@ public interface ResMapper {
     long update(@Param("request") Res request, @Param("token") Token token);
 
     /**
-     * 查询
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<Res> select(@Param("request") Res request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/RoleMapper.java

@@ -63,7 +63,16 @@ public interface RoleMapper {
     long update(@Param("request") Role request, @Param("token") Token token);
 
     /**
-     * 查询
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<Role> select(@Param("request") Role request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/RoleResMapper.java

@@ -63,7 +63,16 @@ public interface RoleResMapper {
     long update(@Param("request") RoleRes request, @Param("token") Token token);
 
     /**
-     * 查询
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<RoleRes> select(@Param("request") RoleRes request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_DeptMapper.xml

@@ -111,6 +111,33 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="dept">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.deptCode != null and request.deptCode != ''">
+            AND "DEPT_CODE" = ${r'#'}{request.deptCode}
+        </if>
+        <if test="request.deptName != null and request.deptName != ''">
+            AND "DEPT_NAME" = ${r'#'}{request.deptName}
+        </if>
+        <if test="request.deptAlias != null and request.deptAlias != ''">
+            AND "DEPT_ALIAS" = ${r'#'}{request.deptAlias}
+        </if>
+        <if test="request.supCode != null and request.supCode != ''">
+            AND "SUP_CODE" = ${r'#'}{request.supCode}
+        </if>
+        <if test="request.supName != null and request.supName != ''">
+            AND "SUP_NAME" = ${r'#'}{request.supName}
+        </if>
+        <if test="request.valid != null">
+            AND "VALID" = ${r'#'}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="dept">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_DictItemMapper.xml

@@ -107,6 +107,26 @@
         AND "ROW_VERSION" = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="dictItem">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.dictName != null and request.dictName != ''">
+            AND DICT_NAME = ${r"#"}{request.dictName}
+        </if>
+        <if test="request.key != null and request.key != ''">
+            AND KEY = ${r"#"}{request.key}
+        </if>
+        <if test="request.value != null and request.value != ''">
+            AND VALUE = ${r"#"}{request.value}
+        </if>
+        <if test="request.valid != null">
+            AND VALID = ${r"#"}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="dictItem">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_DictMapper.xml

@@ -103,6 +103,23 @@
         AND "ROW_VERSION" = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="dict">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.dictName != null and request.dictName != ''">
+            AND DICT_NAME = ${r"#"}{request.dictName}
+        </if>
+        <if test="request.dictComment != null and request.dictComment != ''">
+            AND DICT_COMMENT = ${r"#"}{request.dictComment}
+        </if>
+        <if test="request.valid != null">
+            AND VALID = ${r"#"}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="dict">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_FileMapper.xml

@@ -115,6 +115,26 @@
         AND "ROW_VERSION" = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="file">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.name != null and request.name != ''">
+            AND NAME = ${r"#"}{request.name}
+        </if>
+        <if test="request.fileType != null and request.fileType != ''">
+            AND FILE_TYPE = ${r"#"}{request.fileType}
+        </if>
+        <if test="request.attribute1 != null and request.attribute1 != ''">
+            AND ATTRIBUTE1 = ${r"#"}{request.attribute1}
+        </if>
+        <if test="request.attribute2 != null and request.attribute2 != ''">
+            AND ATTRIBUTE2 = ${r"#"}{request.attribute2}
+        </if>
+    </select>
+
     <select id="find" resultMap="file">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_LogerrMapper.xml

@@ -103,6 +103,23 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="logerr">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.logType != null and request.logType != ''">
+            AND "LOG_TYPE" = ${r'#'}{request.logType}
+        </if>
+        <if test="request.logTitle != null and request.logTitle != ''">
+            AND "LOG_TITLE" = ${r'#'}{request.logTitle}
+        </if>
+        <if test="request.logState != null and request.logState != ''">
+            AND "LOG_STATE" = ${r'#'}{request.logState}
+        </if>
+    </select>
+
     <select id="find" resultMap="logerr">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ProfilesMapper.xml

@@ -99,6 +99,20 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="profiles">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.active != null and request.active != ''">
+            AND "ACTIVE" = ${r'#'}{request.active}
+        </if>
+        <if test="request.key != null and request.key != ''">
+            AND "KEY" = ${r'#'}{request.key}
+        </if>
+    </select>
+
     <select id="find" resultMap="profiles">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ResMapper.xml

@@ -118,6 +118,38 @@
         AND "ROW_VERSION" = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="res">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.resCode != null and request.resCode != ''">
+            AND RES_CODE = ${r"#"}{request.resCode}
+        </if>
+        <if test="request.resName != null and request.resName != ''">
+            AND RES_NAME = ${r"#"}{request.resName}
+        </if>
+        <if test="request.resType != null and request.resType != ''">
+            AND RES_TYPE = ${r"#"}{request.resType}
+        </if>
+        <if test="request.resValue != null and request.resValue != ''">
+            AND RES_VALUE = ${r"#"}{request.resValue}
+        </if>
+        <if test="request.supCode != null and request.supCode != ''">
+            AND SUP_CODE = ${r"#"}{request.supCode}
+        </if>
+        <if test="request.supName != null and request.supName != ''">
+            AND SUP_NAME = ${r"#"}{request.supName}
+        </if>
+        <if test="request.free != null">
+            AND FREE = ${r"#"}{request.free}
+        </if>
+        <if test="request.valid != null">
+            AND VALID = ${r"#"}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="res">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_RoleMapper.xml

@@ -99,6 +99,23 @@
         AND "ROW_VERSION" = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="role">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.code != null and request.code != ''">
+            AND CODE = ${r"#"}{request.code}
+        </if>
+        <if test="request.name != null and request.name != ''">
+            AND NAME = ${r"#"}{request.name}
+        </if>
+        <if test="request.comment != null and request.comment != ''">
+            AND COMMENT = ${r"#"}{request.comment}
+        </if>
+    </select>
+
     <select id="find" resultMap="role">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_RoleResMapper.xml

@@ -103,6 +103,26 @@
         AND "ROW_VERSION" = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="roleRes">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.roleId != null and request.roleId != 0">
+            AND ROLE_ID = ${r"#"}{request.roleId}
+        </if>
+        <if test="request.roleCode != null and request.roleCode != ''">
+            AND ROLE_CODE = ${r"#"}{request.roleCode}
+        </if>
+        <if test="request.resId != null and request.resId != 0">
+            AND RES_ID = ${r"#"}{request.resId}
+        </if>
+        <if test="request.resCode != null and request.resCode != ''">
+            AND RES_CODE = ${r"#"}{request.resCode}
+        </if>
+    </select>
+
     <select id="find" resultMap="roleRes">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_SequenceMapper.xml

@@ -111,6 +111,26 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="sequence">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.seqName != null and request.seqName != ''">
+            AND "SEQ_NAME" = ${r'#'}{request.seqName}
+        </if>
+        <if test="request.year != null and request.year != ''">
+            AND "YEAR" = ${r'#'}{request.year}
+        </if>
+        <if test="request.month != null and request.month != ''">
+            AND "MONTH" = ${r'#'}{request.month}
+        </if>
+        <if test="request.date != null and request.date != ''">
+            AND "DATE" = ${r'#'}{request.date}
+        </if>
+    </select>
+
     <select id="find" resultMap="sequence">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_TaskSqlMapper.xml

@@ -111,6 +111,27 @@
         AND "ROW_VERSION" = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="taskSql">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.taskName != null and request.taskName != ''">
+            AND "TASK_NAME" = ${r"#"}{request.taskName}
+        </if>
+        <if test="request.taskNote != null and request.taskNote != ''">
+            AND "TASK_NOTE" = ${r"#"}{request.taskNote}
+        </if>
+        <if test="request.taskType != null and request.taskType != ''">
+            AND "TASK_TYPE" = ${r"#"}{request.taskType}
+        </if>
+        <if test="request.valid != null">
+            AND "VALID" = ${r"#"}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="taskSql">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_TokensMapper.xml

@@ -135,6 +135,50 @@
         AND "ROW_VERSION" = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="tokens">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.token != null and request.token != ''">
+            AND TOKEN = ${r"#"}{request.token}
+        </if>
+        <if test="request.userId != null and request.userId != 0">
+            AND USER_ID = ${r"#"}{request.userId}
+        </if>
+        <if test="request.userName != null and request.userName != ''">
+            AND USER_NAME = ${r"#"}{request.userName}
+        </if>
+        <if test="request.loginTime != null">
+            AND LOGIN_TIME = ${r"#"}{request.loginTime}
+        </if>
+        <if test="request.validTime != null">
+            AND VALID_TIME = ${r"#"}{request.validTime}
+        </if>
+        <if test="request.valid != null">
+            AND VALID = ${r"#"}{request.valid}
+        </if>
+        <if test="request.deptId != null and request.deptId != 0">
+            AND DEPT_ID = ${r"#"}{request.deptId}
+        </if>
+        <if test="request.deptCode != null and request.deptCode != ''">
+            AND DEPT_CODE = ${r"#"}{request.deptCode}
+        </if>
+        <if test="request.deptName != null and request.deptName != ''">
+            AND DEPT_NAME = ${r"#"}{request.deptName}
+        </if>
+        <if test="request.terminal != null and request.terminal != ''">
+            AND TERMINAL = ${r"#"}{request.terminal}
+        </if>
+        <if test="request.terminalIp != null and request.terminalIp != ''">
+            AND TERMINAL_IP = ${r"#"}{request.terminalIp}
+        </if>
+        <if test="request.terminalInfo != null and request.terminalInfo != ''">
+            AND TERMINAL_INFO = ${r"#"}{request.terminalInfo}
+        </if>
+    </select>
+
     <select id="find" resultMap="tokens">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_UserMapper.xml

@@ -129,6 +129,35 @@
         AND "ID" = ${r"#"}{request.id}
     </update>
 
+    <select id="select" resultMap="user">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.userName != null and request.userName != ''">
+            AND "USER_NAME" = ${r'#'}{request.userName}
+        </if>
+        <if test="request.userCode != null and request.userCode != ''">
+            AND "USER_CODE" = ${r'#'}{request.userCode}
+        </if>
+        <if test="request.userAlias != null and request.userAlias != ''">
+            AND "USER_ALIAS" = ${r'#'}{request.userAlias}
+        </if>
+        <if test="request.userStatus != null and request.userStatus != ''">
+            AND "USER_STATUS" = ${r'#'}{request.userStatus}
+        </if>
+        <if test="request.deptId != null and request.deptId != 0">
+            AND "DEPT_ID" = ${r'#'}{request.deptId}
+        </if>
+        <if test="request.deptCode != null and request.deptCode != ''">
+            AND "DEPT_CODE" = ${r'#'}{request.deptCode}
+        </if>
+        <if test="request.deptName != null and request.deptName != ''">
+            AND "DEPT_NAME" = ${r'#'}{request.deptName}
+        </if>
+    </select>
+
     <select id="find" resultMap="user">
         SELECT
         t1.*,t2.ROLE_NAMES, t2.ROLE_CODES

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_UserRoleMapper.xml

@@ -103,6 +103,26 @@
         AND "ROW_VERSION" = ${r"#"}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="userRole">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.userId != null and request.userId != 0">
+            AND USER_ID = ${r"#"}{request.userId}
+        </if>
+        <if test="request.userCode != null and request.userCode != ''">
+            AND USER_CODE = ${r"#"}{request.userCode}
+        </if>
+        <if test="request.roleId != null and request.roleId != 0">
+            AND ROLE_ID = ${r"#"}{request.roleId}
+        </if>
+        <if test="request.roleCode != null and request.roleCode != ''">
+            AND ROLE_CODE = ${r"#"}{request.roleCode}
+        </if>
+    </select>
+
     <select id="find" resultMap="userRole">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_VisitorMapper.xml

@@ -107,6 +107,27 @@
         AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
+    <select id="select" resultMap="visitor">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.appName != null and request.appName != ''">
+            AND APP_NAME = ${r'#'}{request.appName}
+        </if>
+        <if test="request.appKey != null and request.appKey != ''">
+            AND APP_KEY = ${r'#'}{request.appKey}
+        </if>
+        <if test="request.appSecret != null and request.appSecret != ''">
+            AND APP_SECRET = ${r'#'}{request.appSecret}
+        </if>
+        <if test="request.valid != null">
+            AND VALID = ${r'#'}{request.valid}
+        </if>
+    </select>
+
     <select id="find" resultMap="visitor">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_VisitorResMapper.xml

@@ -68,6 +68,27 @@
         </foreach >
     </insert>
 
+    <select id="select" resultMap="visitorRes">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.appId != null and request.appId != 0">
+            AND APP_ID = ${r'#'}{request.appId}
+        </if>
+        <if test="request.appKey != null and request.appKey != ''">
+            AND APP_KEY = ${r'#'}{request.appKey}
+        </if>
+        <if test="request.resId != null and request.resId != 0">
+            AND RES_ID = ${r'#'}{request.resId}
+        </if>
+        <if test="request.resCode != null and request.resCode != ''">
+            AND RES_CODE = ${r'#'}{request.resCode}
+        </if>
+    </select>
+
     <select id="find" resultMap="visitorRes">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SequenceMapper.java

@@ -63,7 +63,16 @@ public interface SequenceMapper {
     long update(@Param("request") Sequence request, @Param("token") Token token);
 
     /**
-     * 查询
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<Sequence> select(@Param("request") Sequence request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/TaskSqlMapper.java

@@ -63,7 +63,16 @@ public interface TaskSqlMapper {
     long update(@Param("request") TaskSql request, @Param("token") Token token);
 
     /**
-     * 查询
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<TaskSql> select(@Param("request") TaskSql request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/TokensMapper.java

@@ -63,7 +63,16 @@ public interface TokensMapper {
     long update(@Param("request") Tokens request, @Param("token") Token token);
 
     /**
-     * 查询
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<Tokens> select(@Param("request") Tokens request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/UserMapper.java

@@ -72,7 +72,16 @@ public interface UserMapper {
     long changePwd(@Param("request") User request, @Param("token") Token token);
 
     /**
-     * 查询
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<User> select(@Param("request") User request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/UserRoleMapper.java

@@ -63,7 +63,16 @@ public interface UserRoleMapper {
     long update(@Param("request") UserRole request, @Param("token") Token token);
 
     /**
-     * 查询
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<UserRole> select(@Param("request") UserRole request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/VisitorMapper.java

@@ -63,7 +63,16 @@ public interface VisitorMapper {
     long update(@Param("request") Visitor request, @Param("token") Token token);
 
     /**
-     * 查询
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<Visitor> select(@Param("request") Visitor request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/VisitorResMapper.java

@@ -63,7 +63,16 @@ public interface VisitorResMapper {
     long update(@Param("request") VisitorRes request, @Param("token") Token token);
 
     /**
-     * 查询
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<VisitorRes> select(@Param("request") VisitorRes request, @Param("token") Token token);
+
+    /**
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/wsys/req/RoleLoadRequest.java

@@ -0,0 +1,80 @@
+package ${domain}.module.wsys.req;
+
+import ${domain}.frame.base.BaseFindRequest;
+
+import java.util.Date;
+
+/**
+ * RoleLoadRequest -  角色加载
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2017-01-01
+ */
+public class RoleLoadRequest extends BaseFindRequest {
+
+    /**
+     * 角色代码
+     */
+    private String code;
+
+    /**
+     * 角色名称
+     */
+    private String name;
+
+    /**
+     * 角色描述
+     */
+    private String comment;
+
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getComment() {
+        return this.comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsys/req/UserResetPwdRequest.java

@@ -0,0 +1,26 @@
+package ${domain}.module.wsys.req;
+
+import ${domain}.frame.base.BaseUpdateRequest;
+
+/**
+ * UserUpdateRequest - 用户更新
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2017-01-01
+ */
+public class UserResetPwdRequest extends BaseUpdateRequest {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsys/rsp/RoleLoadResponse.java

@@ -0,0 +1,14 @@
+package ${domain}.module.wsys.rsp;
+
+import ${domain}.frame.base.BaseFindResponse;
+import ${domain}.module.wsys.ent.Role;
+
+/**
+ * RoleLoadResponse - 角色加载
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2017-01-01
+ */
+public class RoleLoadResponse extends BaseFindResponse<Role> {
+}

src/main/resources/modules/SpringBoot/java/module/wsys/rsp/UserResetPwdResponse.java

@@ -0,0 +1,26 @@
+package ${domain}.module.wsys.rsp;
+
+import ${domain}.frame.base.BaseResponse;
+
+/**
+ * UserUpdateResponse - 用户
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2017-01-01
+ */
+public class UserResetPwdResponse extends BaseResponse {
+
+    /**
+     * 更新数目
+     */
+    private Long result;
+
+    public Long getResult() {
+        return this.result;
+    }
+
+    public void setResult(Long result) {
+        this.result = result;
+    }
+}

src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl

@@ -33,6 +33,9 @@
                 ${print('<#if token.hasRes("DEV_RES")>')}
                 <el-menu-item index="${uuid()}" @click="addTab({title: '资源管理', name: 'res', url: '${r'${context}'}/wsys/res.htm'})">资源管理</el-menu-item>
                 ${print('</#if>')}
+                ${print('<#if token.hasRes("DEV_ROLE")>')}
+                <el-menu-item index="${uuid()}" @click="addTab({title: '角色管理', name: 'role', url: '${r'${context}'}/wsys/role.htm'})">角色管理</el-menu-item>
+                ${print('</#if>')}
                 ${print('<#if token.hasRes("DEV_TASK_SQL")>')}
                 <el-menu-item index="${uuid()}" @click="addTab({title: 'SQL任务', name: 'taskSql', url: '${r'${context}'}/wsys/taskSql.htm'})">SQL任务</el-menu-item>
                 ${print('</#if>')}
@@ -64,11 +67,18 @@
                     <i class="el-icon-setting"></i>
                     <span slot="title">基础设置</span>
                 </template>
+                ${print('<#if token.hasRes("SYS_DICT")>')}
                 <el-menu-item index="${uuid()}" @click="addTab({title: '字典管理', name: 'dict', url: '${r'${context}'}/wsys/dict.htm'})">字典管理</el-menu-item>
-                <el-menu-item index="${uuid()}" @click="addTab({title: '角色管理', name: 'role', url: '${r'${context}'}/wsys/role.htm'})">角色管理</el-menu-item>
+                ${print('</#if>')}
-                <el-menu-item index="${uuid()}" @click="addTab({title: '部门管理', name: 'dept', url: '${r'${context}'}/wsys/dept.htm'})">部门管理</el-menu-item>
+                ${print('<#if token.hasRes("SYS_USER")>')}
                 <el-menu-item index="${uuid()}" @click="addTab({title: '用户管理', name: 'user', url: '${r'${context}'}/wsys/user.htm'})">用户管理</el-menu-item>
+                ${print('</#if>')}
+                ${print('<#if token.hasRes("SYS_DEPT")>')}
+                <el-menu-item index="${uuid()}" @click="addTab({title: '部门管理', name: 'dept', url: '${r'${context}'}/wsys/dept.htm'})">部门管理</el-menu-item>
+                ${print('</#if>')}
+                ${print('<#if token.hasRes("SYS_FILE")>')}
                 <el-menu-item index="${uuid()}" @click="addTab({title: '文件管理', name: 'file', url: '${r'${context}'}/wsys/file.htm'})">文件管理</el-menu-item>
+                ${print('</#if>')}
             </el-submenu>
             ${print('</#if>')}
 <#list project.modules as module>

src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl

@@ -180,6 +180,9 @@
             <el-form-item label="用户密码" prop="userPwd" v-if="!form.id">
                 <el-input v-model="form.userPwd" clearable size="mini" autocomplete="off" placeholder="请输入用户密码"></el-input>
             </el-form-item>
+            <el-form-item label="用户密码" v-if="form.id">
+                <el-button type="primary" size="mini" @click="onResetPwd">重置密码</el-button>
+            </el-form-item>
             <el-form-item label="所属部门" prop="deptCode">
                 <el-input-dept v-model="form.deptCode" clearable size="mini" placeholder="请选择所属部门"></el-input-dept>
             </el-form-item>
@@ -311,7 +314,7 @@
                 });
             },
             loadRoles: function () {
-                new Ajax("wsys", "role").find({pageSize: 0}, function (response) {
+                new Ajax("wsys", "role", "load").post({pageSize: 0}, function (response) {
                     if (response.errors.length > 0) {
                         nav.e(response.errors[0].message);
                     } else {
@@ -323,6 +326,15 @@
                     }
                 }.bind(this))
             },
+            onResetPwd: function () {
+                new Ajax("wsys", "user", "resetPwd").post(this.form, function (response) {
+                    if (response.errors.length > 0) {
+                        nav.e(response.errors[0].message);
+                    } else {
+                        nav.s("重置成功!");
+                    }
+                }.bind(this))
+            },
         },
         mounted: function () {
             this.onFind();

src/main/resources/modules/SpringBoot/test/DataInit.java

@@ -111,29 +111,43 @@ public class DataInit {
                 forDev.add(createRes("01020106", "资源编辑", "WEB", "/ajax/wsys/res/update"));
                 forDev.add(createRes("01020107", "资源查询", "WEB", "/ajax/wsys/res/find"));
                 forDev.add(createRes("01020108", "资源获取", "WEB", "/ajax/wsys/res/get"));
-                forDev.add(createRes("0103", "SQL任务菜单", "WEB", "DEV_TASK_SQL"));
+                forDev.add(createRes("0103", "角色管理菜单", "WEB", "DEV_ROLE"));
-                forDev.add(createRes("010301", "SQL任务管理页", "WEB", "/wsys/taskSql.htm"));
+                forDev.add(createRes("010301", "角色管理页", "WEB", "/wsys/role.htm"));
-                forDev.add(createRes("01030101", "SQL任务模板", "WEB", "/ajax/wsys/taskSql/template"));
+                forDev.add(createRes("01030101", "角色模板", "WEB", "/ajax/wsys/role/template"));
-                forDev.add(createRes("01030102", "SQL任务导入", "WEB", "/ajax/wsys/taskSql/imports"));
+                forDev.add(createRes("01030102", "角色导入", "WEB", "/ajax/wsys/role/imports"));
-                forDev.add(createRes("01030103", "SQL任务导出", "WEB", "/ajax/wsys/taskSql/exports"));
+                forDev.add(createRes("01030103", "角色导出", "WEB", "/ajax/wsys/role/exports"));
-                forDev.add(createRes("01030104", "SQL任务新增", "WEB", "/ajax/wsys/taskSql/create"));
+                forDev.add(createRes("01030104", "角色新增", "WEB", "/ajax/wsys/role/create"));
-                forDev.add(createRes("01030105", "SQL任务删除", "WEB", "/ajax/wsys/taskSql/delete"));
+                forDev.add(createRes("01030105", "角色删除", "WEB", "/ajax/wsys/role/delete"));
-                forDev.add(createRes("01030106", "SQL任务编辑", "WEB", "/ajax/wsys/taskSql/update"));
+                forDev.add(createRes("01030106", "角色更新", "WEB", "/ajax/wsys/role/update"));
-                forDev.add(createRes("01030107", "SQL任务查询", "WEB", "/ajax/wsys/taskSql/find"));
+                forDev.add(createRes("01030107", "角色查询", "WEB", "/ajax/wsys/role/find"));
-                forDev.add(createRes("01030108", "SQL任务获取", "WEB", "/ajax/wsys/taskSql/get"));
+                forDev.add(createRes("01030108", "角色获取", "WEB", "/ajax/wsys/role/get"));
-                forDev.add(createRes("0104", "应用接入管理菜单", "WEB", "DEV_VISITOR"));
+                forDev.add(createRes("01030109", "角色加载", "WEB", "/ajax/wsys/role/load", true));
-                forDev.add(createRes("010401", "应用接入管理页", "WEB", "/wsys/visitor.htm"));
+                forDev.add(createRes("01030110", "角色资源分配", "WEB", "/ajax/wsys/roleRes/check"));
-                forDev.add(createRes("01040101", "应用接入模板", "WEB", "/ajax/wsys/visitor/template"));
+                forDev.add(createRes("01030111", "角色资源关系查询", "WEB", "/ajax/wsys/roleRes/find"));
-                forDev.add(createRes("01040102", "应用接入导入", "WEB", "/ajax/wsys/visitor/imports"));
+                forDev.add(createRes("01030112", "资源树查询", "WEB", "/ajax/wsys/res/tree"));
-                forDev.add(createRes("01040103", "应用接入导出", "WEB", "/ajax/wsys/visitor/exports"));
+                forDev.add(createRes("0104", "SQL任务菜单", "WEB", "DEV_TASK_SQL"));
-                forDev.add(createRes("01040104", "应用接入新增", "WEB", "/ajax/wsys/visitor/create"));
+                forDev.add(createRes("010401", "SQL任务管理页", "WEB", "/wsys/taskSql.htm"));
-                forDev.add(createRes("01040105", "应用接入删除", "WEB", "/ajax/wsys/visitor/delete"));
+                forDev.add(createRes("01040101", "SQL任务模板", "WEB", "/ajax/wsys/taskSql/template"));
-                forDev.add(createRes("01040106", "应用接入更新", "WEB", "/ajax/wsys/visitor/update"));
+                forDev.add(createRes("01040102", "SQL任务导入", "WEB", "/ajax/wsys/taskSql/imports"));
-                forDev.add(createRes("01040107", "应用接入查询", "WEB", "/ajax/wsys/visitor/find"));
+                forDev.add(createRes("01040103", "SQL任务导出", "WEB", "/ajax/wsys/taskSql/exports"));
-                forDev.add(createRes("01040108", "应用资源关系新增", "WEB", "/ajax/wsys/visitorRes/create"));
+                forDev.add(createRes("01040104", "SQL任务新增", "WEB", "/ajax/wsys/taskSql/create"));
-                forDev.add(createRes("01040109", "应用资源关系删除", "WEB", "/ajax/wsys/visitorRes/delete"));
+                forDev.add(createRes("01040105", "SQL任务删除", "WEB", "/ajax/wsys/taskSql/delete"));
-                forDev.add(createRes("01040110", "应用资源关系更新", "WEB", "/ajax/wsys/visitorRes/update"));
+                forDev.add(createRes("01040106", "SQL任务编辑", "WEB", "/ajax/wsys/taskSql/update"));
-                forDev.add(createRes("01040111", "应用资源关系查询", "WEB", "/ajax/wsys/visitorRes/find"));
+                forDev.add(createRes("01040107", "SQL任务查询", "WEB", "/ajax/wsys/taskSql/find"));
+                forDev.add(createRes("01040108", "SQL任务获取", "WEB", "/ajax/wsys/taskSql/get"));
+                forDev.add(createRes("0105", "应用接入管理菜单", "WEB", "DEV_VISITOR"));
+                forDev.add(createRes("010501", "应用接入管理页", "WEB", "/wsys/visitor.htm"));
+                forDev.add(createRes("01050101", "应用接入模板", "WEB", "/ajax/wsys/visitor/template"));
+                forDev.add(createRes("01050102", "应用接入导入", "WEB", "/ajax/wsys/visitor/imports"));
+                forDev.add(createRes("01050103", "应用接入导出", "WEB", "/ajax/wsys/visitor/exports"));
+                forDev.add(createRes("01050104", "应用接入新增", "WEB", "/ajax/wsys/visitor/create"));
+                forDev.add(createRes("01050105", "应用接入删除", "WEB", "/ajax/wsys/visitor/delete"));
+                forDev.add(createRes("01050106", "应用接入更新", "WEB", "/ajax/wsys/visitor/update"));
+                forDev.add(createRes("01050107", "应用接入查询", "WEB", "/ajax/wsys/visitor/find"));
+                forDev.add(createRes("01050108", "应用资源关系新增", "WEB", "/ajax/wsys/visitorRes/create"));
+                forDev.add(createRes("01050109", "应用资源关系删除", "WEB", "/ajax/wsys/visitorRes/delete"));
+                forDev.add(createRes("01050110", "应用资源关系更新", "WEB", "/ajax/wsys/visitorRes/update"));
+                forDev.add(createRes("01050111", "应用资源关系查询", "WEB", "/ajax/wsys/visitorRes/find"));
 
                 forDev.add(createRes("02", "监控运行菜单", "WEB", "MNT"));
                 forDev.add(createRes("0201", "登录管理菜单", "WEB", "MNT_TOKENS"));
@@ -192,6 +206,8 @@ public class DataInit {
                 forMgr.add(createRes("03030106", "用户更新", "WEB", "/ajax/wsys/user/update"));
                 forMgr.add(createRes("03030107", "用户查询", "WEB", "/ajax/wsys/user/find"));
                 forMgr.add(createRes("03030108", "用户获取", "WEB", "/ajax/wsys/user/get"));
+                forMgr.add(createRes("03030109", "修改密码", "WEB", "/ajax/wsys/user/ChangePwd", true));
+                forMgr.add(createRes("03030110", "重置密码", "WEB", "/ajax/wsys/user/ResetPwd"));
 
                 forMgr.add(createRes("0304", "机构管理菜单", "WEB", "SYS_DEPT"));
                 forMgr.add(createRes("030401", "机构管理页", "WEB", "/wsys/dept.htm"));
@@ -205,24 +221,10 @@ public class DataInit {
                 forMgr.add(createRes("03040108", "机构导入", "WEB", "/ajax/wsys/dept/imports"));
                 forMgr.add(createRes("03040109", "机构导出", "WEB", "/ajax/wsys/dept/exports"));
 
-                forMgr.add(createRes("0304", "文件管理菜单", "WEB", "SYS_FILE"));
+                forMgr.add(createRes("0305", "文件管理菜单", "WEB", "SYS_FILE"));
-                forMgr.add(createRes("030401", "文件管理页", "WEB", "/wsys/file.htm"));
+                forMgr.add(createRes("030501", "文件管理页", "WEB", "/wsys/file.htm"));
-                forMgr.add(createRes("03040101", "文件删除", "WEB", "/ajax/wsys/file/delete"));
+                forMgr.add(createRes("03050101", "文件删除", "WEB", "/ajax/wsys/file/delete"));
-                forMgr.add(createRes("03040102", "文件查询", "WEB", "/ajax/wsys/file/find"));
+                forMgr.add(createRes("03050102", "文件查询", "WEB", "/ajax/wsys/file/find"));
-
-                forMgr.add(createRes("0305", "角色管理菜单", "WEB", "SYS_ROLE"));
-                forMgr.add(createRes("030501", "角色管理页", "WEB", "/wsys/role.htm"));
-                forMgr.add(createRes("03050101", "角色模板", "WEB", "/ajax/wsys/role/template"));
-                forMgr.add(createRes("03050102", "角色导入", "WEB", "/ajax/wsys/role/imports"));
-                forMgr.add(createRes("03050103", "角色导出", "WEB", "/ajax/wsys/role/exports"));
-                forMgr.add(createRes("03050104", "角色新增", "WEB", "/ajax/wsys/role/create"));
-                forMgr.add(createRes("03050105", "角色删除", "WEB", "/ajax/wsys/role/delete"));
-                forMgr.add(createRes("03050106", "角色更新", "WEB", "/ajax/wsys/role/update"));
-                forMgr.add(createRes("03050107", "角色查询", "WEB", "/ajax/wsys/role/find"));
-                forMgr.add(createRes("03050108", "角色获取", "WEB", "/ajax/wsys/role/get"));
-                forMgr.add(createRes("03050109", "角色资源分配", "WEB", "/ajax/wsys/roleRes/check"));
-                forMgr.add(createRes("03050100", "角色资源关系查询", "WEB", "/ajax/wsys/roleRes/find"));
-                forMgr.add(createRes("03050110", "资源树查询", "WEB", "/ajax/wsys/res/tree"));
 
 <#list project.modules as module>
 <#assign index = module_index + 4/>
@@ -386,6 +388,7 @@ public class DataInit {
             res.setId(resCreateResponse.getId());
             return res;
         } else {
+            System.err.println("已经存在的资源:" + value);
             return resFindResponse.getResult().get(0);
         }
     }