diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java index 741eeabe3d894d34c671b9562d792c21af8adc30..36cbe67c93ec8732b8c10c78f613907ed398e4fb 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java @@ -1,6 +1,6 @@ /** * Copyright(C): CETC-32 - * @Description: 数据管理配置 + * @Description: 权限管理 * @author: youqing * @version: 1.0 * @date: 2020/9/11 10:55 @@ -15,7 +15,6 @@ import com.cetc32.dh.config.RedisUtil; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; @@ -30,8 +29,17 @@ import java.io.UnsupportedEncodingException; @RestController @RequestMapping("/rest/auth/") public class AuthController { + @Autowired RedisUtil redisUtil; + + /** + * 用户登陆 + * @param username + * @param password + * @return ResponseResult + * 备注:无 + */ @PostMapping("/login") public ResponseResult login2(@RequestParam String username, @RequestParam String password){ /*User user=userService.getUserByPass(username, password); @@ -41,23 +49,23 @@ public class AuthController { redisUtil.set(username,currentTimeMillis,60*30); return ResponseResult.success(200,"登陆成功",token); } + /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： + * 非授权用户登陆 + * @param message + * @return ResponseResult + * 备注:无 */ @RequestMapping(path = "/unauthorized/{message}") public ResponseResult unauthorized(@PathVariable String message) throws UnsupportedEncodingException { return ResponseResult.fail(message); } + /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： + * 注销 + * @param request + * @return ResponseResult + * 备注:无 */ @DeleteMapping("/logout") @RequiresAuthentication diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java index 9b1fae4e7dc6129470f4ce4b8fb1f7c3ae3cfbd9..df804bbe9f759513651e7ef66ede9136a9724d93 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java @@ -31,7 +31,6 @@ import java.util.List; @Slf4j @RestController @RequestMapping("/rest/datamng/file") - public class DataFileController { @Autowired diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java index 97237f908b393b088deb9feb2aea45670ac554e5..c3f0aabf42c8468cbee45d9bafcf172c055e9b74 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java @@ -20,9 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Slf4j -@RestController -@RequestMapping("/rest/datamng/menu") /** * 数据管理目录类 * @author: xiao @@ -30,6 +27,9 @@ import java.util.List; * @date: 2020/10/14 * 备注:无 */ +@Slf4j +@RestController +@RequestMapping("/rest/datamng/menu") public class DataMenuController { @Autowired diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java index 9af6319379f0475430feebb67e30927634bea198..688a4b4c4a3c19540f53676c8af6d916457281a4 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java @@ -24,10 +24,7 @@ import org.springframework.web.bind.annotation.RestController; import com.cetc32.dh.service.VfileMenuService; import java.util.Date; import java.util.List; -@Api(value="Data File Info") -@Slf4j -@RestController -@RequestMapping("/rest/file/") + /** * 数据管理文件目录视图类 * @author: xiao @@ -35,6 +32,10 @@ import java.util.List; * @date: 2020/10/14 * 备注:无 */ +@Api(value="Data File Info") +@Slf4j +@RestController +@RequestMapping("/rest/file/") public class VfileMenuController { @Autowired @@ -188,7 +189,11 @@ public class VfileMenuController { pageSize = 10; pdr.setTotals(vfileMenuService.countFilesByObj(vfileMenu)); - pdr.setList(vfileMenuService.queryFilesByObj((pageNum - 1) * pageSize,pageSize,vfileMenu)); + List vfileMenuList = vfileMenuService.queryFilesByObj((pageNum - 1) * pageSize,pageSize,vfileMenu); + for(int i=0;i * @auther: youqing * @date: 2018/11/30 11:35 */ @@ -108,15 +97,10 @@ public class PermissionController { return permissionService.parentPermissionList(); } - - - /** - * * 功能描述:设置权限[新增或更新] - * - * @param: - * @return: + * @param permission + * @return: Map * @auther: youqing * @date: 2018/11/30 9:42 */ @@ -136,11 +120,9 @@ public class PermissionController { } /** - * * 功能描述: 删除权限菜单 - * - * @param: - * @return: + * @param id + * @return: Map * @auther: youqing * @date: 2018/11/30 12:02 */ @@ -154,14 +136,9 @@ public class PermissionController { return data; } - - /** - * * 功能描述: 获取登陆用户的权限 - * - * @param: - * @return: + * @return: Map * @auther: youqing * @date: 2018/12/4 9:48 */ diff --git a/src/main/java/com/cetc32/dh/controller/system/RoleController.java b/src/main/java/com/cetc32/dh/controller/system/RoleController.java index 1bbee20a75d3371f88120266ea46cc8b3e3080b7..bad228f7d47863501956ec2207f1ff2298595880 100644 --- a/src/main/java/com/cetc32/dh/controller/system/RoleController.java +++ b/src/main/java/com/cetc32/dh/controller/system/RoleController.java @@ -1,6 +1,6 @@ /** * Copyright(C): CETC-32 - * @Description: 数据管理配置 + * @Description: 角色管理 * @author: youqing * @version: 1.0 * @date: 2020/9/11 10:55 @@ -17,12 +17,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; - import java.util.HashMap; import java.util.List; import java.util.Map; - /** * @Title: RoleController * @Description: 角色管理 @@ -40,7 +38,7 @@ public class RoleController { /** * 跳转到角色管理 - * @return + * @return String */ @RequestMapping("/roleManage") public String toPage() { @@ -49,11 +47,10 @@ public class RoleController { } /** - * * 功能描述: 获取角色列表 - * - * @param: - * @return: + * @param pageNum + * @param pageSize + * @return: PageDataResult * @auther: youqing * @date: 2018/11/21 14:29 */ @@ -82,11 +79,8 @@ public class RoleController { } /** - * * 功能描述: 获取角色列表 - * - * @param: - * @return: + * @return: List * @auther: youqing * @date: 2018/12/3 13:22 */ @@ -98,11 +92,9 @@ public class RoleController { } /** - * *述: 设置角色[新增或更新] - * - * @param: - * @return: + * @param role + * @return: Map * @auther: youqing * @date: 2018/12/3 10:54 */ @@ -123,11 +115,10 @@ public class RoleController { /** - * * 功能描述: 删除/恢复角色 - * - * @param: - * @return: + * @param id + * @param status + * @return: Map * @auther: youqing * @date: 2018/11/21 16:00 */ diff --git a/src/main/java/com/cetc32/dh/controller/system/UserController.java b/src/main/java/com/cetc32/dh/controller/system/UserController.java index fd9f03d78b9df05addead3a9a655f2ab25b301c3..69b532670507ed853e05ec4d5827c864c58a4fe1 100644 --- a/src/main/java/com/cetc32/dh/controller/system/UserController.java +++ b/src/main/java/com/cetc32/dh/controller/system/UserController.java @@ -1,6 +1,6 @@ /** * Copyright(C): CETC-32 - * @Description: 数据管理配置 + * @Description: 用户控制 * @author: youqing * @version: 1.0 * @date: 2020/9/11 10:55 @@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; - import javax.management.ValueExp; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -52,13 +51,12 @@ public class UserController { @Autowired private AdminUserService adminUserService; - /** - * * 功能描述: 登入系统 - * - * @param: - * @return: + * @param request + * @param loginDTO + * @param session + * @return:Map * @auther: youqing * @date: 2018/11/22 15:47 */ @@ -69,7 +67,6 @@ public class UserController { Map data = new HashMap(); // 使用 shiro 进行登录 Subject subject = SecurityUtils.getSubject(); - String userName = loginDTO.getUsername().trim(); String password = loginDTO.getPassword().trim(); String rememberMe = loginDTO.getRememberMe(); @@ -121,11 +118,10 @@ public class UserController { } /** - * * 功能描述: 修改密码 - * - * @param: - * @return: + * @param pwd + * @param isPwd + * @return:Map * @auther: youqing * @date: 2018/11/22 17:26 */ @@ -156,11 +152,8 @@ public class UserController { } /** - * * 功能描述: 跳到系统用户列表 - * - * @param: - * @return: + * @return:String * @auther: youqing * @date: 2018/11/21 13:50 */ @@ -170,11 +163,11 @@ public class UserController { } /** - * * 功能描述: 分页查询用户列表 - * - * @param: - * @return: + * @param pageNum + * @param pageSize + * @param userSearch + * @return:PageDataResult * @auther: youqing * @date: 2018/11/21 11:10 */ @@ -203,13 +196,10 @@ public class UserController { return pdr; } - /** - * * 功能描述: 新增和更新系统用户 - * - * @param: - * @return: + * @param user + * @return:Map * @auther: youqing * @date: 2018/11/22 10:14 */ @@ -228,11 +218,10 @@ public class UserController { /** - * * 功能描述: 删除/恢复 用户 - * - * @param: - * @return: + * @param id + * @param status + * @return:Map * @auther: youqing * @date: 2018/11/22 11:59 */ diff --git a/src/main/java/com/cetc32/dh/entity/VfileMenu.java b/src/main/java/com/cetc32/dh/entity/VfileMenu.java index d3ae36800615ab278482f63be904313c15b742cd..22b05ac1f65e49109d57e25d912b6f1c372ccd7c 100644 --- a/src/main/java/com/cetc32/dh/entity/VfileMenu.java +++ b/src/main/java/com/cetc32/dh/entity/VfileMenu.java @@ -51,6 +51,11 @@ public class VfileMenu { this.fileYear=fileYear; } + /** + * 显示序号numberId + */ + private Integer numberId; + /** * 文件fileId */ @@ -229,4 +234,18 @@ public class VfileMenu { public void setFileYear(Integer fileYear) { this.fileYear = fileYear; } + + /** + * @return numberId + */ + public Integer getNumberId() { + return numberId; + } + + /** + * @param numberId + */ + public void setNumberId(Integer numberId) { + this.numberId = numberId; + } }