合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/controller/ConfigController.java

@@ -67,4 +67,8 @@ public class ConfigController {
         return ok(configService.findHolidaysByMonth(date));
     }
 
+    @ApiOperation("清除所有节假日数据")
+    @GetMapping("/deleteAll")
+    public ResponseEntity deleteAll(){return ok(configService.deleteAll());}
+
 }

notes-pas/src/main/java/com/zjty/tynotes/pas/controller/DepartController.java

@@ -41,19 +41,39 @@ public class DepartController {
         return ok(departmentService.addDepartments(department));
     }
 
+    @ApiOperation(value = "修改部门",response = Department.class)
+    @PutMapping
+    public ResponseEntity updateDepartments(@RequestBody @Valid Department department){
+        boolean b = departmentService.updateDepartment(department);
+        if(b){
+            return ok("修改部门成功");
+        }
+        return ok("修改部门失败");
+    }
+
     @ApiOperation(value = "根据id查找部门")
-    @PostMapping("/findOne")
-    public ResponseEntity<Department> findDept(@RequestParam String id){
+    @GetMapping("/findOne/{id}")
+    public ResponseEntity<Department> findDept(@PathVariable("id") String id){
         return ok(departmentService.findOne(id));
     }
 
 
     @ApiOperation(value = "查找部门列表")
-    @PostMapping("/findList")
+    @GetMapping("/findList")
     public ResponseEntity findList(){
         return ok(departmentService.findList());
     }
 
+    @ApiOperation(value = "删除部门")
+    @DeleteMapping("/deleteDepartment/{id}")
+    public ResponseEntity deleteDepartment(@PathVariable("id") String id){
+        boolean b = departmentService.deleteDepartment(id);
+        if(b){
+            return ok("删除部门成功");
+        }
+        return ok("删除部门失败,可能原因是部门下有角色或者用户");
+    }
+
 
 
 }

notes-pas/src/main/java/com/zjty/tynotes/pas/service/ConfigService.java

@@ -49,4 +49,5 @@ public interface ConfigService {
 
     Config findConfig();
 
+    boolean deleteAll();
 }

notes-pas/src/main/java/com/zjty/tynotes/pas/service/IDepartmentService.java

@@ -40,4 +40,7 @@ public interface IDepartmentService {
      */
     List<Department> findList();
 
+    boolean deleteDepartment(String id);
+
+    boolean updateDepartment(Department department);
 }

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/ConfigServiceImpl.java

@@ -120,4 +120,10 @@ public class ConfigServiceImpl implements ConfigService {
         return configDao.findAll().get(0);
     }
 
+    @Override
+    public boolean deleteAll() {
+        dayDao.deleteAll();
+        return true;
+    }
+
 }

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/DepartmentServiceImpl.java

 package com.zjty.tynotes.pas.service.impl;
 
 import com.zjty.tynotes.pas.dao.DepartmentDao;
+import com.zjty.tynotes.pas.dao.PasUserDao;
+import com.zjty.tynotes.pas.dao.RoleDao;
 import com.zjty.tynotes.pas.entity.Department;
+import com.zjty.tynotes.pas.entity.Role;
+import com.zjty.tynotes.pas.entity.User;
 import com.zjty.tynotes.pas.service.IDepartmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Author: mcj
@@ -24,6 +25,10 @@ public class DepartmentServiceImpl implements IDepartmentService {
 
     @Autowired
     private DepartmentDao departmentDao;
+    @Autowired
+    private RoleDao roleDao;
+    @Autowired
+    private PasUserDao pasUserDao;
 
     @Override
     public List<Department> findAll() {
@@ -54,6 +59,32 @@ public class DepartmentServiceImpl implements IDepartmentService {
         return departmentList;
     }
 
+    @Override
+    public boolean deleteDepartment(String id) {
+        List<Role> roles = roleDao.findAllByDepartmentId(id);
+        List<User> users = pasUserDao.findAllByDepartmentId(id);
+        if(roles!=null && roles.size()!=0 && users!=null && users.size()!=0){
+            departmentDao.deleteById(id);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean updateDepartment(Department department) {
+        Optional<Department> optional = departmentDao.findById(department.getId());
+        if(optional.isPresent()){
+            Department department1 = optional.get();
+            department1.setDescription(department.getDescription());
+            department1.setLevel(department.getLevel());
+            department1.setName(department.getName());
+            department1.setParentId(department.getParentId());
+            departmentDao.save(department1);
+            return true;
+        }
+        return false;
+    }
+
     public void getDepartments(List<Department> departments) {
         for (Department department : departments) {
             List<Department> departmentList = departmentDao.findAllByParentId(department.getId());