修改

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/AdminSysMenuController.java

@@ -43,7 +43,7 @@ public class AdminSysMenuController {
      */
     @ApiOperation(value = "菜单保存", notes = "菜单添加")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result<Integer> save(@RequestBody AdminSysMenuSaveReq sysMenuSaveReq) {
+    public Result<String> save(@RequestBody AdminSysMenuSaveReq sysMenuSaveReq) {
         return biz.save(sysMenuSaveReq);
     }
 
@@ -52,7 +52,7 @@ public class AdminSysMenuController {
      */
     @ApiOperation(value = "菜单删除", notes = "根据ID删除菜单")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    public Result<Integer> delete(@RequestBody AdminSysMenuDeleteReq sysMenuDeleteReq) {
+    public Result<String> delete(@RequestBody AdminSysMenuDeleteReq sysMenuDeleteReq) {
         return biz.delete(sysMenuDeleteReq);
     }
 
@@ -61,7 +61,7 @@ public class AdminSysMenuController {
      */
     @ApiOperation(value = "菜单更新", notes = "菜单修改")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public Result<Integer> update(@RequestBody AdminSysMenuUpdateReq sysMenuUpdateReq) {
+    public Result<String> update(@RequestBody AdminSysMenuUpdateReq sysMenuUpdateReq) {
         return biz.update(sysMenuUpdateReq);
     }
 
@@ -91,5 +91,4 @@ public class AdminSysMenuController {
     public Result<List<String>> permissionList() {
         return biz.permissionList();
     }
-
 }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/AdminSysMenuRoleController.java

@@ -39,7 +39,7 @@ public class AdminSysMenuRoleController {
      */
     @ApiOperation(value = "角色菜单保存", notes = "角色菜单添加")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result<Integer> save(@RequestBody AdminSysMenuRoleSaveReq sysMenuRoleSaveREQ) {
+    public Result<String> save(@RequestBody AdminSysMenuRoleSaveReq sysMenuRoleSaveREQ) {
         return biz.save(sysMenuRoleSaveREQ);
     }
 

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/AdminSysRoleController.java

@@ -39,7 +39,7 @@ public class AdminSysRoleController {
      */
     @ApiOperation(value = "角色保存", notes = "角色添加接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result<Integer> save(@RequestBody AdminSysRoleSaveReq sysRoleSaveREQ) {
+    public Result<String> save(@RequestBody AdminSysRoleSaveReq sysRoleSaveREQ) {
         return biz.save(sysRoleSaveREQ);
     }
 
@@ -48,7 +48,7 @@ public class AdminSysRoleController {
      */
     @ApiOperation(value = "角色删除接口", notes = "角色删除接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    public Result<Integer> delete(@RequestBody AdminSysRoleDeleteReq sysRoleDeleteREQ) {
+    public Result<String> delete(@RequestBody AdminSysRoleDeleteReq sysRoleDeleteREQ) {
         return biz.delete(sysRoleDeleteREQ);
     }
 
@@ -57,7 +57,7 @@ public class AdminSysRoleController {
      */
     @ApiOperation(value = "角色更新接口", notes = "角色更新接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public Result<Integer> update(@RequestBody AdminSysRoleUpdateReq sysRoleUpdateREQ) {
+    public Result<String> update(@RequestBody AdminSysRoleUpdateReq sysRoleUpdateREQ) {
         return biz.update(sysRoleUpdateREQ);
     }
 

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/AdminSysRoleUserController.java

@@ -40,7 +40,7 @@ public class AdminSysRoleUserController {
      */
     @ApiOperation(value = "角色用户保存", notes = "用户角色添加接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result<Integer> save(@RequestBody AdminSysRoleUserSaveReq sysRoleUserSaveREQ) {
+    public Result<String> save(@RequestBody AdminSysRoleUserSaveReq sysRoleUserSaveREQ) {
         return biz.save(sysRoleUserSaveREQ);
     }
 

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/AdminSysUserController.java

@@ -37,7 +37,7 @@ public class AdminSysUserController {
      */
     @ApiOperation(value = "后台管理员添加接口", notes = "后台管理员添加接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result<Integer> save(@RequestBody AdminSysUserSaveReq sysUserSaveREQ) {
+    public Result<String> save(@RequestBody AdminSysUserSaveReq sysUserSaveREQ) {
         return biz.save(sysUserSaveREQ);
     }
 
@@ -46,7 +46,7 @@ public class AdminSysUserController {
      */
     @ApiOperation(value = "后台管理员删除接口", notes = "后台管理员删除接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    public Result<Integer> delete(@RequestBody AdminSysUserDeleteReq sysUserSaveREQ) {
+    public Result<String> delete(@RequestBody AdminSysUserDeleteReq sysUserSaveREQ) {
         return biz.delete(sysUserSaveREQ);
     }
 
@@ -55,7 +55,7 @@ public class AdminSysUserController {
      */
     @ApiOperation(value = "后台管理员更新接口", notes = "后台管理员更新接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public Result<Integer> update(@RequestBody AdminSysUserUpdateReq sysUserUpdateREQ) {
+    public Result<String> update(@RequestBody AdminSysUserUpdateReq sysUserUpdateREQ) {
         return biz.update(sysUserUpdateREQ);
     }
 
@@ -73,7 +73,7 @@ public class AdminSysUserController {
      */
     @ApiOperation(value = "后台管理员密码接口", notes = "后台管理员更新密码接口")
     @RequestMapping(value = "/update/password", method = RequestMethod.POST)
-    public Result<Integer> updatePassword(@RequestBody AdminSysUserUpdatePasswordReq sysUserUpdatePasswordREQ) {
+    public Result<String> updatePassword(@RequestBody AdminSysUserUpdatePasswordReq sysUserUpdatePasswordREQ) {
         return biz.updatePassword(sysUserUpdatePasswordREQ);
     }
 

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/AdminWebsiteLinkController.java

@@ -37,7 +37,7 @@ public class AdminWebsiteLinkController {
      */
     @ApiOperation(value = "站点友情保存接口", notes = "站点友情保存接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result<Integer> save(@RequestBody AdminWebsiteLinkSaveReq websiteLinkSaveREQ) {
+    public Result<String> save(@RequestBody AdminWebsiteLinkSaveReq websiteLinkSaveREQ) {
         return biz.save(websiteLinkSaveREQ);
     }
 
@@ -46,7 +46,7 @@ public class AdminWebsiteLinkController {
      */
     @ApiOperation(value = "站点友情删除接口", notes = "站点友情删除接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    public Result<Integer> delete(@RequestBody AdminWebsiteLinkDeleteReq websiteLinkDeleteREQ) {
+    public Result<String> delete(@RequestBody AdminWebsiteLinkDeleteReq websiteLinkDeleteREQ) {
         return biz.delete(websiteLinkDeleteREQ);
     }
 
@@ -55,7 +55,7 @@ public class AdminWebsiteLinkController {
      */
     @ApiOperation(value = "站点友情更新接口", notes = "站点友情更新接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public Result<Integer> update(@RequestBody AdminWebsiteLinkUpdateReq websiteLinkUpdateREQ) {
+    public Result<String> update(@RequestBody AdminWebsiteLinkUpdateReq websiteLinkUpdateREQ) {
         return biz.update(websiteLinkUpdateREQ);
     }
 

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysMenuBiz.java

@@ -8,6 +8,7 @@ import com.roncoo.education.common.core.enums.MenuTypeEnum;
 import com.roncoo.education.common.core.enums.ResultEnum;
 import com.roncoo.education.common.core.enums.StatusIdEnum;
 import com.roncoo.education.common.core.tools.BeanUtil;
+import com.roncoo.education.common.core.tools.JSUtil;
 import com.roncoo.education.system.dao.SysMenuDao;
 import com.roncoo.education.system.dao.SysMenuRoleDao;
 import com.roncoo.education.system.dao.SysRoleUserDao;
@@ -74,16 +75,22 @@ public class AdminSysMenuBiz {
         return null;
     }
 
-    public Result<Integer> save(AdminSysMenuSaveReq req) {
+    public Result<String> save(AdminSysMenuSaveReq req) {
         SysMenu record = BeanUtil.copyProperties(req, SysMenu.class);
+
+        // 若为权限
+        if (MenuTypeEnum.PERMISSION.getCode().equals(req.getMenuType())) {
+            record.setAuthValue(JSUtil.toJsonString(req.getAuthValueList()));
+        }
+
         int results = dao.save(record);
         if (results > 0) {
-            return Result.success(results);
+            return Result.success("操作成功");
         }
         return Result.error(ResultEnum.SYSTEM_SAVE_FAIL);
     }
 
-    public Result<Integer> delete(AdminSysMenuDeleteReq req) {
+    public Result<String> delete(AdminSysMenuDeleteReq req) {
         if (req.getId() == null) {
             return Result.error("主键ID不能为空");
         }
@@ -94,12 +101,12 @@ public class AdminSysMenuBiz {
         }
         int results = dao.deleteById(req.getId());
         if (results > 0) {
-            return Result.success(results);
+            return Result.success("操作成功");
         }
         return Result.error(ResultEnum.SYSTEM_DELETE_FAIL);
     }
 
-    public Result<Integer> update(AdminSysMenuUpdateReq req) {
+    public Result<String> update(AdminSysMenuUpdateReq req) {
         if (req.getId() == null) {
             return Result.error("主键ID不能为空");
         }
@@ -110,7 +117,7 @@ public class AdminSysMenuBiz {
         SysMenu record = BeanUtil.copyProperties(req, SysMenu.class);
         int results = dao.updateById(record);
         if (results > 0) {
-            return Result.success(results);
+            return Result.success("操作成功");
         }
         return Result.error(ResultEnum.SYSTEM_UPDATE_FAIL);
     }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysMenuRoleBiz.java

@@ -42,7 +42,7 @@ public class AdminSysMenuRoleBiz {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public Result<Integer> save(AdminSysMenuRoleSaveReq req) {
+    public Result<String> save(AdminSysMenuRoleSaveReq req) {
         if (req.getRoleId() == null) {
             return Result.error("角色ID不能为空");
         }
@@ -57,7 +57,7 @@ public class AdminSysMenuRoleBiz {
                 dao.save(entity);
             }
         }
-        return Result.success(1);
+        return Result.success("操作成功");
     }
 
 }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysRoleBiz.java

@@ -47,20 +47,20 @@ public class AdminSysRoleBiz {
         return Result.success(PageUtil.transform(page, AdminSysRolePageResp.class));
     }
 
-    public Result<Integer> save(AdminSysRoleSaveReq req) {
+    public Result<String> save(AdminSysRoleSaveReq req) {
         if (StringUtils.isEmpty(req.getRoleName())) {
             return Result.error("角色名称不能为空");
         }
         SysRole record = BeanUtil.copyProperties(req, SysRole.class);
         int results = dao.save(record);
         if (results > 0) {
-            return Result.success(results);
+            return Result.success("操作成功");
         }
         return Result.error(ResultEnum.SYSTEM_SAVE_FAIL);
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public Result<Integer> delete(AdminSysRoleDeleteReq req) {
+    public Result<String> delete(AdminSysRoleDeleteReq req) {
         if (StringUtils.isEmpty(req.getId())) {
             return Result.error("角色ID不能为空");
         }
@@ -69,19 +69,19 @@ public class AdminSysRoleBiz {
         // 2、删除角色
         int results = dao.deleteById(req.getId());
         if (results > 0) {
-            return Result.success(results);
+            return Result.success("操作成功");
         }
         return Result.error(ResultEnum.SYSTEM_DELETE_FAIL);
     }
 
-    public Result<Integer> update(AdminSysRoleUpdateReq req) {
+    public Result<String> update(AdminSysRoleUpdateReq req) {
         if (req.getId() == null) {
             return Result.error("角色ID不能为空");
         }
         SysRole record = BeanUtil.copyProperties(req, SysRole.class);
         int results = dao.updateById(record);
         if (results > 0) {
-            return Result.success(results);
+            return Result.success("操作成功");
         }
         return Result.error(ResultEnum.SYSTEM_UPDATE_FAIL);
     }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysRoleUserBiz.java

@@ -47,7 +47,7 @@ public class AdminSysRoleUserBiz {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public Result<Integer> save(AdminSysRoleUserSaveReq req) {
+    public Result<String> save(AdminSysRoleUserSaveReq req) {
         if (req.getUserId() == null) {
             return Result.error("用户ID不能为空");
         }
@@ -62,6 +62,6 @@ public class AdminSysRoleUserBiz {
                 dao.save(sysRoleUser);
             }
         }
-        return Result.success(1);
+        return Result.success("操作成功");
     }
 }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysUserBiz.java

@@ -82,7 +82,7 @@ public class AdminSysUserBiz {
         return Result.success(respPage);
     }
 
-    public Result<Integer> save(AdminSysUserSaveReq req) {
+    public Result<String> save(AdminSysUserSaveReq req) {
         if (!req.getMobilePwd().equals(req.getRePassword())) {
             return Result.error("密码不一致");
         }
@@ -95,23 +95,24 @@ public class AdminSysUserBiz {
         record.setMobilePsw(SHA1Util.getSign(record.getMobileSalt() + req.getMobilePwd()));
         int results = dao.save(record);
         if (results > 0) {
-            return Result.success(results);
+            return Result.success("操作成功");
         }
         return Result.error(ResultEnum.SYSTEM_SAVE_FAIL);
     }
 
     @Transactional
-    public Result<Integer> delete(AdminSysUserDeleteReq req) {
+    public Result<String> delete(AdminSysUserDeleteReq req) {
         if (req.getId() == null) {
             return Result.error("主键ID不能为空");
         }
         // 1、删除用户所有角色
         sysRoleUserDao.deleteByUserId(req.getId());
         // 2、删除用户
-        return Result.success(dao.deleteById(req.getId()));
+        dao.deleteById(req.getId());
+        return Result.success("操作成功");
     }
 
-    public Result<Integer> update(AdminSysUserUpdateReq req) {
+    public Result<String> update(AdminSysUserUpdateReq req) {
         if (req.getId() == null) {
             return Result.error("主键ID不能为空");
         }
@@ -122,7 +123,7 @@ public class AdminSysUserBiz {
         SysUser record = BeanUtil.copyProperties(req, SysUser.class);
         int results = dao.updateById(record);
         if (results > 0) {
-            return Result.success(results);
+            return Result.success("操作成功");
         }
         return Result.error(ResultEnum.SYSTEM_UPDATE_FAIL);
     }
@@ -138,7 +139,7 @@ public class AdminSysUserBiz {
         return Result.success(BeanUtil.copyProperties(sysUser, AdminSysUserViewResp.class));
     }
 
-    public Result<Integer> updatePassword(AdminSysUserUpdatePasswordReq req) {
+    public Result<String> updatePassword(AdminSysUserUpdatePasswordReq req) {
         if (req.getUserId() == null) {
             return Result.error("用户ID不能为空,请重试");
         }
@@ -151,7 +152,7 @@ public class AdminSysUserBiz {
         if (!req.getRePwd().equals(req.getMobilePsw())) {
             return Result.error("密码不一致,请重试");
         }
-
+        // TODO
         return Result.error(ResultEnum.SYSTEM_UPDATE_FAIL);
     }
 

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminWebsiteLinkBiz.java

@@ -52,11 +52,11 @@ public class AdminWebsiteLinkBiz {
      * @param req
      * @return
      */
-    public Result<Integer> save(AdminWebsiteLinkSaveReq req) {
+    public Result<String> save(AdminWebsiteLinkSaveReq req) {
         WebsiteLink record = BeanUtil.copyProperties(req, WebsiteLink.class);
         int results = dao.save(record);
         if (results > 0) {
-            return Result.success(results);
+            return Result.success("操作成功");
         }
         return Result.error(ResultEnum.SYSTEM_SAVE_FAIL);
     }
@@ -67,7 +67,7 @@ public class AdminWebsiteLinkBiz {
      * @param req
      * @return
      */
-    public Result<Integer> delete(AdminWebsiteLinkDeleteReq req) {
+    public Result<String> delete(AdminWebsiteLinkDeleteReq req) {
         if (req.getId() == null) {
             return Result.error("ID不能为空");
         }
@@ -77,7 +77,7 @@ public class AdminWebsiteLinkBiz {
         }
         int results = dao.deleteById(req.getId());
         if (results > 0) {
-            return Result.success(results);
+            return Result.success("操作成功");
         }
         return Result.error(ResultEnum.SYSTEM_DELETE_FAIL);
     }
@@ -88,7 +88,7 @@ public class AdminWebsiteLinkBiz {
      * @param req
      * @return
      */
-    public Result<Integer> update(AdminWebsiteLinkUpdateReq req) {
+    public Result<String> update(AdminWebsiteLinkUpdateReq req) {
         if (req.getId() == null) {
             return Result.error("ID不能为空");
         }
@@ -99,7 +99,7 @@ public class AdminWebsiteLinkBiz {
         WebsiteLink record = BeanUtil.copyProperties(req, WebsiteLink.class);
         int results = dao.updateById(record);
         if (results > 0) {
-            return Result.success(results);
+            return Result.success("操作成功");
         }
         return Result.error(ResultEnum.SYSTEM_UPDATE_FAIL);
     }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/req/AdminSysMenuSaveReq.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 菜单信息-保存
@@ -32,11 +33,6 @@ public class AdminSysMenuSaveReq implements Serializable {
      */
     @ApiModelProperty(value = "菜单路径")
     private String menuUrl;
-    /**
-     * 接口URL
-     */
-    @ApiModelProperty(value = "接口URL")
-    private String authValue;
     /**
      * 菜单图标
      */
@@ -47,11 +43,6 @@ public class AdminSysMenuSaveReq implements Serializable {
      */
     @ApiModelProperty(value = "备注")
     private String remark;
-    /**
-     * 是否显示(1: 显示；0:不显示)
-     */
-    @ApiModelProperty(value = "是否显示(1: 显示；0:不显示)")
-    private Integer hiddenType;
     /**
      * 菜单类型(1目录 2菜单 3权限)
      */
@@ -62,4 +53,7 @@ public class AdminSysMenuSaveReq implements Serializable {
      */
     @ApiModelProperty(value = "排序")
     private Integer sort;
+
+    @ApiModelProperty(value = "权限认证值")
+    private List<String> authValueList;
 }