.

src/main/java/cn/drewslab/xvms/domain/Department.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
+import javax.persistence.Transient;
+import java.util.List;
 
 @Data
 @Entity
@@ -19,4 +21,7 @@ public class Department extends BaseEntity {
     private String description;
 
     private Long parent;
+
+    @Transient
+    private List<Department> children;
 }

src/main/java/cn/drewslab/xvms/repo/DepartmentRepo.java

@@ -0,0 +1,19 @@
+package cn.drewslab.xvms.repo;
+
+import cn.drewslab.xvms.domain.Department;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+public interface DepartmentRepo extends JpaRepository<Department, Long>, JpaSpecificationExecutor<Department> {
+    @Query("update Department t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    List<Department> findByParent(Long parent);
+}

src/main/java/cn/drewslab/xvms/repo/StaffRepo.java

@@ -0,0 +1,16 @@
+package cn.drewslab.xvms.repo;
+
+import cn.drewslab.xvms.domain.Staff;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface StaffRepo extends JpaRepository<Staff, Long>, JpaSpecificationExecutor<Staff> {
+    @Query("update Staff t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/cn/drewslab/xvms/service/DepartmentService.java

@@ -0,0 +1,35 @@
+package cn.drewslab.xvms.service;
+
+import cn.drewslab.xvms.domain.Department;
+import cn.drewslab.xvms.dto.PageQuery;
+import cn.drewslab.xvms.repo.DepartmentRepo;
+import cn.drewslab.xvms.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class DepartmentService {
+
+    private DepartmentRepo departmentRepo;
+
+    public Page<Department> all(PageQuery pageQuery) {
+        return departmentRepo
+                .findAll(JpaUtils.toSpecification(pageQuery, Department.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public List<Department> departmentTree() {
+        return getDepartment(1L);
+    }
+
+    private List<Department> getDepartment(Long parent) {
+        List<Department> departments = departmentRepo.findByParent(parent);
+        departments.parallelStream().forEach(department -> {
+            department.setChildren(getDepartment(department.getId()));
+        });
+        return departments;
+    }
+}

src/main/java/cn/drewslab/xvms/service/StaffService.java

@@ -0,0 +1,20 @@
+package cn.drewslab.xvms.service;
+
+import cn.drewslab.xvms.domain.Staff;
+import cn.drewslab.xvms.dto.PageQuery;
+import cn.drewslab.xvms.repo.StaffRepo;
+import cn.drewslab.xvms.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class StaffService {
+
+    private StaffRepo staffRepo;
+
+    public Page<Staff> all(PageQuery pageQuery) {
+        return staffRepo.findAll(JpaUtils.toSpecification(pageQuery, Staff.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/cn/drewslab/xvms/web/DepartmentController.java

@@ -0,0 +1,66 @@
+package cn.drewslab.xvms.web;
+
+import cn.drewslab.xvms.domain.Department;
+import cn.drewslab.xvms.service.DepartmentService;
+import cn.drewslab.xvms.dto.PageQuery;
+import cn.drewslab.xvms.exception.BusinessException;
+import cn.drewslab.xvms.repo.DepartmentRepo;
+import cn.drewslab.xvms.utils.ObjUtils;
+import cn.drewslab.xvms.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/department")
+@AllArgsConstructor
+public class DepartmentController extends BaseController {
+    private DepartmentService departmentService;
+    private DepartmentRepo    departmentRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Department save(@RequestBody Department record) {
+        if (record.getId() != null) {
+            Department orig = departmentRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return departmentRepo.save(orig);
+        }
+        return departmentRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Department> all(@RequestBody PageQuery pageQuery) {
+        return departmentService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Department get(@PathVariable Long id) {
+        return departmentRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        departmentRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Department> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @GetMapping("/tree")
+    @ResponseBody
+    public List<Department> departmentTree() {
+        return departmentService.departmentTree();
+    }
+}
+

src/main/java/cn/drewslab/xvms/web/StaffController.java

@@ -0,0 +1,60 @@
+package cn.drewslab.xvms.web;
+import cn.drewslab.xvms.domain.Staff;
+import cn.drewslab.xvms.service.StaffService;
+import cn.drewslab.xvms.dto.PageQuery;
+import cn.drewslab.xvms.exception.BusinessException;
+import cn.drewslab.xvms.repo.StaffRepo;
+import cn.drewslab.xvms.utils.ObjUtils;
+import cn.drewslab.xvms.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/staff")
+@AllArgsConstructor
+public class StaffController extends BaseController {
+    private StaffService staffService;
+    private StaffRepo staffRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Staff save(@RequestBody Staff record) {
+        if (record.getId() != null) {
+            Staff orig = staffRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return staffRepo.save(orig);
+        }
+        return staffRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Staff> all(@RequestBody PageQuery pageQuery) {
+        return staffService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Staff get(@PathVariable Long id) {
+        return staffRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        staffRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Staff> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/Department.json

@@ -0,0 +1 @@
+{"tableName":"Department","className":"Department","remark":"部门","genTable":true,"genClass":true,"genList":false,"genForm":false,"genRouter":false,"javaPath":"/Users/drew/Projects/Java/xvms/src/main/java/cn/drewslab/xvms","viewPath":"/Users/drew/Projects/Java/xvms/src/main/vue/src/views","routerPath":"/Users/drew/Projects/Java/xvms/src/main/vue/src","resourcesPath":"/Users/drew/Projects/Java/xvms/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"name","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"description","modelName":"description","remark":"description","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"parent","modelName":"parent","remark":"parent","showInList":true,"showInForm":true,"formType":"number"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"cn.drewslab.xvms","tablePackage":"cn.drewslab.xvms.domain.Department"}

src/main/resources/genjson/Staff.json

@@ -0,0 +1 @@
+{"tableName":"Staff","className":"Staff","remark":"人员","genTable":true,"genClass":true,"genList":false,"genForm":false,"genRouter":false,"javaPath":"/Users/drew/Projects/Java/xvms/src/main/java/cn/drewslab/xvms","viewPath":"/Users/drew/Projects/Java/xvms/src/main/vue/src/views","routerPath":"/Users/drew/Projects/Java/xvms/src/main/vue/src","resourcesPath":"/Users/drew/Projects/Java/xvms/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"name","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"phone","modelName":"phone","remark":"phone","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"idNo","modelName":"idNo","remark":"idNo","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"sex","modelName":"sex","remark":"sex","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"birth","modelName":"birth","remark":"birth","showInList":true,"showInForm":true,"formType":"date"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"cn.drewslab.xvms","tablePackage":"cn.drewslab.xvms.domain.Staff"}

src/main/resources/templates/ListViewTemplate.ftl

@@ -133,7 +133,7 @@
                 </#if>
             </#list>
             beforeGetData() {
-                return { search: this.search };
+                return { search: this.search, query: { del: false } };
             },
             toggleMultipleMode(multipleMode) {
                 this.multipleMode = multipleMode;

src/main/vue/src/mixins/pageableTable.js

@@ -7,7 +7,7 @@ export default {
             totalElements: 0,
             tableData: [],
             sort: {},
-            sortStr: '',
+            sortStr: 'createdAt,desc',
             tableHeight: 200,
             fetchingData: false
         };

src/main/vue/src/router.js

@@ -118,6 +118,14 @@ const router = new Router({
                     meta: {
                         title: '异常日志'
                     }
+                },
+                {
+                    path: '/staff',
+                    name: 'Staff',
+                    component: () => import(/* webpackChunkName: "staff" */ '@/views/Staff.vue'),
+                    meta: {
+                        title: '人员管理'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/Staff.vue

@@ -0,0 +1,133 @@
+<template>
+    <div class="edit-view">
+        <el-container class="container">
+            <el-aside class="department-tree">
+                <el-button icon="el-icon-plus" size="mini" class="btn-add" @click="add">添加</el-button>
+                <el-tree
+                    :data="departments"
+                    :props="defaultProps"
+                    @node-click="handleNodeClick"
+                    :render-content="renderContent"
+                    highlight-current
+                ></el-tree>
+            </el-aside>
+        </el-container>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            departments: [],
+            defaultProps: {
+                label: 'name'
+            },
+            selected: null
+        };
+    },
+    created() {
+        this.$http.get('/department/tree').then(res => {
+            this.departments = res;
+        });
+    },
+    methods: {
+        handleNodeClick(data, node, e) {
+            console.log(data, node, e);
+            this.selected = data;
+        },
+        renderContent(h, { node, data, store }) {
+            return (
+                <span class={{ 'custom-tree-node': true, active: this.selected && data.id === this.selected.id }}>
+                    <span>{node.label}</span>
+                    <span>
+                        <el-button
+                            type="text"
+                            size="medium"
+                            icon="el-icon-edit-outline"
+                            on-click={() => this.editDepartment(data)}
+                        ></el-button>
+                        <el-button
+                            type="text"
+                            size="medium"
+                            icon="el-icon-close"
+                            on-click={() => this.remove(node, data)}
+                        ></el-button>
+                    </span>
+                </span>
+            );
+        },
+        add() {
+            this.$prompt('请输入组织名称', '新建组织', {
+                closeOnClickModal: false,
+                closeOnPressEscape: false,
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                inputPattern: /.+/,
+                inputErrorMessage: '请输入组织名称',
+                beforeClose: (action, instance, done) => {
+                    if (action === 'confirm') {
+                        instance.showCancelButton = false;
+                        instance.showClose = false;
+                        instance.confirmButtonLoading = true;
+
+                        this.$http
+                            .post(
+                                '/department/save',
+                                {
+                                    name: instance.inputValue,
+                                    parent: this.selected ? this.selected.id : 1
+                                },
+                                { body: 'json' }
+                            )
+                            .then(res => {
+                                done();
+                                this.$message.success('添加成功');
+                                instance.showCancelButton = true;
+                                instance.showClose = true;
+                                instance.confirmButtonLoading = false;
+                            })
+                            .catch(e => {
+                                done();
+                                this.$message.error(e.error || '添加失败');
+                                instance.showCancelButton = true;
+                                instance.showClose = true;
+                                instance.confirmButtonLoading = false;
+                            });
+                    } else {
+                        done();
+                    }
+                }
+            })
+                .then(({ value }) => {})
+                .catch(() => {});
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.edit-view {
+    box-sizing: border-box;
+    padding: 20px;
+    .container {
+        background: white;
+        .department-tree {
+            padding: 10px;
+            border-right: 1px solid #dcdfe6;
+            .btn-add {
+                margin: 0 0 10px 20px;
+            }
+        }
+    }
+}
+/deep/ .custom-tree-node {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    padding-right: 8px;
+}
+/deep/ .el-tree-node__content {
+    height: 36px;
+}
+</style>