From 5bacbb17debde58d6ff2581e4a03a866ca009c02 Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Mon, 31 May 2021 15:33:05 +0800 Subject: [PATCH] 菜单接口合并,查询父菜单列表 --- screen-manage/src/main/java/com/moral/api/controller/SystemController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 50 insertions(+), 8 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/controller/SystemController.java b/screen-manage/src/main/java/com/moral/api/controller/SystemController.java index 58acc60..78b959c 100644 --- a/screen-manage/src/main/java/com/moral/api/controller/SystemController.java +++ b/screen-manage/src/main/java/com/moral/api/controller/SystemController.java @@ -1,17 +1,21 @@ package com.moral.api.controller; import com.moral.api.entity.SysArea; +import com.moral.api.pojo.dto.manageLog.ManageLogQueryDTO; + +import com.moral.api.pojo.form.manageLog.*; +import com.moral.api.pojo.vo.manageLog.*; +import com.moral.api.service.ManageLogService; import com.moral.api.service.SysAreaService; + +import com.moral.constant.ResponseCodeEnum; import com.moral.constant.ResultMessage; -import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; + /** * @ClassName SystemController @@ -21,18 +25,56 @@ * @Version TODO **/ @Slf4j -@Api(tags = {"���������������������"}) -@CrossOrigin(origins = "*", maxAge = 3600) @RestController +@CrossOrigin(origins = "*", maxAge = 3600) @RequestMapping("/system") public class SystemController { @Autowired SysAreaService sysAreaService; + @Autowired + ManageLogService manageLogService; + + + /** + * @Description: ������������������ + * @Param: [] + * @return: com.moral.constant.ResultMessage + * @Author: ��������� + * @Date: 2021/4/13 + */ @GetMapping("area/query") - public ResultMessage query(){ + public ResultMessage queryArea() { List<SysArea> sysAreas = sysAreaService.querySysArea(); return ResultMessage.ok(sysAreas); } + + /** + * @Description: ������������������ + * @Param: [form] + * @return: com.moral.constant.ResultMessage + * @Author: ��������� + * @Date: 2021/4/13 + */ + @GetMapping("log/query") + public ResultMessage queryLog(ManageLogQueryForm form) { + + //������������������������ + if (!form.valid()) + return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), + ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); + + //������������������ + ManageLogQueryDTO dto = manageLogService.queryManageLog(form); + + //������������������������ + ManageLogQueryVO vo = ManageLogQueryVO.convert(dto); + + return new ResultMessage(dto.getCode(), dto.getMsg(), vo); + } + + + + } -- Gitblit v1.8.0