代码修改

notes-pas/src/main/java/com/zjty/tynotes/pas/config/handler/MySuccessHandler.java

@@ -95,7 +95,8 @@ public class MySuccessHandler implements AuthenticationSuccessHandler {
             }
         }
 
-        //        redisTemplate.opsForValue().set(user.getUsername(),0);
+
+        redisTemplate.opsForValue().set(user.getUsername(),0);
         if(("root").equals(user.getUsername())){
             user = init.root;
         }else{

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

@@ -32,11 +32,16 @@ public class ConfigController {
 
     @ApiOperation("保存基础参数配置")
     @PostMapping("/addConfig")
-    public ResponseEntity addConfig(@RequestBody List<Config> configs){
-        return ok(configService.save(configs));
+    public ResponseEntity addConfig(@RequestBody Config config){
+        return ok(configService.save(config));
     }
 
 
+    @ApiOperation("查询基础参数配置")
+    @GetMapping("/findConfig")
+    public ResponseEntity findConfig(){
+        return ok(configService.findConfig());
+    }
 
     @ApiOperation("获取节假日集合")
     @GetMapping("/getHoliday")

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

@@ -17,7 +17,7 @@ public interface ConfigService {
      * @param configs
      * @return
      */
-    List<Config> save(List<Config> configs);
+    Config save(Config configs);
 
     /**
      * 查找节假日
@@ -46,4 +46,7 @@ public interface ConfigService {
      * @return
      */
     List<Day> findHolidaysByMonth(String date);
+
+    Config findConfig();
+
 }

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

@@ -29,8 +29,8 @@ public class ConfigServiceImpl implements ConfigService {
     private DayDao dayDao;
 
     @Override
-    public List<Config> save(List<Config> configs) {
-        return configDao.saveAll(configs);
+    public Config save(Config configs) {
+        return configDao.save(configs);
     }
 
     @Override
@@ -113,4 +113,9 @@ public class ConfigServiceImpl implements ConfigService {
         return null;
     }
 
+    @Override
+    public Config findConfig() {
+        return configDao.findAll().get(0);
+    }
+
 }

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

 package com.zjty.tynotes.pas.service.impl;
 
+import com.zjty.tynotes.pas.dao.AuthorityDao;
 import com.zjty.tynotes.pas.dao.RoleAuthorityDao;
 import com.zjty.tynotes.pas.dao.RoleDao;
 import com.zjty.tynotes.pas.dao.UserRoleDao;
@@ -13,6 +14,7 @@ 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.List;
 import java.util.Optional;
@@ -32,6 +34,8 @@ public class RoleServiceImpl implements IRoleService {
     private RoleAuthorityDao roleAuthorityDao;
     @Autowired
     private UserRoleDao userRoleDao;
+    @Autowired
+    private AuthorityDao authorityDao;
 
     @Override
     public Role findRoleById(String id) {
@@ -41,7 +45,17 @@ public class RoleServiceImpl implements IRoleService {
 
     @Override
     public List<Role> findAll() {
-        return roleDao.findAll();
+        List<Role> roles = roleDao.findAll();
+        for (Role role : roles) {
+            List<String> authorityIds = new ArrayList<>();
+            List<RoleAuthority> roleAuthorities = roleAuthorityDao.findAllByRoleId(role.getId());
+            for (RoleAuthority roleAuthority : roleAuthorities) {
+                authorityIds.add(roleAuthority.getAuthorityId());
+            }
+            List<Authority> authorities = authorityDao.findAllByIdIn(authorityIds);
+            role.setAuthorities(authorities);
+        }
+        return roles;
     }
 
     @Override