From 0197c2fcac5fdb701ff91dcea0d98ec226bc008d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 13 Oct 2021 15:21:08 +0800
Subject: [PATCH] 删除historySecondSpecial相关类
---
screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 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 39abdd6..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,19 +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.api.util.LogUtils;
-import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import io.swagger.annotations.Api;
@@ -40,7 +32,7 @@
OrganizationService organizationService;
@PostMapping("insert")
- public ResultMessage insert(@RequestBody OrganizationInsertForm form, HttpServletRequest request) {
+ public ResultMessage insert(@RequestBody OrganizationInsertForm form) {
//������������������������
if (!form.valid())
@@ -56,14 +48,11 @@
//������������������
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, HttpServletRequest request) {
+ public ResultMessage update(@RequestBody OrganizationUpdateForm form) {
//������������������������
if (!form.valid())
@@ -79,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,HttpServletRequest request) {
+ public ResultMessage delete(@RequestBody OrganizationDeleteForm form) {
//������������������������
if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -95,10 +81,7 @@
//������������������
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")
@@ -117,5 +100,16 @@
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