From 509ada97545b0a4bd95afaf530d532da38f23ca8 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 10 May 2021 13:37:07 +0800
Subject: [PATCH] screen-manage 测试开发环境脚本
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 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 ced4963..53620af 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,18 +1,14 @@
package com.moral.api.controller;
-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.service.ManageAccountService;
-import com.moral.api.service.SysAreaService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import io.swagger.annotations.*;
@@ -20,7 +16,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
@Slf4j
@Api(tags = {"������������������"})
@@ -39,7 +34,7 @@
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������������
- AccountInsertDTO conditionDTO = form.paramValid();
+ AccountDTO conditionDTO = form.paramValid();
if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
}
@@ -47,10 +42,7 @@
//������������������
AccountDTO dto = accountService.insertAccount(form);
- //������������������������
- AccountInsertVO accountInsertVO = AccountInsertVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), accountInsertVO);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("update")
@@ -61,7 +53,7 @@
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������������
- AccountUpdateDTO conditionDTO = form.paramValid();
+ AccountDTO conditionDTO = form.paramValid();
if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
}
@@ -69,10 +61,7 @@
//������������������
AccountDTO dto = accountService.updateAccount(form);
- //���������������������������
- AccountUpdateVO vo = AccountUpdateVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("delete")
@@ -85,10 +74,7 @@
//������������������
AccountDTO dto = accountService.deleteAccount(form);
- //���������������������������
- AccountDeleteVO vo = AccountDeleteVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@GetMapping("query")
--
Gitblit v1.8.0