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/OrganizationController.java | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 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 52582b4..6a0cf90 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,5 +1,6 @@
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;
@@ -8,14 +9,18 @@
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.service.OrganizationService;
+import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
/**
* @ClassName OrganizationController
@@ -33,58 +38,61 @@
OrganizationService organizationService;
@PostMapping("insert")
- public ResultMessage insert(@RequestBody OrganizationInsertForm organizationInsertForm) {
- //������������������������������
- if (!organizationInsertForm.valid())
+ @OperationLogAnno(module = Constants.ORGANIZATION_MODULE_NAME,type = Constants.INSERT_OPERATE_TYPE)
+ public ResultMessage insert(@RequestBody OrganizationInsertForm form, HttpServletRequest request) {
+ //������������������request���
+ request.setAttribute("parameters",form);
+ //������������������������
+ if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������������
- OrganizationDTO conditionDTO = organizationInsertForm.paramValid();
+ OrganizationDTO conditionDTO = form.paramValid();
if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
}
//������������������
- OrganizationDTO organizationDTO = organizationService.insertOrganization(organizationInsertForm);
+ OrganizationDTO dto = organizationService.insertOrganization(form);
//���������������������������
- OrganizationInsertVO organizationInsertVO = OrganizationInsertVO.convert(organizationDTO);
+ OrganizationInsertVO vo = OrganizationInsertVO.convert(dto);
- return new ResultMessage(organizationDTO.getCode(),organizationDTO.getMsg(),organizationInsertVO);
+ return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
}
@PostMapping("update")
- public ResultMessage update(@RequestBody OrganizationUpdateForm organizationUpdateForm){
- //������������������������������
- if (!organizationUpdateForm.valid())
+ public ResultMessage update(@RequestBody OrganizationUpdateForm form){
+ //������������������������
+ if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������������
- OrganizationDTO conditionDTO = organizationUpdateForm.paramValid();
+ OrganizationDTO conditionDTO = form.paramValid();
if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
}
//������������������
- OrganizationDTO organizationDTO = organizationService.updateOrganization(organizationUpdateForm);
+ OrganizationDTO dto = organizationService.updateOrganization(form);
//���������������������������
- OrganizationUpdateVO organizationUpdateVO = OrganizationUpdateVO.convert(organizationDTO);
+ OrganizationUpdateVO vo = OrganizationUpdateVO.convert(dto);
- return new ResultMessage(organizationDTO.getCode(),organizationDTO.getMsg(),organizationUpdateVO);
+ return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
}
@PostMapping("delete")
- public ResultMessage delete(@RequestBody OrganizationDeleteForm organizationDeleteForm){
- //������������������������������
- if (!organizationDeleteForm.valid())
+ public ResultMessage delete(@RequestBody OrganizationDeleteForm form){
+ //������������������������
+ if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������
- OrganizationDTO dto = organizationService.deleteOrganization(organizationDeleteForm);
+ OrganizationDTO dto = organizationService.deleteOrganization(form);
//���������������������������
OrganizationDeleteVO vo = OrganizationDeleteVO.convert(dto);
@@ -93,24 +101,19 @@
}
@GetMapping("query")
- public ResultMessage query(OrganizationQueryForm organizationQueryForm){
+ public ResultMessage query(OrganizationQueryForm form){
//������������������������
- if (!organizationQueryForm.valid())
+ if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- //������������������������
- OrganizationDTO conditionDTO = organizationQueryForm.paramValid();
- if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
- return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
- }
-
//������������������
- OrganizationQueryDTO organizationQueryDTO = organizationService.queryOrganization(organizationQueryForm);
+ OrganizationQueryDTO dto = organizationService.queryOrganization(form);
//������������������������
+ OrganizationQueryVO vo = OrganizationQueryVO.convert(dto);
- return null;
+ return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
}
}
--
Gitblit v1.8.0