Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-11-15 84e740f362d574b942b1c9a274425841c9167de8

 screen-api/src/main/java/com/moral/api/controller/MenuController.java

@@ -9,8 +9,6 @@
import java.util.List;
import java.util.Map;

import javax.servlet.http.HttpServletRequest;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,15 +17,13 @@

import com.moral.api.entity.Menu;
import com.moral.api.service.GroupMenuService;
import com.moral.api.service.GroupService;
import com.moral.api.service.MenuService;
import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.TokenUtils;

@Slf4j
@Api(tags = {"菜单"})
@Api(tags = {"菜单管理"})
@RestController
@RequestMapping("/menu")
public class MenuController {
@@ -38,25 +34,17 @@
    @Autowired
    private MenuService menuService;

    @Autowired
    private GroupService groupService;

    @ApiOperation(value = "组分配菜单", notes = "组分配菜单")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @RequestMapping(value = "allot", method = RequestMethod.POST)
    public ResultMessage allot(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
    public ResultMessage allot(@RequestBody Map<String, Object> parameters) {
        if (!parameters.containsKey("groupId")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        String token = request.getHeader("token");
        groupMenuService.allotMenus(parameters, token);

        String groupName = groupService.getById((Integer) parameters.get("groupId")).getGroupName();
        String content = "给组<" + groupName + ">分配了菜单";
        OperationLogUtils.insertLog(request, content);
        groupMenuService.allotMenus(parameters);
        return ResultMessage.ok();
    }

@@ -65,9 +53,8 @@
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
    })
    @RequestMapping(value = "menu-list", method = RequestMethod.POST)
    public ResultMessage selectMenus(HttpServletRequest request) {
        String token = request.getHeader("token");
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
    public ResultMessage selectMenus() {
        Map<String, Object> currentUserInfo = (Map<String, Object>)TokenUtils.getUserInfo();
        Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
        List<Menu> menus = menuService.getMenuList((Integer) orgInfo.get("id"));
        return ResultMessage.ok(menus);
@@ -77,10 +64,9 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
    })
    @RequestMapping(value = "select", method = RequestMethod.POST)
    public ResultMessage select(HttpServletRequest request) {
        String token = request.getHeader("token");
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
    @RequestMapping(value = "select", method = RequestMethod.GET)
    public ResultMessage select() {
        Map<String, Object> currentUserInfo = (Map<String, Object>)TokenUtils.getUserInfo();
        Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
        Map<String, Object> result = menuService.selectMenusByOrgId((Integer) orgInfo.get("id"));
        return ResultMessage.ok(result);
@@ -90,8 +76,8 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @RequestMapping(value = "get-menu-ids", method = RequestMethod.GET)
    public ResultMessage getMenuIds(Integer groupId){
    @RequestMapping(value = "getMenuIds", method = RequestMethod.GET)
    public ResultMessage getMenuIds(Integer groupId) {
        List<Integer> menusIds = groupMenuService.getMenusIds(groupId);
        return ResultMessage.ok(menusIds);
    }