screen-api 修改manageBug

kaiyu

2021-07-15 ab676b53eaeb3779d0beaf9f525a63eb3d5e60d0

screen-api
                 修改manageBug

 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>

 screen-api/src/main/java/com/moral/api/controller/DeviceController.java

File was renamed from screen-api/src/main/java/com/moral/api/controller/AlarmController.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;
    }
}

 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