screen-aqi 删除多余的分表拦截器

kaiyu

2021-10-11 90e290a34ee09eac129b4ba648975be8f9fd8fa0

screen-aqi
           删除多余的分表拦截器

 screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java

@@ -32,7 +32,7 @@
        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();

        //分页插件
        interceptor.addInnerInterceptor(new PaginationInnerInterceptorIIL(DbType.MYSQL));
        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));

        // 动态表名SQL解析器
        DynamicTableNameInnerInterceptor dynamicTableNameInnerInterceptor = new DynamicTableNameInnerInterceptor();
@@ -45,17 +45,5 @@

        return interceptor;
    }

    /*@Bean
    public MybatisPlusInterceptor mybatisPlusInterceptor() {
        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();

        //分页插件
        PaginationInnerInterceptorIIL paginationInnerInterceptorIIL = new PaginationInnerInterceptorIIL(DbType.MYSQL);
        paginationInnerInterceptorIIL.setMultiTableQueryName(multiTableQueryNames);
        interceptor.addInnerInterceptor(paginationInnerInterceptorIIL);

        return interceptor;
    }*/

}

 screen-api/src/main/java/com/moral/api/config/mybatis/PaginationInnerInterceptorIIL.java

File was deleted

 screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java

@@ -173,7 +173,7 @@
            dto.setSensorCode(sensor);
            timeValueMap.forEach((time, valueJson) -> {
                Map<String, Object> listMap = new HashMap<>();
                //如果对应时间没有数据
                //如果对应时间没有数据，则放入空
                if (valueJson == null) {
                    listMap.put("time", time);
                    listMap.put("value", "");
@@ -182,7 +182,7 @@
                }
                Map<String, Object> valueMap = JSON.parseObject(valueJson, Map.class);
                Object sensorValueObject = valueMap.get(sensor);
                //如果数据中没有该因子，则放入null
                //如果数据中没有该因子，则放入空
                if (sensorValueObject == null) {
                    listMap.put("time", time);
                    listMap.put("value", "");
@@ -191,6 +191,7 @@
                }
                //如果是小时数据需要判断标记位
                if (reportType.equals(Constants.DAILY_REPORT)) {
                    //如果标记位不为N，则放入空
                    if (!Constants.NORMAL_FLAG.equals(valueMap.get(sensor + "-Flag"))) {
                        listMap.put("time", time);
                        listMap.put("value", "");