From 7bf9583e3fd56020cbc62a5e87ff5987b8070ca5 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 13 May 2021 16:00:35 +0800
Subject: [PATCH] screen-manage                   更改返回菜单vo对象属性名称

---
 screen-manage/src/main/java/com/moral/api/controller/SystemController.java |   74 +++++++++++++++++++++++++++++++++----
 1 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/controller/SystemController.java b/screen-manage/src/main/java/com/moral/api/controller/SystemController.java
index 58acc60..debe6d4 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/SystemController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/SystemController.java
@@ -1,17 +1,37 @@
 package com.moral.api.controller;
 
 import com.moral.api.entity.SysArea;
+import com.moral.api.pojo.dto.manageLog.ManageLogQueryDTO;
+import com.moral.api.pojo.dto.sysDictData.SysDictDataDTO;
+import com.moral.api.pojo.dto.sysDictType.SysDictTypeDTO;
+import com.moral.api.pojo.dto.sysDictType.SysDictTypeQueryDTO;
+import com.moral.api.pojo.form.sysDictData.SysDictDataDeleteForm;
+import com.moral.api.pojo.form.sysDictData.SysDictDataInsertForm;
+import com.moral.api.pojo.form.sysDictData.SysDictDataUpdateForm;
+import com.moral.api.pojo.form.sysDictType.SysDictTypeDeleteForm;
+import com.moral.api.pojo.form.sysDictType.SysDictTypeInsertForm;
+import com.moral.api.pojo.form.sysDictType.SysDictTypeUpdateForm;
+import com.moral.api.pojo.form.manageLog.*;
+import com.moral.api.pojo.vo.sysDictData.SysDictDataDeleteVO;
+import com.moral.api.pojo.vo.sysDictData.SysDictDataInsertVO;
+import com.moral.api.pojo.vo.sysDictData.SysDictDataUpdateVO;
+import com.moral.api.pojo.vo.sysDictType.SysDictTypeDeleteVO;
+import com.moral.api.pojo.vo.sysDictType.SysDictTypeInsertVO;
+import com.moral.api.pojo.vo.sysDictType.SysDictTypeQueryVO;
+import com.moral.api.pojo.vo.sysDictType.SysDictTypeUpdateVO;
+import com.moral.api.pojo.vo.manageLog.*;
+import com.moral.api.service.ManageLogService;
 import com.moral.api.service.SysAreaService;
+import com.moral.api.service.SysDictDataService;
+import com.moral.api.service.SysDictTypeService;
+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.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName SystemController
@@ -21,18 +41,56 @@
  * @Version TODO
  **/
 @Slf4j
-@Api(tags = {"���������������������"})
-@CrossOrigin(origins = "*", maxAge = 3600)
 @RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
 @RequestMapping("/system")
 public class SystemController {
 
     @Autowired
     SysAreaService sysAreaService;
 
+    @Autowired
+    ManageLogService manageLogService;
+
+
+    /**
+     * @Description: ������������������
+     * @Param: []
+     * @return: com.moral.constant.ResultMessage
+     * @Author: ���������
+     * @Date: 2021/4/13
+     */
     @GetMapping("area/query")
-    public ResultMessage query(){
+    public ResultMessage queryArea() {
         List<SysArea> sysAreas = sysAreaService.querySysArea();
         return ResultMessage.ok(sysAreas);
     }
+
+    /**
+     * @Description: ������������������
+     * @Param: [form]
+     * @return: com.moral.constant.ResultMessage
+     * @Author: ���������
+     * @Date: 2021/4/13
+     */
+    @GetMapping("log/query")
+    public ResultMessage queryLog(ManageLogQueryForm form) {
+
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+        //������������������
+        ManageLogQueryDTO dto = manageLogService.queryManageLog(form);
+
+        //������������������������
+        ManageLogQueryVO vo = ManageLogQueryVO.convert(dto);
+
+        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+    }
+
+
+
+
 }

--
Gitblit v1.8.0