From 86fb152b505a7ef6a99f20f87a71b3e773ba3b98 Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Fri, 16 Apr 2021 11:12:52 +0800 Subject: [PATCH] 通过父菜单查询子菜单 --- screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 104 +++++++++++++++++++++++++++------------------------ 1 files changed, 55 insertions(+), 49 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java index ece5b58..ced4963 100644 --- a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java +++ b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java @@ -1,105 +1,111 @@ package com.moral.api.controller; -import com.moral.api.pojo.dto.account.AccountDeleteDTO; -import com.moral.api.pojo.dto.account.AccountInsertDTO; -import com.moral.api.pojo.dto.account.AccountQueryDTO; -import com.moral.api.pojo.dto.account.AccountUpdateDTO; -import com.moral.api.pojo.dto.login.LoginDTO; -import com.moral.api.pojo.form.*; +import com.moral.api.entity.SysArea; +import com.moral.api.pojo.dto.account.*; +import com.moral.api.pojo.dto.organization.OrganizationDTO; +import com.moral.api.pojo.form.account.AccountDeleteForm; +import com.moral.api.pojo.form.account.AccountInsertForm; +import com.moral.api.pojo.form.account.AccountQueryForm; +import com.moral.api.pojo.form.account.AccountUpdateForm; import com.moral.api.pojo.vo.account.AccountDeleteVO; import com.moral.api.pojo.vo.account.AccountInsertVO; import com.moral.api.pojo.vo.account.AccountQueryVO; import com.moral.api.pojo.vo.account.AccountUpdateVO; -import com.moral.api.pojo.vo.login.LoginVO; import com.moral.api.service.ManageAccountService; -import com.moral.constant.Constants; +import com.moral.api.service.SysAreaService; import com.moral.constant.ResponseCodeEnum; import com.moral.constant.ResultMessage; -import com.moral.util.KaptchaUtils; -import com.moral.util.TokenUtils; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; +import java.util.List; @Slf4j @Api(tags = {"������������������"}) @RestController +@CrossOrigin(origins = "*", maxAge = 3600) @RequestMapping("/account") public class AccountController { @Autowired ManageAccountService accountService; @PostMapping("insert") - public ResultMessage insert(@RequestBody AccountInsertForm accountInsertForm) { - if (!accountInsertForm.valid()) + public ResultMessage insert(@RequestBody AccountInsertForm form) { + //������������������������ + if (!form.valid()) return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); - //������������������������������ - AccountInsertDTO conditionDTO = accountInsertForm.paramValid(); + + //������������������������ + AccountInsertDTO conditionDTO = form.paramValid(); if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) { return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null); } - AccountInsertDTO accountInsertDTO = accountService.insertAccount(accountInsertForm); + //������������������ + AccountDTO dto = accountService.insertAccount(form); - AccountInsertVO accountInsertVO = AccountInsertVO.convert(accountInsertDTO); + //������������������������ + AccountInsertVO accountInsertVO = AccountInsertVO.convert(dto); - return new ResultMessage(accountInsertDTO.getCode(), accountInsertDTO.getMsg(), accountInsertVO); + return new ResultMessage(dto.getCode(), dto.getMsg(), accountInsertVO); } - - @GetMapping("query") - public ResultMessage query(AccountQueryForm accountQueryForm) { - if (!accountQueryForm.valid()) - return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), - ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); - - AccountQueryDTO accountQueryDTO = accountService.queryAccount(accountQueryForm); - - AccountQueryVO accountQueryVO = AccountQueryVO.convert(accountQueryDTO); - - return new ResultMessage(accountQueryDTO.getCode(), accountQueryDTO.getMsg(), accountQueryVO); - } - @PostMapping("update") - public ResultMessage update(@RequestBody AccountUpdateForm accountUpdateRequest) { - if (!accountUpdateRequest.valid()) + public ResultMessage update(@RequestBody AccountUpdateForm form) { + //������������������������ + if (!form.valid()) return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); - //������������������������������ - AccountUpdateDTO conditionDTO = accountUpdateRequest.paramValid(); + //������������������������ + AccountUpdateDTO conditionDTO = form.paramValid(); if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) { return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null); } - AccountUpdateDTO accountUpdateDTO = accountService.updateAccount(accountUpdateRequest); + //������������������ + AccountDTO dto = accountService.updateAccount(form); - AccountUpdateVO accountUpdateVO = AccountUpdateVO.convert(accountUpdateDTO); + //��������������������������� + AccountUpdateVO vo = AccountUpdateVO.convert(dto); - return new ResultMessage(accountUpdateDTO.getCode(), accountUpdateDTO.getMsg(), accountUpdateVO); + return new ResultMessage(dto.getCode(), dto.getMsg(), vo); } @PostMapping("delete") - public ResultMessage delete(@RequestBody AccountDeleteForm accountDeleteForm) { - if (!accountDeleteForm.valid()) + public ResultMessage delete(@RequestBody AccountDeleteForm form) { + //������������������������ + if (!form.valid()) return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); - AccountDeleteDTO accountDeleteDTO = accountService.deleteAccount(accountDeleteForm); + //������������������ + AccountDTO dto = accountService.deleteAccount(form); - AccountDeleteVO accountDeleteVO = AccountDeleteVO.convert(accountDeleteDTO); + //��������������������������� + AccountDeleteVO vo = AccountDeleteVO.convert(dto); - return new ResultMessage(accountDeleteDTO.getCode(), accountDeleteDTO.getMsg(), accountDeleteVO); + return new ResultMessage(dto.getCode(), dto.getMsg(), vo); } + @GetMapping("query") + public ResultMessage query(AccountQueryForm form) { + //������������������������ + if (!form.valid()) + return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), + ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); + + //������������������ + AccountQueryDTO accountQueryDTO = accountService.queryAccount(form); + + //��������������������������� + AccountQueryVO accountQueryVO = AccountQueryVO.convert(accountQueryDTO); + + + return new ResultMessage(accountQueryDTO.getCode(), accountQueryDTO.getMsg(), accountQueryVO); + } } -- Gitblit v1.8.0