From 2c210559d8a1664129cfc8b05c89691f091224a4 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 27 May 2021 11:21:36 +0800
Subject: [PATCH] screen-manage 更新查询型号接口
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 136 ++++++++++++++++++++------------------------
1 files changed, 62 insertions(+), 74 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 78c95c6..e361433 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,107 +1,95 @@
package com.moral.api.controller;
-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.request.*;
-import com.moral.api.pojo.vo.account.AccountInsertVO;
+import com.moral.api.pojo.dto.account.*;
+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.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.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
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;
@Slf4j
@Api(tags = {"������������������"})
@RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
@RequestMapping("/account")
public class AccountController {
- @Resource
- ManageAccountService accountService;
@Autowired
- @Qualifier("tokenRedisTemplate")
- RedisTemplate redisTemplate;
-
-
- @PostMapping("login")
- public ResultMessage login(@RequestBody LoginRequest loginRequest) {
- if (!loginRequest.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
-
- LoginDTO loginDTO = accountService.login(loginRequest);
-
- LoginVO loginVO = LoginVO.convert(loginDTO);
-
- if(loginVO.getCode().equals(loginVO.SUCCESS))
- return ResultMessage.ok(loginVO);
- return ResultMessage.fail(loginVO);
- }
-
-
- @PostMapping("logout")
- public ResultMessage logout(@RequestBody LogoutRequest logoutRequest, HttpServletRequest request) {
- if(!logoutRequest.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
- String token = request.getHeader("token");
- logoutRequest.setToken(token);
-
- if(accountService.logout(logoutRequest))
- return ResultMessage.ok("������������");
- return ResultMessage.fail("������������");
-
- }
+ ManageAccountService accountService;
@PostMapping("insert")
- public ResultMessage insert(@RequestBody AccountInsertRequest accountInsertRequest){
- if(!accountInsertRequest.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+ public ResultMessage insert(@RequestBody AccountInsertForm form) {
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- AccountInsertDTO accountInsertDTO = accountService.insertAccount(accountInsertRequest);
+ //������������������������
+ AccountDTO conditionDTO = form.paramValid();
+ if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+ return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+ }
- AccountInsertVO accountInsertVO = AccountInsertVO.convert(accountInsertDTO);
+ //������������������
+ AccountDTO dto = accountService.insertAccount(form);
- if(accountInsertVO.getCode().equals(accountInsertVO.SUCCESS))
- return ResultMessage.ok(accountInsertVO);
- return ResultMessage.fail(accountInsertVO);
- }
-
- @GetMapping("query")
- public ResultMessage query(AccountQueryRequest accountQueryRequest){
- if(!accountQueryRequest.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
-
- AccountQueryDTO accountQueryDTO = accountService.queryAccount(accountQueryRequest);
-
- AccountQueryVO accountQueryVO = AccountQueryVO.convert(accountQueryDTO);
-
- return ResultMessage.ok(accountQueryVO);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("update")
- public ResultMessage update(@RequestBody AccountUpdateRequest accountQeuryRequest){
- if(!accountQeuryRequest.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+ public ResultMessage update(@RequestBody AccountUpdateForm form) {
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- AccountUpdateDTO accountUpdateDTO = accountService.updateAccount(accountQeuryRequest);
+ //������������������������
+ AccountDTO conditionDTO = form.paramValid();
+ if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+ return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+ }
- AccountUpdateVO accountUpdateVO = AccountUpdateVO.convert(accountUpdateDTO);
+ //������������������
+ AccountDTO dto = accountService.updateAccount(form);
- if(accountUpdateVO.getCode().equals(accountUpdateVO.SUCCESS))
- return ResultMessage.ok(accountUpdateVO);
- return ResultMessage.fail(accountUpdateVO);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
+ @PostMapping("delete")
+ public ResultMessage delete(@RequestBody AccountDeleteForm form) {
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ //������������������
+ AccountDTO dto = accountService.deleteAccount(form);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
+ }
+
+ @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