From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl

---
 screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java |   56 ++++++++++++++++++++++++++------------------------------
 1 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
index 6a0cf90..9aee76f 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
@@ -1,18 +1,11 @@
 package com.moral.api.controller;
 
-import com.moral.api.aop.log.OperationLogAnno;
 import com.moral.api.pojo.dto.organization.OrganizationDTO;
 import com.moral.api.pojo.dto.organization.OrganizationQueryDTO;
-import com.moral.api.pojo.form.organization.OrganizationDeleteForm;
-import com.moral.api.pojo.form.organization.OrganizationInsertForm;
-import com.moral.api.pojo.form.organization.OrganizationQueryForm;
-import com.moral.api.pojo.form.organization.OrganizationUpdateForm;
-import com.moral.api.pojo.vo.organization.OrganizationDeleteVO;
-import com.moral.api.pojo.vo.organization.OrganizationInsertVO;
-import com.moral.api.pojo.vo.organization.OrganizationQueryVO;
-import com.moral.api.pojo.vo.organization.OrganizationUpdateVO;
+import com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO;
+import com.moral.api.pojo.form.organization.*;
+import com.moral.api.pojo.vo.organization.*;
 import com.moral.api.service.OrganizationService;
-import com.moral.constant.Constants;
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
 import io.swagger.annotations.Api;
@@ -31,17 +24,16 @@
  **/
 @Slf4j
 @Api(tags = {"���������������������"})
+@CrossOrigin(origins = "*", maxAge = 3600)
 @RestController
-    @RequestMapping("/organization")
+@RequestMapping("/organization")
 public class OrganizationController {
     @Autowired
     OrganizationService organizationService;
 
     @PostMapping("insert")
-    @OperationLogAnno(module = Constants.ORGANIZATION_MODULE_NAME,type = Constants.INSERT_OPERATE_TYPE)
-    public ResultMessage insert(@RequestBody OrganizationInsertForm form, HttpServletRequest request) {
-        //������������������request���
-        request.setAttribute("parameters",form);
+    public ResultMessage insert(@RequestBody OrganizationInsertForm form) {
+
         //������������������������
         if (!form.valid())
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -56,14 +48,12 @@
         //������������������
         OrganizationDTO dto = organizationService.insertOrganization(form);
 
-        //���������������������������
-        OrganizationInsertVO vo = OrganizationInsertVO.convert(dto);
-
-        return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
+        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
     }
 
     @PostMapping("update")
-    public ResultMessage update(@RequestBody OrganizationUpdateForm form){
+    public ResultMessage update(@RequestBody OrganizationUpdateForm form) {
+
         //������������������������
         if (!form.valid())
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -78,14 +68,11 @@
         //������������������
         OrganizationDTO dto = organizationService.updateOrganization(form);
 
-        //���������������������������
-        OrganizationUpdateVO vo = OrganizationUpdateVO.convert(dto);
-
-        return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
+        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
     }
 
     @PostMapping("delete")
-    public ResultMessage delete(@RequestBody OrganizationDeleteForm form){
+    public ResultMessage delete(@RequestBody OrganizationDeleteForm form) {
         //������������������������
         if (!form.valid())
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -94,14 +81,11 @@
         //������������������
         OrganizationDTO dto = organizationService.deleteOrganization(form);
 
-        //���������������������������
-        OrganizationDeleteVO vo = OrganizationDeleteVO.convert(dto);
-
-        return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
+        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
     }
 
     @GetMapping("query")
-    public ResultMessage query(OrganizationQueryForm form){
+    public ResultMessage query(OrganizationQueryForm form) {
         //������������������������
         if (!form.valid())
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -113,6 +97,18 @@
         //������������������������
         OrganizationQueryVO vo = OrganizationQueryVO.convert(dto);
 
+        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+    }
+
+    @GetMapping("queryNames")
+    public ResultMessage queryNames(OrganizationQueryNamesForm form){
+
+        //������������������
+        OrganizationQueryNamesDTO dto = organizationService.queryNames(form);
+
+        //������������������������
+        OrganizationQueryAllNamesVO vo = OrganizationQueryAllNamesVO.convert(dto);
+
         return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
     }
 

--
Gitblit v1.8.0