From f0376f72170c2eb236bec5560b8c5734edd222f1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 31 Mar 2021 17:16:40 +0800
Subject: [PATCH] common模块： 增加了convert工具类，驼峰和下划线相互转换 更新了Date工具类，添加根据Date，day获取目标date的方法 更新WebUtils工具类，添加获取请求Ip方法 manage模块： 组织和后台用户增删改查模块全部完成 增加aop用作日志插入
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 104 +++++++++++++++++++++++++++++----------------------
1 files changed, 59 insertions(+), 45 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 eddbd67..8307df0 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,9 +1,7 @@
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.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;
@@ -29,68 +27,84 @@
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())
+ @PostMapping("update")
+ public ResultMessage update(@RequestBody AccountUpdateForm form) {
+ //������������������������
+ if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- AccountQueryDTO accountQueryDTO = accountService.queryAccount(accountQueryForm);
+ //������������������������
+ AccountUpdateDTO conditionDTO = form.paramValid();
+ if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+ return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+ }
+ //������������������
+ AccountDTO dto = accountService.updateAccount(form);
+
+ //���������������������������
+ AccountUpdateVO vo = AccountUpdateVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ }
+
+ @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);
+
+ //���������������������������
+ AccountDeleteVO vo = AccountDeleteVO.convert(dto);
+
+ 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);
}
- @PostMapping("update")
- public ResultMessage update(@RequestBody AccountUpdateForm accountUpdateRequest) {
- if (!accountUpdateRequest.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);
- }
-
- AccountUpdateDTO accountUpdateDTO = accountService.updateAccount(accountUpdateRequest);
-
- AccountUpdateVO accountUpdateVO = AccountUpdateVO.convert(accountUpdateDTO);
-
- return new ResultMessage(accountUpdateDTO.getCode(), accountUpdateDTO.getMsg(), accountUpdateVO);
- }
-
- @PostMapping("delete")
- public ResultMessage delete(@RequestBody AccountDeleteForm accountDeleteForm) {
- if (!accountDeleteForm.valid())
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
- ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
-
- AccountDeleteDTO accountDeleteDTO = accountService.deleteAccount(accountDeleteForm);
-
- AccountDeleteVO accountDeleteVO = AccountDeleteVO.convert(accountDeleteDTO);
-
- return new ResultMessage(accountDeleteDTO.getCode(), accountDeleteDTO.getMsg(), accountDeleteVO);
- }
}
--
Gitblit v1.8.0