From 55d66b7f91b856cc37ee02ce26ca15b9a21c7d68 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 11 May 2021 15:11:58 +0800
Subject: [PATCH] sensor更新接口
---
screen-manage/src/main/java/com/moral/api/controller/SystemController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 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 e832326..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,22 +1,37 @@
package com.moral.api.controller;
import com.moral.api.entity.SysArea;
-import com.moral.api.pojo.dto.login.AccountInfoDTO;
-import com.moral.api.pojo.dto.system.ManageLogQueryDTO;
-import com.moral.api.pojo.form.system.ManageLogQueryForm;
+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 com.moral.util.TokenUtils;
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
@@ -37,12 +52,27 @@
@Autowired
ManageLogService manageLogService;
+
+ /**
+ * @Description: ������������������
+ * @Param: []
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/4/13
+ */
@GetMapping("area/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) {
@@ -53,8 +83,14 @@
//������������������
ManageLogQueryDTO dto = manageLogService.queryManageLog(form);
- return null;
+
+ //������������������������
+ ManageLogQueryVO vo = ManageLogQueryVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
}
+
+
}
--
Gitblit v1.8.0