'优化设备属性历史数据接口（历史数据表通用）、客户管理信息表-分页接口（增加租户隔离）'

service-backend/service-backend-api/src/main/java/com/usky/backend/domain/request/HistoryQueryVo.java

@@ -32,9 +32,9 @@ public class HistoryQueryVo implements Serializable {
     private String  deviceId;
 
     /**
-     * 设备类型
+     * 设备类型简称
      */
-    private Integer deviceType;
+    private String typeAbbrevia;
 
     /**
      * 指标名

service-backend/service-backend-biz/src/main/java/com/usky/backend/MybatisGeneratorUtils.java

@@ -95,7 +95,7 @@ public class MybatisGeneratorUtils {
             @Override
             public String outputFile(TableInfo tableInfo) {
                 // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
-                return finalProjectPath + "/src/main/resources/mapper.backend" + "/"
+                return finalProjectPath + "/src/main/resources/mapper/backend" + "/"
                         + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
             }
         });

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/DataQueryController.java

@@ -36,7 +36,7 @@ public class DataQueryController {
      * @param endTime 结束时间
      * @param deviceId 设备Id
      * @param metric 属性
-     * @param deviceType 设备类型编码（501、监控系统  502、门禁系统  503、梯控系统  504、机房系统  509、环境系统  510、照明系统）
+     * @param typeAbbrevia 设备类型简称
      * @return
      */
     @GetMapping("/historyMetric")
@@ -45,8 +45,8 @@ public class DataQueryController {
                                               @RequestParam("endTime") String endTime,
                                               @RequestParam("deviceId") String deviceId,
                                               @RequestParam("metric") String metric,
-                                              @RequestParam("deviceType") Integer deviceType) {
-        return ApiResult.success(dataQueryService.historyMetric(deviceId,metric,startTime,endTime,deviceType));
+                                              @RequestParam("typeAbbrevia") String typeAbbrevia) {
+        return ApiResult.success(dataQueryService.historyMetric(deviceId,metric,startTime,endTime,typeAbbrevia));
     }
 
     @PostMapping("/historyMetrics")

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/DataRealTimeMapper.java

@@ -2,9 +2,13 @@ package com.usky.backend.mapper;
 
 import com.usky.backend.domain.DataRealTime;
 //import com.usky.backend.domain.request.DeviceDataInfoVO;
+import com.usky.backend.domain.MetricItemVo;
 import com.usky.common.mybatis.core.CrudMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  * 实时数据表 Mapper 接口
@@ -17,5 +21,6 @@ import org.springframework.stereotype.Repository;
 public interface DataRealTimeMapper extends CrudMapper<DataRealTime> {
 
 //    int insertHistoryTable(@Param("dataInfo") DeviceDataInfoVO dataInfo, @Param("tableName") String tableName, @Param("curTime") LocalDateTime curTime);
+    List<MetricItemVo> QueryHistoryData(@Param("deviceId") String deviceId,@Param("metric") String metric,@Param("startTime") String startTime,@Param("endTime") String endTime, @Param("tableName") String tableName);
 
 }

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/DataQueryService.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import java.util.List;
 
 public interface DataQueryService {
-    HistoryResultVo historyMetric(String deviceId, String metric, String startTime, String endTime,Integer deviceType);
+    HistoryResultVo historyMetric(String deviceId, String metric, String startTime, String endTime,String typeAbbrevia);
 
     List<HistoryResultVo> historyMetrics(HistoryQueryVo historyQueryVo);
 

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/DataQueryServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.db.meta.Table;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -12,6 +13,7 @@ import com.usky.backend.domain.request.HistoryQueryVo;
 import com.usky.backend.domain.request.LastQueryVo;
 import com.usky.backend.domain.response.HistoryResultVo;
 import com.usky.backend.domain.response.LastResultVo;
+import com.usky.backend.mapper.DataRealTimeMapper;
 import com.usky.backend.service.*;
 import net.sf.ehcache.search.expression.IsNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,89 +48,96 @@ public class DataQueryServiceImpl implements DataQueryService {
     @Autowired
     private DataLcHistoryService dataLcHistoryService;
 
+    @Autowired
+    private DataRealTimeMapper dataRealTimeMapper;
+
     @Override
-    public HistoryResultVo historyMetric(String deviceId, String metric, String startTime, String endTime,Integer deviceType){
+    public HistoryResultVo historyMetric(String deviceId, String metric, String startTime, String endTime,String typeAbbrevia){
 
         List<MetricItemVo> items = new ArrayList<>();
-        if(deviceType == 501){
-            LambdaQueryWrapper<DataVdHistory> vdQuery = Wrappers.lambdaQuery();
-            vdQuery.select(DataVdHistory::getAttributeData,DataVdHistory::getDataTime)
-                    .eq(DataVdHistory::getDeviceId,deviceId)
-                    .eq(DataVdHistory::getAttributeName,metric)
-                    .between(DataVdHistory::getDataTime,startTime,endTime);
-            List<DataVdHistory> list = dataVdHistoryService.list(vdQuery);
-
-            if(CollectionUtils.isNotEmpty(list)){
-                for(int i=0;i<list.size();i++){
-                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
-                }
-            }
-        }else if(deviceType == 502){
-            LambdaQueryWrapper<DataEgHistory> egQuery = Wrappers.lambdaQuery();
-            egQuery.select(DataEgHistory::getAttributeData,DataEgHistory::getDataTime)
-                    .eq(DataEgHistory::getDeviceId,deviceId)
-                    .eq(DataEgHistory::getAttributeName,metric)
-                    .between(DataEgHistory::getDataTime,startTime,endTime);
-            List<DataEgHistory> list = dataEgHistoryService.list(egQuery);
-
-            if(CollectionUtils.isNotEmpty(list)){
-                for(int i=0;i<list.size();i++){
-                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
-                }
-            }
-        }else if(deviceType == 503){
-            LambdaQueryWrapper<DataLgHistory> lgQuery = Wrappers.lambdaQuery();
-            lgQuery.select(DataLgHistory::getAttributeData,DataLgHistory::getDataTime)
-                    .eq(DataLgHistory::getDeviceId,deviceId)
-                    .eq(DataLgHistory::getAttributeName,metric)
-                    .between(DataLgHistory::getDataTime,startTime,endTime);
-            List<DataLgHistory> list = dataLgHistoryService.list(lgQuery);
-
-            if(CollectionUtils.isNotEmpty(list)){
-                for(int i=0;i<list.size();i++){
-                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
-                }
-            }
-        }else if(deviceType == 504){
-            LambdaQueryWrapper<DataGrHistory> grQuery = Wrappers.lambdaQuery();
-            grQuery.select(DataGrHistory::getAttributeData,DataGrHistory::getDataTime)
-                    .eq(DataGrHistory::getDeviceId,deviceId)
-                    .eq(DataGrHistory::getAttributeName,metric)
-                    .between(DataGrHistory::getDataTime,startTime,endTime);
-            List<DataGrHistory> list = dataGrHistoryService.list(grQuery);
-
-            if(CollectionUtils.isNotEmpty(list)){
-                for(int i=0;i<list.size();i++){
-                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
-                }
-            }
-        }else if(deviceType == 509){
-            LambdaQueryWrapper<DataEvHistory> evQuery = Wrappers.lambdaQuery();
-            evQuery.select(DataEvHistory::getAttributeData,DataEvHistory::getDataTime)
-                    .eq(DataEvHistory::getDeviceId,deviceId)
-                    .eq(DataEvHistory::getAttributeName,metric)
-                    .between(DataEvHistory::getDataTime,startTime,endTime);
-            List<DataEvHistory> list = dataEvHistoryService.list(evQuery);
-
-            if(CollectionUtils.isNotEmpty(list)){
-                for(int i=0;i<list.size();i++){
-                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
-                }
-            }
-        }else if(deviceType == 510){
-            LambdaQueryWrapper<DataLcHistory> lcQuery = Wrappers.lambdaQuery();
-            lcQuery.select(DataLcHistory::getAttributeData,DataLcHistory::getDataTime)
-                    .eq(DataLcHistory::getDeviceId,deviceId)
-                    .eq(DataLcHistory::getAttributeName,metric)
-                    .between(DataLcHistory::getDataTime,startTime,endTime);
-            List<DataLcHistory> list = dataLcHistoryService.list(lcQuery);
-
-            if(CollectionUtils.isNotEmpty(list)){
-                for(int i=0;i<list.size();i++){
-                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
-                }
-            }
-        }
+        String tableName = "data_"+typeAbbrevia+"_history";
+
+        items = dataRealTimeMapper.QueryHistoryData(deviceId, metric, startTime, endTime,tableName);
+
+//        if(deviceType == 501){
+//            LambdaQueryWrapper<DataVdHistory> vdQuery = Wrappers.lambdaQuery();
+//            vdQuery.select(DataVdHistory::getAttributeData,DataVdHistory::getDataTime)
+//                    .eq(DataVdHistory::getDeviceId,deviceId)
+//                    .eq(DataVdHistory::getAttributeName,metric)
+//                    .between(DataVdHistory::getDataTime,startTime,endTime);
+//            List<DataVdHistory> list = dataVdHistoryService.list(vdQuery);
+//
+//            if(CollectionUtils.isNotEmpty(list)){
+//                for(int i=0;i<list.size();i++){
+//                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
+//                }
+//            }
+//        }else if(deviceType == 502){
+//            LambdaQueryWrapper<DataEgHistory> egQuery = Wrappers.lambdaQuery();
+//            egQuery.select(DataEgHistory::getAttributeData,DataEgHistory::getDataTime)
+//                    .eq(DataEgHistory::getDeviceId,deviceId)
+//                    .eq(DataEgHistory::getAttributeName,metric)
+//                    .between(DataEgHistory::getDataTime,startTime,endTime);
+//            List<DataEgHistory> list = dataEgHistoryService.list(egQuery);
+//
+//            if(CollectionUtils.isNotEmpty(list)){
+//                for(int i=0;i<list.size();i++){
+//                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
+//                }
+//            }
+//        }else if(deviceType == 503){
+//            LambdaQueryWrapper<DataLgHistory> lgQuery = Wrappers.lambdaQuery();
+//            lgQuery.select(DataLgHistory::getAttributeData,DataLgHistory::getDataTime)
+//                    .eq(DataLgHistory::getDeviceId,deviceId)
+//                    .eq(DataLgHistory::getAttributeName,metric)
+//                    .between(DataLgHistory::getDataTime,startTime,endTime);
+//            List<DataLgHistory> list = dataLgHistoryService.list(lgQuery);
+//
+//            if(CollectionUtils.isNotEmpty(list)){
+//                for(int i=0;i<list.size();i++){
+//                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
+//                }
+//            }
+//        }else if(deviceType == 504){
+//            LambdaQueryWrapper<DataGrHistory> grQuery = Wrappers.lambdaQuery();
+//            grQuery.select(DataGrHistory::getAttributeData,DataGrHistory::getDataTime)
+//                    .eq(DataGrHistory::getDeviceId,deviceId)
+//                    .eq(DataGrHistory::getAttributeName,metric)
+//                    .between(DataGrHistory::getDataTime,startTime,endTime);
+//            List<DataGrHistory> list = dataGrHistoryService.list(grQuery);
+//
+//            if(CollectionUtils.isNotEmpty(list)){
+//                for(int i=0;i<list.size();i++){
+//                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
+//                }
+//            }
+//        }else if(deviceType == 509){
+//            LambdaQueryWrapper<DataEvHistory> evQuery = Wrappers.lambdaQuery();
+//            evQuery.select(DataEvHistory::getAttributeData,DataEvHistory::getDataTime)
+//                    .eq(DataEvHistory::getDeviceId,deviceId)
+//                    .eq(DataEvHistory::getAttributeName,metric)
+//                    .between(DataEvHistory::getDataTime,startTime,endTime);
+//            List<DataEvHistory> list = dataEvHistoryService.list(evQuery);
+//
+//            if(CollectionUtils.isNotEmpty(list)){
+//                for(int i=0;i<list.size();i++){
+//                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
+//                }
+//            }
+//        }else if(deviceType == 510){
+//            LambdaQueryWrapper<DataLcHistory> lcQuery = Wrappers.lambdaQuery();
+//            lcQuery.select(DataLcHistory::getAttributeData,DataLcHistory::getDataTime)
+//                    .eq(DataLcHistory::getDeviceId,deviceId)
+//                    .eq(DataLcHistory::getAttributeName,metric)
+//                    .between(DataLcHistory::getDataTime,startTime,endTime);
+//            List<DataLcHistory> list = dataLcHistoryService.list(lcQuery);
+//
+//            if(CollectionUtils.isNotEmpty(list)){
+//                for(int i=0;i<list.size();i++){
+//                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
+//                }
+//            }
+//        }
 
         HistoryResultVo historyResultVo = new HistoryResultVo(deviceId,metric,items);
 
@@ -141,90 +150,93 @@ public class DataQueryServiceImpl implements DataQueryService {
         String deviceId = historyQueryVo.getDeviceId();
         String startTime = historyQueryVo.getStartTime();
         String endTime = historyQueryVo.getEndTime();
-        Integer deviceType = historyQueryVo.getDeviceType();
+        String typeAbbrevia = historyQueryVo.getTypeAbbrevia();
         List<String> metrics = historyQueryVo.getMetrics();
         if(CollectionUtils.isNotEmpty(metrics)){
             for(int i=0;i<metrics.size();i++){
                 List<MetricItemVo> items = new ArrayList<>();
-                if(deviceType == 501){
-                    LambdaQueryWrapper<DataVdHistory> vdQuery = Wrappers.lambdaQuery();
-                    vdQuery.select(DataVdHistory::getAttributeData,DataVdHistory::getDataTime)
-                            .eq(DataVdHistory::getDeviceId,deviceId)
-                            .eq(DataVdHistory::getAttributeName,metrics.get(i))
-                            .between(DataVdHistory::getDataTime,startTime,endTime);
-                    List<DataVdHistory> list = dataVdHistoryService.list(vdQuery);
-
-                    if(CollectionUtils.isNotEmpty(list)){
-                        for(int j=0;j<list.size();j++){
-                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
-                        }
-                    }
-                }else if(deviceType == 502){
-                    LambdaQueryWrapper<DataEgHistory> egQuery = Wrappers.lambdaQuery();
-                    egQuery.select(DataEgHistory::getAttributeData,DataEgHistory::getDataTime)
-                            .eq(DataEgHistory::getDeviceId,deviceId)
-                            .eq(DataEgHistory::getAttributeName,metrics.get(i))
-                            .between(DataEgHistory::getDataTime,startTime,endTime);
-                    List<DataEgHistory> list = dataEgHistoryService.list(egQuery);
-
-                    if(CollectionUtils.isNotEmpty(list)){
-                        for(int j=0;j<list.size();j++){
-                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
-                        }
-                    }
-                }else if(deviceType == 503){
-                    LambdaQueryWrapper<DataLgHistory> lgQuery = Wrappers.lambdaQuery();
-                    lgQuery.select(DataLgHistory::getAttributeData,DataLgHistory::getDataTime)
-                            .eq(DataLgHistory::getDeviceId,deviceId)
-                            .eq(DataLgHistory::getAttributeName,metrics.get(i))
-                            .between(DataLgHistory::getDataTime,startTime,endTime);
-                    List<DataLgHistory> list = dataLgHistoryService.list(lgQuery);
-
-                    if(CollectionUtils.isNotEmpty(list)){
-                        for(int j=0;j<list.size();j++){
-                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
-                        }
-                    }
-                }else if(deviceType == 504){
-                    LambdaQueryWrapper<DataGrHistory> grQuery = Wrappers.lambdaQuery();
-                    grQuery.select(DataGrHistory::getAttributeData,DataGrHistory::getDataTime)
-                            .eq(DataGrHistory::getDeviceId,deviceId)
-                            .eq(DataGrHistory::getAttributeName,metrics.get(i))
-                            .between(DataGrHistory::getDataTime,startTime,endTime);
-                    List<DataGrHistory> list = dataGrHistoryService.list(grQuery);
-
-                    if(CollectionUtils.isNotEmpty(list)){
-                        for(int j=0;j<list.size();j++){
-                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
-                        }
-                    }
-                }else if(deviceType == 509){
-                    LambdaQueryWrapper<DataEvHistory> evQuery = Wrappers.lambdaQuery();
-                    evQuery.select(DataEvHistory::getAttributeData,DataEvHistory::getDataTime)
-                            .eq(DataEvHistory::getDeviceId,deviceId)
-                            .eq(DataEvHistory::getAttributeName,metrics.get(i))
-                            .between(DataEvHistory::getDataTime,startTime,endTime);
-                    List<DataEvHistory> list = dataEvHistoryService.list(evQuery);
-
-                    if(CollectionUtils.isNotEmpty(list)){
-                        for(int j=0;j<list.size();j++){
-                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
-                        }
-                    }
-                }else if(deviceType == 510){
-                    LambdaQueryWrapper<DataLcHistory> lcQuery = Wrappers.lambdaQuery();
-                    lcQuery.select(DataLcHistory::getAttributeData,DataLcHistory::getDataTime)
-                            .eq(DataLcHistory::getDeviceId,deviceId)
-                            .eq(DataLcHistory::getAttributeName,metrics.get(i))
-                            .between(DataLcHistory::getDataTime,startTime,endTime);
-                    List<DataLcHistory> list = dataLcHistoryService.list(lcQuery);
-
-                    if(CollectionUtils.isNotEmpty(list)){
-                        for(int j=0;j<list.size();j++){
-                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
-                        }
-                    }
-                }
+                String tableName = "data_"+typeAbbrevia+"_history";
+
+                items = dataRealTimeMapper.QueryHistoryData(deviceId, metrics.get(i), startTime, endTime,tableName);
+//                if(deviceType == 501){
+//                    LambdaQueryWrapper<DataVdHistory> vdQuery = Wrappers.lambdaQuery();
+//                    vdQuery.select(DataVdHistory::getAttributeData,DataVdHistory::getDataTime)
+//                            .eq(DataVdHistory::getDeviceId,deviceId)
+//                            .eq(DataVdHistory::getAttributeName,metrics.get(i))
+//                            .between(DataVdHistory::getDataTime,startTime,endTime);
+//                    List<DataVdHistory> list = dataVdHistoryService.list(vdQuery);
+//
+//                    if(CollectionUtils.isNotEmpty(list)){
+//                        for(int j=0;j<list.size();j++){
+//                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
+//                        }
+//                    }
+//                }else if(deviceType == 502){
+//                    LambdaQueryWrapper<DataEgHistory> egQuery = Wrappers.lambdaQuery();
+//                    egQuery.select(DataEgHistory::getAttributeData,DataEgHistory::getDataTime)
+//                            .eq(DataEgHistory::getDeviceId,deviceId)
+//                            .eq(DataEgHistory::getAttributeName,metrics.get(i))
+//                            .between(DataEgHistory::getDataTime,startTime,endTime);
+//                    List<DataEgHistory> list = dataEgHistoryService.list(egQuery);
+//
+//                    if(CollectionUtils.isNotEmpty(list)){
+//                        for(int j=0;j<list.size();j++){
+//                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
+//                        }
+//                    }
+//                }else if(deviceType == 503){
+//                    LambdaQueryWrapper<DataLgHistory> lgQuery = Wrappers.lambdaQuery();
+//                    lgQuery.select(DataLgHistory::getAttributeData,DataLgHistory::getDataTime)
+//                            .eq(DataLgHistory::getDeviceId,deviceId)
+//                            .eq(DataLgHistory::getAttributeName,metrics.get(i))
+//                            .between(DataLgHistory::getDataTime,startTime,endTime);
+//                    List<DataLgHistory> list = dataLgHistoryService.list(lgQuery);
+//
+//                    if(CollectionUtils.isNotEmpty(list)){
+//                        for(int j=0;j<list.size();j++){
+//                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
+//                        }
+//                    }
+//                }else if(deviceType == 504){
+//                    LambdaQueryWrapper<DataGrHistory> grQuery = Wrappers.lambdaQuery();
+//                    grQuery.select(DataGrHistory::getAttributeData,DataGrHistory::getDataTime)
+//                            .eq(DataGrHistory::getDeviceId,deviceId)
+//                            .eq(DataGrHistory::getAttributeName,metrics.get(i))
+//                            .between(DataGrHistory::getDataTime,startTime,endTime);
+//                    List<DataGrHistory> list = dataGrHistoryService.list(grQuery);
+//
+//                    if(CollectionUtils.isNotEmpty(list)){
+//                        for(int j=0;j<list.size();j++){
+//                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
+//                        }
+//                    }
+//                }else if(deviceType == 509){
+//                    LambdaQueryWrapper<DataEvHistory> evQuery = Wrappers.lambdaQuery();
+//                    evQuery.select(DataEvHistory::getAttributeData,DataEvHistory::getDataTime)
+//                            .eq(DataEvHistory::getDeviceId,deviceId)
+//                            .eq(DataEvHistory::getAttributeName,metrics.get(i))
+//                            .between(DataEvHistory::getDataTime,startTime,endTime);
+//                    List<DataEvHistory> list = dataEvHistoryService.list(evQuery);
+//
+//                    if(CollectionUtils.isNotEmpty(list)){
+//                        for(int j=0;j<list.size();j++){
+//                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
+//                        }
+//                    }
+//                }else if(deviceType == 510){
+//                    LambdaQueryWrapper<DataLcHistory> lcQuery = Wrappers.lambdaQuery();
+//                    lcQuery.select(DataLcHistory::getAttributeData,DataLcHistory::getDataTime)
+//                            .eq(DataLcHistory::getDeviceId,deviceId)
+//                            .eq(DataLcHistory::getAttributeName,metrics.get(i))
+//                            .between(DataLcHistory::getDataTime,startTime,endTime);
+//                    List<DataLcHistory> list = dataLcHistoryService.list(lcQuery);
+//
+//                    if(CollectionUtils.isNotEmpty(list)){
+//                        for(int j=0;j<list.size();j++){
+//                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
+//                        }
+//                    }
+//                }
 
                 HistoryResultVo historyResultVo = new HistoryResultVo(deviceId,metrics.get(i),items);
                 result.add(historyResultVo);

service-backend/service-backend-biz/src/main/resources/mapper.backend/DataRealTimeMapper.xml → service-backend/service-backend-biz/src/main/resources/mapper/backend/DataRealTimeMapper.xml

@@ -17,6 +17,23 @@
 <!--        insert into ${tableName}   ( device_id, device_type,  attribute_name, attribute_data, data_time, insert_time)-->
 <!--        values (#{dataInfo.deviceId}, #{dataInfo.deviceType},  #{dataInfo.name},  #{dataInfo.value},  #{dataInfo.timestamp},  #{curTime})-->
 <!--    </insert>-->
+    <select id="QueryHistoryData" resultType="com.usky.backend.domain.MetricItemVo">
+        SELECT
+        attribute_data as value,data_time as timestamp
+        FROM
+        ${tableName}
+        <where>
+            <if test="deviceId != null">
+                and device_id = #{deviceId}
+            </if>
+            <if test="metric != null">
+                and attribute_name = #{metric}
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and  data_time BETWEEN  #{startTime} AND  #{endTime}
+            </if>
+        </where>
+    </select>
 
 
 </mapper>

service-backend/service-backend-biz/src/main/resources/mapper.backend/SysConfigMapper.xml → service-backend/service-backend-biz/src/main/resources/mapper/backend/SysConfigMapper.xml

@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.backend.mapper.SysConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.backend.domain.SysConfig">
-        <id column="config_id" property="configId" />
-        <result column="config_name" property="configName" />
-        <result column="config_key" property="configKey" />
-        <result column="config_value" property="configValue" />
-        <result column="config_type" property="configType" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="remark" property="remark" />
-        <result column="tenant_id" property="tenantId" />
-    </resultMap>
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.backend.mapper.SysConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.backend.domain.SysConfig">
+        <id column="config_id" property="configId" />
+        <result column="config_name" property="configName" />
+        <result column="config_key" property="configKey" />
+        <result column="config_value" property="configValue" />
+        <result column="config_type" property="configType" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="remark" property="remark" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>

service-backend/service-backend-biz/src/main/resources/mapper.backend/SysTenantMapper.xml → service-backend/service-backend-biz/src/main/resources/mapper/backend/SysTenantMapper.xml

@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.backend.mapper.SysTenantMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.backend.domain.SysTenant">
-        <id column="id" property="id" />
-        <result column="tenant_code" property="tenantCode" />
-        <result column="tenant_name" property="tenantName" />
-        <result column="tenant_manager" property="tenantManager" />
-        <result column="tenant_type" property="tenantType" />
-        <result column="domain" property="domain" />
-        <result column="email" property="email" />
-        <result column="phone_number" property="phoneNumber" />
-        <result column="address" property="address" />
-        <result column="tenant_term" property="tenantTerm" />
-        <result column="remark" property="remark" />
-        <result column="status" property="status" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.backend.mapper.SysTenantMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.backend.domain.SysTenant">
+        <id column="id" property="id" />
+        <result column="tenant_code" property="tenantCode" />
+        <result column="tenant_name" property="tenantName" />
+        <result column="tenant_manager" property="tenantManager" />
+        <result column="tenant_type" property="tenantType" />
+        <result column="domain" property="domain" />
+        <result column="email" property="email" />
+        <result column="phone_number" property="phoneNumber" />
+        <result column="address" property="address" />
+        <result column="tenant_term" property="tenantTerm" />
+        <result column="remark" property="remark" />
+        <result column="status" property="status" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/CrmCustomRemindController.java

@@ -44,8 +44,9 @@ public class CrmCustomRemindController {
      */
     @GetMapping("/page")
     public ApiResult<CommonPage<CrmCustomRemind>> page(@RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
-                                                       @RequestParam(value = "size", required = false, defaultValue = "10") Integer size){
-        return ApiResult.success(crmCustomRemindService.page(current,size));
+                                                       @RequestParam(value = "size", required = false, defaultValue = "10") Integer size,
+                                                       @RequestParam(value = "customId") Integer customId){
+        return ApiResult.success(crmCustomRemindService.page(current,size,customId));
     }
 
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/CrmCustomRemindService.java

@@ -16,6 +16,6 @@ public interface CrmCustomRemindService extends CrudService<CrmCustomRemind> {
 
     void add(CrmCustomRemind crmCustomRemind);
 
-    CommonPage<CrmCustomRemind> page(Integer current, Integer size);
+    CommonPage<CrmCustomRemind> page(Integer current, Integer size, Integer customId);
 
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmServiceImpl.java

@@ -208,6 +208,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
     }
     @Override
     public boolean add(BaseAlarm baseAlarm) {
+        baseAlarm.setHandleStatus(0);
         baseAlarm.setTenantId(SecurityUtils.getTenantId());
         return this.save(baseAlarm);
     }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmTypeServiceImpl.java

@@ -44,9 +44,9 @@ public class BaseAlarmTypeServiceImpl extends AbstractCrudService<BaseAlarmTypeM
         if(checkNameUnique(baseAlarmType)){
             throw new BusinessException("新增告警类型名称失败，"+baseAlarmType.getTypeName()+" 已经存在");
         }
-        Calendar car = Calendar.getInstance();
-        Date date = car.getTime();
-        baseAlarmType.setTypeCode(baseAlarmType.getTypeAbbrevia()+"-"+new SimpleDateFormat("yyyyMMddHHmmssSSS").format(date));
+        //Calendar car = Calendar.getInstance();
+        //Date date = car.getTime();
+        //baseAlarmType.setTypeCode(baseAlarmType.getTypeAbbrevia()+"-"+new SimpleDateFormat("yyyyMMddHHmmssSSS").format(date));
         baseAlarmType.setCreateBy(SecurityUtils.getUsername());
         baseAlarmType.setCreateTime(LocalDateTime.now());
         baseAlarmType.setTenantId(SecurityUtils.getTenantId());

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmCustomInfoServiceImpl.java

@@ -86,6 +86,7 @@ public class CrmCustomInfoServiceImpl extends AbstractCrudService<CrmCustomInfoM
                 .eq(cus.getMaintainStatus() != null,CrmCustomInfo::getMaintainStatus,cus.getMaintainStatus())
                 .between(StringUtils.isNotBlank(cus.getStartTime())&&StringUtils.isNotBlank(cus.getEndTime()),CrmCustomInfo::getExpireTime,cus.getStartTime(),cus.getEndTime())
                 .eq(CrmCustomInfo::getDeleteFlag,0)
+                .eq(CrmCustomInfo::getTenantId,SecurityUtils.getTenantId())
                 .orderByDesc(CrmCustomInfo::getId);
         page = this.page(page,queryWrapper);
 
@@ -102,6 +103,7 @@ public class CrmCustomInfoServiceImpl extends AbstractCrudService<CrmCustomInfoM
                 .eq(cus.getMaintainStatus() != null,CrmCustomInfo::getMaintainStatus,cus.getMaintainStatus())
                 .between(StringUtils.isNotBlank(cus.getStartTime())&&StringUtils.isNotBlank(cus.getEndTime()),CrmCustomInfo::getExpireTime,cus.getStartTime(),cus.getEndTime())
                 .eq(CrmCustomInfo::getDeleteFlag,0)
+                .eq(CrmCustomInfo::getTenantId,SecurityUtils.getTenantId())
                 .orderByDesc(CrmCustomInfo::getId);
         List<CrmCustomInfo> list1 = this.list(queryWrapper);
         if(CollectionUtils.isNotEmpty(list1)){
@@ -130,7 +132,8 @@ public class CrmCustomInfoServiceImpl extends AbstractCrudService<CrmCustomInfoM
         Integer id = null == crmCustomInfo.getId()?-1:crmCustomInfo.getId();
         LambdaQueryWrapper<CrmCustomInfo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(CrmCustomInfo::getProjectName,crmCustomInfo.getProjectName())
-                    .eq(CrmCustomInfo::getDeleteFlag,0);
+                    .eq(CrmCustomInfo::getDeleteFlag,0)
+                .eq(CrmCustomInfo::getTenantId,SecurityUtils.getTenantId());
         CrmCustomInfo one = this.getOne(queryWrapper);
         return null != one && !Objects.equals(one.getId(),id);
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmCustomRemindServiceImpl.java

@@ -106,10 +106,12 @@ public class CrmCustomRemindServiceImpl extends AbstractCrudService<CrmCustomRem
     }
 
     @Override
-    public CommonPage<CrmCustomRemind> page(Integer current, Integer size){
+    public CommonPage<CrmCustomRemind> page(Integer current, Integer size, Integer customId){
         IPage<CrmCustomRemind> page = new Page<>(current,size);
         LambdaQueryWrapper<CrmCustomRemind> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.orderByDesc(CrmCustomRemind::getId);
+        queryWrapper.eq(CrmCustomRemind::getCustomId,customId)
+                .eq(CrmCustomRemind::getTenantId,SecurityUtils.getTenantId())
+                .orderByDesc(CrmCustomRemind::getId);
         page = this.page(page,queryWrapper);
 
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getSize(),page.getCurrent());