From 7232a74d17635defd5e7e39fb7a8892f12fa3931 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 06 May 2021 17:50:21 +0800
Subject: [PATCH] screen-manage                 优化后台账号增加,更新,删除逻辑

---
 screen-manage/src/main/java/com/moral/api/controller/AccountController.java |   27 +++++++--------------------
 1 files changed, 7 insertions(+), 20 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 8307df0..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,13 +1,11 @@
 package com.moral.api.controller;
 
 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;
@@ -18,9 +16,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+
 @Slf4j
 @Api(tags = {"������������������"})
 @RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
 @RequestMapping("/account")
 public class AccountController {
     @Autowired
@@ -34,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);
         }
@@ -42,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")
@@ -56,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);
         }
@@ -64,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")
@@ -80,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")
@@ -102,9 +93,5 @@
 
         return new ResultMessage(accountQueryDTO.getCode(), accountQueryDTO.getMsg(), accountQueryVO);
     }
-
-
-
-
 
 }

--
Gitblit v1.8.0