部门 权限 发版

.gitignore

@@ -7,6 +7,9 @@ target/
 sys-debug.log
 sys-error.log
 sys-info.log
+sys-debug*
+sys-info*
+sys-error*
 
 ### STS ###
 .apt_generated

controller/src/main/java/com/koobietech/eas/controller/EasDepartmentController.java

@@ -1,15 +1,19 @@
 package com.koobietech.eas.controller;
 
+import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
 import com.koobietech.eas.service.EasDepartmentService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
 
 @RestController
+@Tag(name = "部门模块")
 @RequestMapping("/department")
 public class EasDepartmentController {
 
@@ -17,13 +21,17 @@ public class EasDepartmentController {
     EasDepartmentService easDepartmentService;
 
 
-    @GetMapping("/query")
-    public JsonResult query(@RequestParam Long id) {
-        PageData ret = easDepartmentService.query(id);
+    @PostMapping("/query")
+    @Operation(summary = "查询部门" ,  description = "根据参数查询基本信息")
+    public JsonResult query(@RequestBody EasSysDepartment department,
+                            @RequestParam Integer pageNum, @RequestParam Integer pageSize ) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageData ret = easDepartmentService.query(department);
         return JsonResult.data(ret);
     }
 
     @PostMapping("/add")
+    @Operation(summary = "添加部门" ,  description = "添加部门信息")
     public JsonResult add(@RequestBody EasSysDepartment department) {
         Boolean ret = easDepartmentService.add(department);
         if (ret) {
@@ -33,8 +41,9 @@ public class EasDepartmentController {
     }
 
 
-    @DeleteMapping("/delete")
-    public JsonResult delete(@RequestParam Long id) {
+    @DeleteMapping("/delete/{id}")
+    @Operation(summary = "删除部门" ,  description = "删除部门根据ID")
+    public JsonResult delete(@PathVariable(name="id") Long id) {
         Boolean ret = easDepartmentService.delete(id);
         if (ret) {
             return JsonResult.ok();
@@ -44,6 +53,7 @@ public class EasDepartmentController {
 
 
     @PutMapping("/update")
+    @Operation(summary = "更新部门" ,  description = "更新部门信息根据ID")
     public JsonResult update(@RequestBody EasSysDepartment department) {
         Boolean ret = easDepartmentService.update(department);
         if (ret) {

controller/src/main/java/com/koobietech/eas/controller/EasPermissionController.java

@@ -1,45 +1,36 @@
 package com.koobietech.eas.controller;
 
+import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysPermission;
 import com.koobietech.eas.service.EasPermissionService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
 
 @RestController
+@Tag(name = "权限模块")
 @RequestMapping("/permission")
 public class EasPermissionController {
 
     @Resource
     EasPermissionService easPermissionService;
 
-    @GetMapping("/home")
-    public String home(){
-        return "home";
-    }
-
-
-    @GetMapping("/lesson")
-    public String lesson(){
-        return "lesson";
-    }
-
-
-    @GetMapping("/lesson-download")
-    public String download(){
-        return "lesson-download";
-    }
-
-    @GetMapping("/query")
-    public PageData query(@RequestParam Integer id){
-        PageData ret = easPermissionService.query(id);
+    @PostMapping("/query")
+    @Operation(summary = "查询权限" ,  description = "根据参数查询基本权限表信息")
+    public PageData query(@RequestBody(required = false) EasSysPermission permission,
+                          @RequestParam Integer pageNum, @RequestParam Integer pageSize ){
+        PageHelper.startPage(pageNum, pageSize);
+        PageData ret = easPermissionService.query(permission);
         return ret;
     }
 
     @PostMapping("/add")
+    @Operation(summary = "添加权限" ,  description = "录入权限表基本信息")
     public JsonResult add(@RequestBody EasSysPermission permission){
         Boolean ret = easPermissionService.add(permission);
         if(ret){
@@ -49,6 +40,7 @@ public class EasPermissionController {
     }
 
     @DeleteMapping("/delete")
+    @Operation(summary = "删除权限" ,  description = "删除权限表数据根据ID")
     public JsonResult delete(@RequestParam Integer id){
         Boolean ret = easPermissionService.delete(id);
         if(ret){
@@ -58,6 +50,7 @@ public class EasPermissionController {
     }
 
     @PutMapping("/update")
+    @Operation(summary = "更新权限" ,  description = "根据ID 更新权限表信息")
     public JsonResult update(@RequestBody EasSysPermission permission){
         Boolean ret = easPermissionService.update(permission);
         if(ret){

service/src/main/java/com/koobietech/eas/service/EasDepartmentService.java

@@ -9,5 +9,5 @@ public interface EasDepartmentService {
     Boolean update(EasSysDepartment department);
     Boolean add(EasSysDepartment department);
     Boolean delete(Long id);
-    PageData query(Long id);
+    PageData query(EasSysDepartment department);
 }

service/src/main/java/com/koobietech/eas/service/EasPermissionService.java

@@ -8,5 +8,5 @@ public interface EasPermissionService {
     Boolean update(EasSysPermission record);
     Boolean add(EasSysPermission record);
     Boolean delete(Integer id);
-    PageData query(Integer id);
+    PageData query(EasSysPermission permission);
 }

service/src/main/java/com/koobietech/eas/service/impl/EasDepartmentServiceImpl.java

@@ -6,10 +6,12 @@ import com.koobietech.eas.mbg.model.EasSysDepartment;
 import com.koobietech.eas.mbg.model.EasSysDepartmentExample;
 import com.koobietech.eas.service.EasDepartmentService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 
 @Service
@@ -20,6 +22,7 @@ public class EasDepartmentServiceImpl implements EasDepartmentService {
 
     @Override
     public Boolean update(EasSysDepartment department) {
+        department.setModifyTime(new Date());
         return easSysDepartmentMapper.updateByPrimaryKey(department) == 1;
     }
 
@@ -36,18 +39,39 @@ public class EasDepartmentServiceImpl implements EasDepartmentService {
     }
 
     @Override
-    public PageData query(Long id) {
-
+    public PageData query(EasSysDepartment department) {
 
         EasSysDepartmentExample departmentExample = new EasSysDepartmentExample();
         EasSysDepartmentExample.Criteria criteria = departmentExample.createCriteria();
-        criteria.andIdEqualTo(id);
-
+        if (Objects.nonNull(department)) {
+            if (Objects.nonNull(department.getId())) {
+                criteria.andIdEqualTo(department.getId());
+            }
+            if (StringUtils.hasText(department.getAddress())) {
+                criteria.andAddressLike("%" + department.getAddress() + "%");
+            }
+            if (StringUtils.hasText(department.getDepname())) {
+                criteria.andDepnameLike("%" + department.getDepname() + "%");
+            }
+            if (StringUtils.hasText(department.getEmail())) {
+                criteria.andEmailLike("%" + department.getEmail() + "%");
+            }
+            if (StringUtils.hasText(department.getManager())) {
+                criteria.andManagerLike("%" + department.getManager() + "%");
+            }
+            if (StringUtils.hasText(department.getPhone())) {
+                criteria.andPhoneLike("%" + department.getPhone() + "%");
+            }
+            if (Objects.nonNull(department.getCreateTime())) {
+                criteria.andCreateTimeGreaterThan(department.getCreateTime());
+            }
+        }
         List<EasSysDepartment> departments =
-                easSysDepartmentMapper.selectByExample(departmentExample);
+                 easSysDepartmentMapper.selectByExample(departmentExample);
+        long l = easSysDepartmentMapper.countByExample(departmentExample);
         PageData ret = new PageData();
         ret.setData(departments);
-        ret.setTotal(1);
+        ret.setTotal(l);
         return ret;
     }
 }

service/src/main/java/com/koobietech/eas/service/impl/EasPermissionServiceImpl.java

@@ -6,10 +6,12 @@ import com.koobietech.eas.mbg.model.EasSysPermission;
 import com.koobietech.eas.mbg.model.EasSysPermissionExample;
 import com.koobietech.eas.service.EasPermissionService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class EasPermissionServiceImpl implements EasPermissionService {
@@ -19,6 +21,7 @@ public class EasPermissionServiceImpl implements EasPermissionService {
 
     @Override
     public Boolean update(EasSysPermission permission) {
+        permission.setModifyTime(new Date());
         return easSysPermissionMapper.updateByPrimaryKey(permission) == 1;
     }
 
@@ -35,18 +38,31 @@ public class EasPermissionServiceImpl implements EasPermissionService {
     }
 
     @Override
-    public PageData query(Integer id) {
-
+    public PageData query(EasSysPermission permission) {
         EasSysPermissionExample easSysPermissionExample = new EasSysPermissionExample();
         EasSysPermissionExample.Criteria criteria = easSysPermissionExample.createCriteria();
-        criteria.andIdEqualTo(id);
-
+        if ( Objects.nonNull(permission) ) {
+            if (Objects.nonNull(permission.getId())) {
+                criteria.andIdEqualTo(permission.getId());
+            }
+            if (Objects.nonNull(permission.getIsActive())) {
+                criteria.andIsActiveEqualTo(permission.getIsActive());
+            }
+            if (StringUtils.hasText(permission.getDisabled())) {
+                criteria.andDisabledEqualTo(permission.getDisabled());
+            }
+            if (StringUtils.hasText(permission.getName())) {
+                criteria.andNameLike("%" + permission.getName() + "%");
+            }
+            if (Objects.nonNull(permission.getCreateTime())) {
+                criteria.andCreateTimeGreaterThan(permission.getCreateTime());
+            }
+        }
         List<EasSysPermission> easSysPermissions = easSysPermissionMapper.selectByExample(easSysPermissionExample);
-        PageData ret = new PageData( );
+        long l = easSysPermissionMapper.countByExample(easSysPermissionExample);
+        PageData ret = new PageData();
         ret.setData(easSysPermissions);
-        ret.setTotal(1);
+        ret.setTotal(l);
         return ret;
     }
-
-
 }