From ea81424035cc84d97cd114b82918bcbda73d7460 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 20 May 2021 10:41:38 +0800
Subject: [PATCH] screen-manage 型号查询功能完善
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 142 ++++++++++++++++-------------------------------
1 files changed, 48 insertions(+), 94 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 3e194d4..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,141 +1,95 @@
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.pojo.vo.account.AccountDeleteVO;
-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 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;
@Slf4j
@Api(tags = {"������������������"})
@RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
@RequestMapping("/account")
public class AccountController {
@Autowired
ManageAccountService accountService;
- @PostMapping("login")
- public ResultMessage login(@RequestBody LoginForm loginForm) {
- if (!loginForm.valid())
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
- ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
-
- LoginDTO loginDTO = accountService.login(loginForm);
-
- LoginVO loginVO = LoginVO.convert(loginDTO);
-
- return new ResultMessage(loginDTO.getCode(),loginDTO.getMsg(),loginVO);
- }
-
-
- @PostMapping("logout")
- public ResultMessage logout (@RequestBody LogoutForm logoutForm, HttpServletRequest request) {
- if(!logoutForm.valid())
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
- ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- String token = request.getHeader("token");
- logoutForm.setToken(token);
-
- if(accountService.logout(logoutForm))
- return ResultMessage.ok();
- return ResultMessage.fail();
-
- }
-
@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();
- if(conditionDTO.getCode()!=ResponseCodeEnum.SUCCESS.getCode()){
- return new ResultMessage(conditionDTO.getCode(),conditionDTO.getMsg(),null);
+
+ //������������������������
+ AccountDTO 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);
-
- return new ResultMessage(accountInsertDTO.getCode(),accountInsertDTO.getMsg(),accountInsertVO);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
-
- @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();
- if(conditionDTO.getCode()!=ResponseCodeEnum.SUCCESS.getCode()){
- return new ResultMessage(conditionDTO.getCode(),conditionDTO.getMsg(),null);
+ //������������������������
+ AccountDTO 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);
-
- return new ResultMessage(accountUpdateDTO.getCode(),accountUpdateDTO.getMsg(),accountUpdateVO);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@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);
-
- return new ResultMessage(accountDeleteDTO.getCode(),accountDeleteDTO.getMsg(),accountDeleteVO);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
- @PostMapping("yanzhengma")
- public String yanzhengma(HttpServletResponse response) throws IOException {
- KaptchaUtils.createVerificationCode();
- TokenUtils.getToken("1",1);
- return 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