From b78590619a4913ad40492815d86e59178732c685 Mon Sep 17 00:00:00 2001 From: iamsongpeng Date: Tue, 3 Mar 2020 15:50:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=96=87=E4=BB=B6=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/util/CodeGenerator.java | 2 +- .../admin/SysDepartmentController.java | 21 ++++++++++++++ .../system/entity/SysDepartment.java | 29 +++++++++++++++++++ .../system/mapper/SysDepartmentMapper.java | 16 ++++++++++ .../system/service/ISysDepartmentService.java | 16 ++++++++++ .../impl/SysDepartmentServiceImpl.java | 20 +++++++++++++ sparchetype/src/main/resources/logback.xml | 2 +- .../mapper/system/SysIDepartmentMapper.xml | 5 ++++ .../templates/admin/system/menu/list.ftl | 2 +- .../admin/system/role/addOrUpdate.ftl | 4 +-- .../templates/admin/system/role/list.ftl | 5 ++-- .../admin/system/user/addOrUpdate.ftl | 2 +- .../templates/admin/system/user/list.ftl | 1 - 13 files changed, 115 insertions(+), 10 deletions(-) create mode 100644 sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDepartmentController.java create mode 100644 sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDepartment.java create mode 100644 sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDepartmentMapper.java create mode 100644 sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDepartmentService.java create mode 100644 sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDepartmentServiceImpl.java create mode 100644 sparchetype/src/main/resources/mapper/system/SysIDepartmentMapper.xml diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/CodeGenerator.java b/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/CodeGenerator.java index 2403a4f..42212e3 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/CodeGenerator.java +++ b/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/CodeGenerator.java @@ -44,7 +44,7 @@ public class CodeGenerator { // dsc.setSchemaName("public"); dsc.setDriverName("com.mysql.cj.jdbc.Driver"); dsc.setUsername("root"); - dsc.setPassword("123456"); + dsc.setPassword("root"); mpg.setDataSource(dsc); // 包配置 diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDepartmentController.java b/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDepartmentController.java new file mode 100644 index 0000000..887ffc6 --- /dev/null +++ b/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDepartmentController.java @@ -0,0 +1,21 @@ +package com.songpeng.sparchetype.system.controller.admin; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import com.songpeng.sparchetype.common.BaseController; + +/** + *

+ * 前端控制器 + *

+ * + * @author SongPeng + * @since 2020-03-03 + */ +@Controller +@RequestMapping("/dept/sp-sys-department") +public class SysDepartmentController extends BaseController { + +} diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDepartment.java b/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDepartment.java new file mode 100644 index 0000000..a8f5cbc --- /dev/null +++ b/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDepartment.java @@ -0,0 +1,29 @@ +package com.songpeng.sparchetype.system.entity; + +import com.songpeng.sparchetype.common.BaseEntity; + +/** + *

+ * + *

+ * + * @author SongPeng + * @since 2020-03-03 + */ +public class SysDepartment extends BaseEntity { + + private static final long serialVersionUID = 1L; + + private String parentId; + + private String name; + + private Integer sortNum; + + /** + * 逻辑删除：1 表示删除，0 表示未删除，2 表示禁用 + */ + private String isDeleted; + + +} diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDepartmentMapper.java b/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDepartmentMapper.java new file mode 100644 index 0000000..31df9dd --- /dev/null +++ b/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDepartmentMapper.java @@ -0,0 +1,16 @@ +package com.songpeng.sparchetype.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.songpeng.sparchetype.system.entity.SysDepartment; + +/** + *

+ * Mapper 接口 + *

+ * + * @author SongPeng + * @since 2020-03-03 + */ +public interface SysDepartmentMapper extends BaseMapper { + +} diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDepartmentService.java b/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDepartmentService.java new file mode 100644 index 0000000..32a1708 --- /dev/null +++ b/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDepartmentService.java @@ -0,0 +1,16 @@ +package com.songpeng.sparchetype.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.songpeng.sparchetype.system.entity.SysDepartment; + +/** + *

+ * 服务类 + *

+ * + * @author SongPeng + * @since 2020-03-03 + */ +public interface ISysDepartmentService extends IService { + +} diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDepartmentServiceImpl.java b/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDepartmentServiceImpl.java new file mode 100644 index 0000000..ec33587 --- /dev/null +++ b/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDepartmentServiceImpl.java @@ -0,0 +1,20 @@ +package com.songpeng.sparchetype.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.songpeng.sparchetype.system.entity.SysDepartment; +import com.songpeng.sparchetype.system.mapper.SysDepartmentMapper; +import com.songpeng.sparchetype.system.service.ISysDepartmentService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author SongPeng + * @since 2020-03-03 + */ +@Service +public class SysDepartmentServiceImpl extends ServiceImpl implements ISysDepartmentService { + +} diff --git a/sparchetype/src/main/resources/logback.xml b/sparchetype/src/main/resources/logback.xml index fefcf81..2310d7f 100644 --- a/sparchetype/src/main/resources/logback.xml +++ b/sparchetype/src/main/resources/logback.xml @@ -20,7 +20,7 @@ - + diff --git a/sparchetype/src/main/resources/mapper/system/SysIDepartmentMapper.xml b/sparchetype/src/main/resources/mapper/system/SysIDepartmentMapper.xml new file mode 100644 index 0000000..35dccc2 --- /dev/null +++ b/sparchetype/src/main/resources/mapper/system/SysIDepartmentMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/sparchetype/src/main/resources/templates/admin/system/menu/list.ftl b/sparchetype/src/main/resources/templates/admin/system/menu/list.ftl index 2c64b28..44de482 100644 --- a/sparchetype/src/main/resources/templates/admin/system/menu/list.ftl +++ b/sparchetype/src/main/resources/templates/admin/system/menu/list.ftl @@ -27,6 +27,7 @@ + - \ No newline at end of file diff --git a/sparchetype/src/main/resources/templates/admin/system/role/addOrUpdate.ftl b/sparchetype/src/main/resources/templates/admin/system/role/addOrUpdate.ftl index 3a53039..5046f2d 100644 --- a/sparchetype/src/main/resources/templates/admin/system/role/addOrUpdate.ftl +++ b/sparchetype/src/main/resources/templates/admin/system/role/addOrUpdate.ftl @@ -38,7 +38,7 @@
-
+
checked> checked> checked> @@ -56,7 +56,6 @@
- + \ No newline at end of file diff --git a/sparchetype/src/main/resources/templates/admin/system/role/list.ftl b/sparchetype/src/main/resources/templates/admin/system/role/list.ftl index 40e63bc..c3ced59 100644 --- a/sparchetype/src/main/resources/templates/admin/system/role/list.ftl +++ b/sparchetype/src/main/resources/templates/admin/system/role/list.ftl @@ -37,7 +37,6 @@
- + \ No newline at end of file diff --git a/sparchetype/src/main/resources/templates/admin/system/user/addOrUpdate.ftl b/sparchetype/src/main/resources/templates/admin/system/user/addOrUpdate.ftl index b5d4cdd..cddcefa 100644 --- a/sparchetype/src/main/resources/templates/admin/system/user/addOrUpdate.ftl +++ b/sparchetype/src/main/resources/templates/admin/system/user/addOrUpdate.ftl @@ -192,7 +192,6 @@ - + \ No newline at end of file diff --git a/sparchetype/src/main/resources/templates/admin/system/user/list.ftl b/sparchetype/src/main/resources/templates/admin/system/user/list.ftl index 1a799f6..d37bb50 100644 --- a/sparchetype/src/main/resources/templates/admin/system/user/list.ftl +++ b/sparchetype/src/main/resources/templates/admin/system/user/list.ftl @@ -195,7 +195,6 @@ }); } }); - });