From ab676b53eaeb3779d0beaf9f525a63eb3d5e60d0 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 15 Jul 2021 13:03:15 +0800
Subject: [PATCH] screen-api 修改manageBug
---
screen-manage/src/main/java/com/moral/api/config/mybatis/wrapper/NullFilterWrapper.java | 4 ++--
screen-api/src/main/java/com/moral/api/controller/DeviceController.java | 8 +++++++-
pom.xml | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index d0e5b42..a285bb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<maven-shared-incremental.version>1.1</maven-shared-incremental.version>
<spring-web.version>4.1.6.RELEASE</spring-web.version>
<com.alibaba.druid.version>1.1.5</com.alibaba.druid.version>
- <org.mybatis-plus.spring.boot.version>3.3.2</org.mybatis-plus.spring.boot.version>
+ <org.mybatis-plus.spring.boot.version>3.4.1</org.mybatis-plus.spring.boot.version>
<org.projectlombok.version>1.16.18</org.projectlombok.version>
<io.springfox.version>2.7.0</io.springfox.version>
<swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
diff --git a/screen-api/src/main/java/com/moral/api/controller/AlarmController.java b/screen-api/src/main/java/com/moral/api/controller/DeviceController.java
similarity index 87%
rename from screen-api/src/main/java/com/moral/api/controller/AlarmController.java
rename to screen-api/src/main/java/com/moral/api/controller/DeviceController.java
index a745ce8..8e38326 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AlarmController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/DeviceController.java
@@ -27,7 +27,7 @@
@RestController
@CrossOrigin(origins = "*", maxAge = 3600)
@RequestMapping("/deviceInfo")
-public class AlarmController {
+public class DeviceController {
@Autowired
OrganizationUnitAlarmService organizationUnitAlarmService;
@@ -38,4 +38,10 @@
AlarmLevelVO vo = AlarmLevelVO.convert(sensors);
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
}
+
+ @GetMapping("queryFiveMinuteData")
+ public ResultMessage queryFiveMinuteData(Integer regionCode,String sensorCode){
+
+ return null;
+ }
}
diff --git a/screen-manage/src/main/java/com/moral/api/config/mybatis/wrapper/NullFilterWrapper.java b/screen-manage/src/main/java/com/moral/api/config/mybatis/wrapper/NullFilterWrapper.java
index edae5c0..abba47a 100644
--- a/screen-manage/src/main/java/com/moral/api/config/mybatis/wrapper/NullFilterWrapper.java
+++ b/screen-manage/src/main/java/com/moral/api/config/mybatis/wrapper/NullFilterWrapper.java
@@ -17,10 +17,10 @@
public class NullFilterWrapper<T> extends QueryWrapper<T> {
@Override
- protected QueryWrapper<T> likeValue(boolean condition, String column, Object val, SqlLike sqlLike) {
+ protected QueryWrapper<T> likeValue(boolean condition, SqlKeyword keyword, String column, Object val, SqlLike sqlLike) {
if(val==null)
condition = false;
- return super.likeValue(condition, column, val, sqlLike);
+ return super.likeValue(condition, keyword, column, val, sqlLike);
}
@Override
--
Gitblit v1.8.0