Browse Source

controller参数统一改为字符串接收

xusl 2 năm trước cách đây
mục cha
commit
cb5ffee289

+ 16 - 4
backend/src/main/java/com/jiayue/ssi/controller/SysAlarmController.java

@@ -1,11 +1,13 @@
 package com.jiayue.ssi.controller;
 
+import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jiayue.ssi.constant.CustomException;
 import com.jiayue.ssi.entity.SysAlarm;
 import com.jiayue.ssi.service.SysAlarmService;
 import com.jiayue.ssi.util.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.*;
@@ -44,13 +46,23 @@ public class SysAlarmController {
      * 查收提交
      */
     @PostMapping(value = "/readDone")
-    public ResponseVO readDone(Long id) throws CustomException {
+    public ResponseVO readDone(String id) throws CustomException {
         try {
-            if (id == null) {
-                return ResponseVO.fail("id不能为空!");
+            Long commitid;
+            if (StringUtils.isNotEmpty(id)) {
+                if (NumberUtil.isLong(id)){
+                    commitid = Long.parseLong(id);
+                }
+                else{
+                    return ResponseVO.fail("id不是类型不对!");
+                }
             }
+            else{
+                return ResponseVO.fail("id不能为空!");
+            }
+
             SysAlarm sysAlarm = new SysAlarm();
-            sysAlarm.setId(id);
+            sysAlarm.setId(commitid);
             boolean bo = sysAlarmService.removeById(sysAlarm);
             if (bo) {
                 return ResponseVO.success("告警查收成功");

+ 28 - 4
backend/src/main/java/com/jiayue/ssi/controller/SysMenuController.java

@@ -186,9 +186,21 @@ public class SysMenuController {
      * 根据菜单编号获取详细信息
      */
     @GetMapping(value = "/{getDetailInfo}")
-    public ResponseVO getDetailInfo(Long menuId) throws CustomException {
+    public ResponseVO getDetailInfo(String menuId) throws CustomException {
         try {
-            SysMenu sysMenu = sysMenuService.selectMenuById(menuId);
+            Long menuid;
+            if (StringUtils.isNotEmpty(menuId)) {
+                if (NumberUtil.isLong(menuId)){
+                    menuid = Long.parseLong(menuId);
+                }
+                else{
+                    return ResponseVO.fail("菜单id不是类型不对!");
+                }
+            }
+            else{
+                return ResponseVO.fail("菜单id不能为空!");
+            }
+            SysMenu sysMenu = sysMenuService.selectMenuById(menuid);
             return ResponseVO.success(sysMenu);
         } catch (Exception e) {
             throw new CustomException("获取菜单明细异常", e);
@@ -242,11 +254,23 @@ public class SysMenuController {
      * 加载对应角色菜单列表树
      */
     @GetMapping(value = "/roleMenuTreeselect")
-    public ResponseVO roleMenuTreeselect(Long roleId) throws CustomException {
+    public ResponseVO roleMenuTreeselect(String roleId) throws CustomException {
         try {
+            Long roleid;
+            if (StringUtils.isNotEmpty(roleId)) {
+                if (NumberUtil.isLong(roleId)){
+                    roleid = Long.parseLong(roleId);
+                }
+                else{
+                    return ResponseVO.fail("角色id不是类型不对!");
+                }
+            }
+            else{
+                return ResponseVO.fail("角色id不能为空!");
+            }
             List<SysMenu> menus = sysMenuService.selectMenuList(SecurityContextUtil.getSysUser().getId());
             Map<String, Object> map = new HashMap<>();
-            map.put("checkedKeys", sysMenuService.selectMenuListByRoleId(roleId));
+            map.put("checkedKeys", sysMenuService.selectMenuListByRoleId(roleid));
             map.put("menus", sysMenuService.buildMenuTreeSelect(menus));
             return ResponseVO.success(map);
         } catch (Exception e) {

+ 15 - 2
backend/src/main/java/com/jiayue/ssi/controller/SysRoleController.java

@@ -206,9 +206,22 @@ public class SysRoleController {
      * 根据角色编号获取详细信息
      */
     @GetMapping(value = "getInfo")
-    public ResponseVO getInfo(Long roleId) throws CustomException {
+    public ResponseVO getInfo(String roleId) throws CustomException {
         try {
-            return ResponseVO.success(roleService.selectRoleById(roleId));
+            Long roleid;
+            if (StringUtils.isNotEmpty(roleId)) {
+                if (NumberUtil.isLong(roleId)){
+                    roleid = Long.parseLong(roleId);
+                }
+                else{
+                    return ResponseVO.fail("角色id不是类型不对!");
+                }
+            }
+            else{
+                return ResponseVO.fail("角色id不能为空!");
+            }
+
+            return ResponseVO.success(roleService.selectRoleById(roleid));
         } catch (Exception e) {
             throw new CustomException("角色编号获取异常", e);
         }

+ 27 - 4
backend/src/main/java/com/jiayue/ssi/controller/SysUserController.java

@@ -517,11 +517,34 @@ public class SysUserController {
     @PostMapping("/authRole")
     @PreAuthorize("@ss.hasPermi('system:user:role')")
     @OperateLog(title = "用户管理", businessType = BusinessType.GRANT, auditType = AuditType.SYS)
-    public ResponseVO authRole(Long userId, Long roleId) throws CustomException {
+    public ResponseVO authRole(String userId, String roleId) throws CustomException {
         try {
-            if (userId == null) {
-                return ResponseVO.fail("用户id不能为空!");
+            Long userid;
+            if (StringUtils.isNotEmpty(userId)) {
+                if (NumberUtil.isLong(userId)){
+                    userid = Long.parseLong(userId);
+                }
+                else{
+                    return ResponseVO.fail("用户id不是类型不对!");
+                }
+            }
+            else{
+                return ResponseVO.fail("用户id不能为空!");
             }
+
+            Long roleid;
+            if (StringUtils.isNotEmpty(roleId)) {
+                if (NumberUtil.isLong(roleId)){
+                    roleid = Long.parseLong(roleId);
+                }
+                else{
+                    return ResponseVO.fail("角色id不是类型不对!");
+                }
+            }
+            else{
+                return ResponseVO.fail("角色id不能为空!");
+            }
+
             // 获取审批表是否存在此操作
             QueryWrapper<SysApprove> wrapper = new QueryWrapper<>();
             // 条件:待审批
@@ -534,7 +557,7 @@ public class SysUserController {
             if (list.size() > 0) {
                 return ResponseVO.fail("此记录存在未审批的操作,不能进行修改!");
             }
-            sysUserService.insertUserAuth(userId, roleId);
+            sysUserService.insertUserAuth(userid, roleid);
             return ResponseVO.success("分配角色成功");
         } catch (Exception e) {
             throw new CustomException("分配角色异常", e);

+ 1 - 1
ui/src/views/login/index.vue

@@ -257,7 +257,7 @@ export default {
           this.$axios.post('/user/login', param).then((res) => {
             let tokenStr = doEncrypt(res.data)
             let sign = doSign(res.data)
-            sessionStorage.setItem('token', tokenStr+'&'+sign)
+            sessionStorage.setItem('jy', tokenStr+'&'+sign)
             // 清空路由菜单
             store.commit('SET_R', [])
             this.$router.push('/dashboard')