Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-backend/service-backend-api/src/main/java/com/usky/backend/client/DeviceDataClient.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 @FeignClient(contextId = "deviceDataClient", value = "usky-backend")
 public interface DeviceDataClient {
-
-    @RequestMapping(value = "data")
-    void data(@RequestBody List<DeviceDataInfoVO> list);
+//
+//    @RequestMapping(value = "data")
+//    void data(@RequestBody List<DeviceDataInfoVO> list);
 }

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

@@ -20,12 +20,12 @@ import java.util.List;
 @Api(tags = "数据统一存储RPC")
 public class DeviceDataApi implements DeviceDataClient {
 
-    @Autowired
-    private DataRealTimeService dataRealTimeService;
-
-    @Override
-    public void data(@RequestBody List<DeviceDataInfoVO> list){
-        dataRealTimeService.data(list);
-    }
+//    @Autowired
+//    private DataRealTimeService dataRealTimeService;
+//
+//    @Override
+//    public void data(@RequestBody List<DeviceDataInfoVO> list){
+//        dataRealTimeService.data(list);
+//    }
 
 }

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

@@ -19,6 +19,6 @@ import java.time.LocalDateTime;
 @Repository
 public interface DataRealTimeMapper extends CrudMapper<DataRealTime> {
 
-    int insertHistoryTable(@Param("dataInfo") DeviceDataInfoVO dataInfo, @Param("tableName") String tableName, @Param("curTime") LocalDateTime curTime);
+//    int insertHistoryTable(@Param("dataInfo") DeviceDataInfoVO dataInfo, @Param("tableName") String tableName, @Param("curTime") LocalDateTime curTime);
 
 }

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

@@ -15,6 +15,6 @@ import java.util.List;
  * @since 2023-06-07
  */
 public interface DataRealTimeService extends CrudService<DataRealTime> {
-
-    void data(List<DeviceDataInfoVO> list);
+//
+//    void data(List<DeviceDataInfoVO> list);
 }

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

@@ -35,46 +35,46 @@ import java.util.Map;
  */
 @Service
 public class DataRealTimeServiceImpl extends AbstractCrudService<DataRealTimeMapper, DataRealTime> implements DataRealTimeService {
-    @Autowired
-    private DataRealTimeMapper dataRealTimeMapper;
-
-    @Override
-    public void data(List<DeviceDataInfoVO> list){
-
-        if(CollectionUtils.isNotEmpty(list)){
-            for(int i=0;i<list.size();i++){
-
-                //操作实时数据表，当表中有这个设备的数据时，更新这条属性记录，否则插入
-                LambdaQueryWrapper<DataRealTime> queryWrapper = Wrappers.lambdaQuery();
-                queryWrapper.eq(DataRealTime::getDeviceId,list.get(i).getDeviceId())
-                        .eq(DataRealTime::getAttributeName,list.get(i).getName());
-                DataRealTime one = this.getOne(queryWrapper);
-                if(one != null){
-                    one.setAttributeData(String.valueOf(list.get(i).getValue()));
-                    one.setDataTime(list.get(i).getTimestamp());
-                    one.setInsertTime(LocalDateTime.now());
-                    this.updateById(one);
-                }else{
-                    DataRealTime data = new DataRealTime();
-                    data.setDeviceId(list.get(i).getDeviceId());
-                    data.setDeviceType(list.get(i).getDeviceType());
-                    data.setAttributeName(list.get(i).getName());
-                    data.setAttributeData(String.valueOf(list.get(i).getValue()));
-                    data.setDataTime(list.get(i).getTimestamp());
-                    data.setInsertTime(LocalDateTime.now());
-                    this.save(data);
-                }
-
-                String tableName = "data_"+list.get(i).getTypeAbbrevia()+"_history";
-                //操作各个设备历史数据表（通用方法）
-                int res = dataRealTimeMapper.insertHistoryTable(list.get(i),tableName,LocalDateTime.now());
-                if(res > 0){
-
-                }
-            }
-        }
-
-    }
+//    @Autowired
+//    private DataRealTimeMapper dataRealTimeMapper;
+//
+//    @Override
+//    public void data(List<DeviceDataInfoVO> list){
+//
+//        if(CollectionUtils.isNotEmpty(list)){
+//            for(int i=0;i<list.size();i++){
+//
+//                //操作实时数据表，当表中有这个设备的数据时，更新这条属性记录，否则插入
+//                LambdaQueryWrapper<DataRealTime> queryWrapper = Wrappers.lambdaQuery();
+//                queryWrapper.eq(DataRealTime::getDeviceId,list.get(i).getDeviceId())
+//                        .eq(DataRealTime::getAttributeName,list.get(i).getName());
+//                DataRealTime one = this.getOne(queryWrapper);
+//                if(one != null){
+//                    one.setAttributeData(String.valueOf(list.get(i).getValue()));
+//                    one.setDataTime(list.get(i).getTimestamp());
+//                    one.setInsertTime(LocalDateTime.now());
+//                    this.updateById(one);
+//                }else{
+//                    DataRealTime data = new DataRealTime();
+//                    data.setDeviceId(list.get(i).getDeviceId());
+//                    data.setDeviceType(list.get(i).getDeviceType());
+//                    data.setAttributeName(list.get(i).getName());
+//                    data.setAttributeData(String.valueOf(list.get(i).getValue()));
+//                    data.setDataTime(list.get(i).getTimestamp());
+//                    data.setInsertTime(LocalDateTime.now());
+//                    this.save(data);
+//                }
+//
+//                String tableName = "data_"+list.get(i).getTypeAbbrevia()+"_history";
+//                //操作各个设备历史数据表（通用方法）
+//                int res = dataRealTimeMapper.insertHistoryTable(list.get(i),tableName,LocalDateTime.now());
+//                if(res > 0){
+//
+//                }
+//            }
+//        }
+//
+//    }
 
 
 }

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

@@ -13,10 +13,10 @@
         <result column="data_time" property="dataTime" />
         <result column="insert_time" property="insertTime" />
     </resultMap>
-    <insert id="insertHistoryTable" >
-        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>
+<!--    <insert id="insertHistoryTable" >-->
+<!--        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>-->
 
 
 </mapper>

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpDeviceInfoMapper.java

@@ -23,5 +23,5 @@ public interface DmpDeviceInfoMapper extends CrudMapper<DmpDeviceInfo> {
 
     List<DmpProductInfo> getProductInfo(String productCode);
 
-    Page<DmpDeviceInfo> page(IPage<DmpDeviceInfo> page, @Param("ar")DmpDeviceInfoRequest dmpDeviceInfoRequest);
+    Page<DmpDeviceInfo> page(IPage<DmpDeviceInfo> page, @Param("ar")DmpDeviceInfoRequest dmpDeviceInfoRequest, @Param("tenantId") Integer tenantId);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpDeviceStatusMapper.java

@@ -24,21 +24,25 @@ public interface DmpDeviceStatusMapper extends CrudMapper<DmpDeviceStatus> {
 
     List<DmpDataOverviewVO> getDeviceStatusCollect(@Param("productId") Integer productId,
                                                    @Param("startTime") Date startTime,
-                                                   @Param("endTime") Date endTime);
+                                                   @Param("endTime") Date endTime,
+                                                   @Param("tenantId") Integer tenantId);
 
 
     DmpDataOverviewVO getAllCollect(@Param("productId") Integer productId,
                                              @Param("startTime") Date startTime,
-                                             @Param("endTime") Date endTime);
+                                             @Param("endTime") Date endTime,
+                                    @Param("tenantId") Integer tenantId);
 
 
     List<DmpDataOverviewVO> getMonthHyCollect(@Param("productId") Integer productId,
                                                @Param("startTime") Date startTime,
-                                               @Param("endTime") Date endTime);
+                                               @Param("endTime") Date endTime,
+                                              @Param("tenantId") Integer tenantId);
 
     DmpDataOverviewVO getAllMonthHyCollect(@Param("productId") Integer productId,
                                             @Param("startTime") Date startTime,
-                                            @Param("endTime") Date endTime);
+                                            @Param("endTime") Date endTime,
+                                           @Param("tenantId") Integer tenantId);
 
 
 

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

@@ -58,7 +58,8 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
         if(StringUtils.isNotBlank(baseAlarmRequestVO.getProductName())){
             LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.eq(DmpProductInfo::getDeleteFlag,0)
-                    .like(DmpProductInfo::getProductName,baseAlarmRequestVO.getProductName());
+                    .like(DmpProductInfo::getProductName,baseAlarmRequestVO.getProductName())
+                    .eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
             List<DmpProductInfo> list1 = dmpProductInfoService.list(queryWrapper);
             List<String> productCodeList = new ArrayList<>();
             if(list1.size() > 0){
@@ -69,13 +70,15 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
 
             if(productCodeList.size() > 0){
                 wrapper.select("distinct product_code as productCode")
-                        .in("product_code",productCodeList);
+                        .in("product_code",productCodeList)
+                        .eq("tenant_id",SecurityUtils.getTenantId());
             }else{
                 wrapper.eq("product_code","");
             }
 
         }else{
-            wrapper.select("distinct product_code as productCode");
+            wrapper.select("distinct product_code as productCode")
+                    .eq("tenant_id",SecurityUtils.getTenantId());
         }
         List<BaseAlarm> list1 = this.list(wrapper);
         if(CollectionUtils.isNotEmpty(list1)){
@@ -85,7 +88,8 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
 
                 LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
                 queryWrapper.eq(DmpProductInfo::getDeleteFlag,0)
-                        .eq(DmpProductInfo::getProductCode,list1.get(i).getProductCode());
+                        .eq(DmpProductInfo::getProductCode,list1.get(i).getProductCode())
+                        .eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
                 DmpProductInfo one = dmpProductInfoService.getOne(queryWrapper);
                 if(one != null){
                     responeVO.setProductName(one.getProductName());
@@ -94,10 +98,10 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
 
                 //未处理
                 int untreated = 0;
-                untreated = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,0).eq(BaseAlarm::getProductCode,list1.get(i).getProductCode()));
+                untreated = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,0).eq(BaseAlarm::getProductCode,list1.get(i).getProductCode()).eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId()));
                 //已处理
                 int processed = 0;
-                processed = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,1).eq(BaseAlarm::getProductCode,list1.get(i).getProductCode()));
+                processed = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,1).eq(BaseAlarm::getProductCode,list1.get(i).getProductCode()).eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId()));
                 //总数
                 int count = untreated+processed;
                 //处置率
@@ -119,16 +123,17 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                 LambdaQueryWrapper<DmpDeviceInfo> queryWrapper1 = Wrappers.lambdaQuery();
                 queryWrapper1.in(DmpDeviceInfo::getServiceStatus,serviceStatusList)
                         .eq(DmpDeviceInfo::getProductCode,list1.get(i).getProductCode())
-                        .eq(DmpDeviceInfo::getDeleteFlag,0);
+                        .eq(DmpDeviceInfo::getDeleteFlag,0)
+                        .eq(DmpDeviceInfo::getTenantId,SecurityUtils.getTenantId());
                 deviceCount = dmpDeviceInfoService.count(queryWrapper1);
                 responeVO.setDeviceCount(deviceCount);
                 //离线告警统计
                 //离线告警未处理
                 int offLineUntreated = 0;
-                offLineUntreated = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,0).eq(BaseAlarm::getAlarmType,"lx-20230700000000000").eq(BaseAlarm::getProductCode,list1.get(i).getProductCode()));
+                offLineUntreated = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,0).eq(BaseAlarm::getAlarmType,"lx-20230700000000000").eq(BaseAlarm::getProductCode,list1.get(i).getProductCode()).eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId()));
                 //离线告警已处理
                 int offLineProcessed = 0;
-                offLineProcessed = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,1).eq(BaseAlarm::getAlarmType,"lx-20230700000000000").eq(BaseAlarm::getProductCode,list1.get(i).getProductCode()));
+                offLineProcessed = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,1).eq(BaseAlarm::getAlarmType,"lx-20230700000000000").eq(BaseAlarm::getProductCode,list1.get(i).getProductCode()).eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId()));
                 //离线告警总数
                 int offLineCount = offLineUntreated+offLineProcessed;
                 //离线告警处置率
@@ -167,12 +172,14 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                 .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarm::getProductCode,baseAlarmListVO.getProductCode())
                 .eq(StringUtils.isNotBlank(baseAlarmListVO.getAlarmType()),BaseAlarm::getAlarmType,baseAlarmListVO.getAlarmType())
                 .between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
+                .eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId())
                 .orderByDesc(BaseAlarm::getId);
         List<BaseAlarm> records = this.list(queryWrapper);
         if(records.size()>0){
             for(int i=0;i<records.size();i++){
                 LambdaQueryWrapper<DmpDeviceInfo> queryWrapper1 = Wrappers.lambdaQuery();
                 queryWrapper1.eq(DmpDeviceInfo::getDeviceId,records.get(i).getDeviceId())
+                        .eq(DmpDeviceInfo::getTenantId,SecurityUtils.getTenantId())
                         .eq(DmpDeviceInfo::getDeleteFlag,0);
                 DmpDeviceInfo deviceInfo = dmpDeviceInfoService.getOne(queryWrapper1);
                 if(deviceInfo != null){
@@ -214,6 +221,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
             LambdaQueryWrapper<BaseAlarm> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.eq(BaseAlarm::getDeviceId,baseAlarm.getDeviceId())
                     .eq(BaseAlarm::getAlarmType,baseAlarm.getAlarmType())
+                    .eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId())
                     .eq(BaseAlarm::getHandleStatus,0);
             List<BaseAlarm> list = this.list(queryWrapper);
             if(list.size() > 0){

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

@@ -3,10 +3,11 @@ package com.usky.iot.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.usky.backend.client.DeviceDataClient;
+//import com.usky.backend.client.DeviceDataClient;
 import com.usky.backend.domain.request.DeviceDataInfoVO;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.*;
 import com.usky.iot.mapper.DmpDataInfoMapper;
 import com.usky.iot.service.*;
@@ -39,9 +40,9 @@ public class DmpDataInfoServiceImpl extends AbstractCrudService<DmpDataInfoMappe
 
     @Autowired
     private DmpDeviceInfoService dmpDeviceInfoService;
-
-    @Autowired
-    private DeviceDataClient deviceDataClient;
+//
+//    @Autowired
+//    private DeviceDataClient deviceDataClient;
 
     @Autowired
     private DmpDeviceTypeService dmpDeviceTypeService;
@@ -52,7 +53,8 @@ public class DmpDataInfoServiceImpl extends AbstractCrudService<DmpDataInfoMappe
 
         LambdaQueryWrapper<DmpDeviceInfo> dmpDeviceQuery = Wrappers.lambdaQuery();
         dmpDeviceQuery.eq(DmpDeviceInfo::getDeleteFlag,0)
-                .eq(DmpDeviceInfo::getDeviceId,dmpDeviceDataRequestVO.getDeviceId());
+                .eq(DmpDeviceInfo::getDeviceId,dmpDeviceDataRequestVO.getDeviceId())
+                .eq(DmpDeviceInfo::getTenantId, SecurityUtils.getTenantId());
         List<DmpDeviceInfo> deviceDataInfo = dmpDeviceInfoService.list(dmpDeviceQuery);
         if(CollectionUtils.isEmpty(deviceDataInfo)){
             throw new BusinessException("录入数据失败，"+dmpDeviceDataRequestVO.getDeviceId()+" 这个设备没有注册");
@@ -62,7 +64,8 @@ public class DmpDataInfoServiceImpl extends AbstractCrudService<DmpDataInfoMappe
         LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DmpProductInfo::getId,DmpProductInfo::getDeviceType)
                 .eq(DmpProductInfo::getDeleteFlag,0)
-                .eq(DmpProductInfo::getProductCode,dmpDeviceDataRequestVO.getProductCode());
+                .eq(DmpProductInfo::getProductCode,dmpDeviceDataRequestVO.getProductCode())
+                .eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
         List<DmpProductInfo> list = dmpProductInfoService.list(queryWrapper);
         if(CollectionUtils.isNotEmpty(list)){
 
@@ -77,6 +80,7 @@ public class DmpDataInfoServiceImpl extends AbstractCrudService<DmpDataInfoMappe
             LambdaQueryWrapper<DmpProductAttribute> queryWrapper1 = Wrappers.lambdaQuery();
             queryWrapper1.select(DmpProductAttribute::getAttributeCode)
                     .eq(DmpProductAttribute::getDeleteFlag,0)
+                    .eq(DmpProductAttribute::getTenantId,SecurityUtils.getTenantId())
                     .eq(DmpProductAttribute::getProductId,list.get(0).getId());
             List<DmpProductAttribute> list1 = dmpProductAttributeService.list(queryWrapper1);
             if(CollectionUtils.isNotEmpty(list1)){
@@ -104,7 +108,7 @@ public class DmpDataInfoServiceImpl extends AbstractCrudService<DmpDataInfoMappe
             throw new BusinessException("查找产品信息失败，"+dmpDeviceDataRequestVO.getProductCode()+" 在产品信息表中不存在");
         }
         if(CollectionUtils.isNotEmpty(dataInfo)){
-            deviceDataClient.data(dataInfo);
+
         }
     }
 

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

@@ -106,7 +106,7 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
     @Override
     public CommonPage<DmpDeviceInfo> page(DmpDeviceInfoRequest diRequest) {
         IPage<DmpDeviceInfo> page = new Page<>(diRequest.getCurrent(), diRequest.getSize());
-        page = baseMapper.page(page,diRequest);
+        page = baseMapper.page(page,diRequest,SecurityUtils.getTenantId());
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }
 

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

@@ -13,6 +13,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
+import com.usky.iot.domain.BaseAlarm;
 import com.usky.iot.domain.DmpDeviceType;
 import com.usky.iot.domain.DmpProductAttribute;
 import com.usky.iot.domain.DmpProductInfo;
@@ -131,6 +132,7 @@ public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInf
                 .like(StringUtils.isNotBlank(piRequest.getProductName()),DmpProductInfo::getProductName,piRequest.getProductName())
                 .eq(StringUtils.isNotBlank(piRequest.getDeviceModel()),DmpProductInfo::getDeviceModel,piRequest.getDeviceModel())
                 .eq(null != piRequest.getId(),DmpProductInfo::getId,piRequest.getId())
+                .eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId())
                 .eq(DmpProductInfo::getDeleteFlag,0);
         List<DmpProductInfo> records = this.list(lambdaQuery);
         List<Integer> productIds = records.stream().map(DmpProductInfo::getId).collect(Collectors.toList());
@@ -186,7 +188,7 @@ public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInf
         if(pageNum != null && pageSize > 0){
             current = (pageNum - 1)*pageSize;
         }
-        List<DmpProductInfo> list = records.stream().skip(current).limit(pageSize).collect(Collectors.toList());
+        List<DmpProductInfo> list = records.stream().sorted(Comparator.comparing(DmpProductInfo::getCreatedTime,Comparator.reverseOrder())).skip(current).limit(pageSize).collect(Collectors.toList());
 
         return new CommonPage<>(list,total,page.getCurrent(),page.getSize());
     }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/job/DmpDataOverviewJob.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.util.Arith;
 import com.usky.common.core.util.DateUtils;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.DmpDataOverview;
 import com.usky.iot.mapper.DmpDeviceStatusMapper;
 import com.usky.iot.service.DmpDataOverviewService;
@@ -121,16 +122,16 @@ public class DmpDataOverviewJob {
     }
 
     public List<DmpDataOverviewVO> getHyListMap(Integer productId,Date startTime,Date endTime){
-        List<DmpDataOverviewVO> list = dmpDeviceStatusMapper.getMonthHyCollect(productId, startTime, endTime);
-        DmpDataOverviewVO map = dmpDeviceStatusMapper.getAllMonthHyCollect(productId, startTime, endTime);
+        List<DmpDataOverviewVO> list = dmpDeviceStatusMapper.getMonthHyCollect(productId, startTime, endTime, SecurityUtils.getTenantId());
+        DmpDataOverviewVO map = dmpDeviceStatusMapper.getAllMonthHyCollect(productId, startTime, endTime, SecurityUtils.getTenantId());
         joinList(list,map);
         return list;
     }
 
     public List<DmpDataOverviewVO> getListMap(Integer productId,Date startTime,Date endTime){
-        List<DmpDataOverviewVO> list = dmpDeviceStatusMapper.getDeviceStatusCollect(productId, startTime, endTime);
+        List<DmpDataOverviewVO> list = dmpDeviceStatusMapper.getDeviceStatusCollect(productId, startTime, endTime, SecurityUtils.getTenantId());
         //全部产品日
-        DmpDataOverviewVO map = dmpDeviceStatusMapper.getAllCollect(productId, startTime, endTime);
+        DmpDataOverviewVO map = dmpDeviceStatusMapper.getAllCollect(productId, startTime, endTime, SecurityUtils.getTenantId());
         joinList(list,map);
         return list;
     }

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDeviceInfoMapper.xml

@@ -39,7 +39,7 @@
                 and dds.device_status = #{ar.deviceStatus}
             </if>
             <if test="1 == 1">
-                and ddi.delete_flag = 0
+                and ddi.delete_flag = 0 and ddi.tenant_id = #{tenantId}
             </if>
         </where>
         order by ddi.id desc

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDeviceStatusMapper.xml

@@ -31,6 +31,9 @@
             <if test="productId != null">
                 and ddi.product_id = #{productId}
             </if>
+            <if test="1 == 1">
+                and ddi.delete_flag = 0 and ddi.tenant_id = #{tenantId}
+            </if>
         </where>
     </select>
     <select id="getMonthHyCollect" resultType="com.usky.iot.service.vo.DmpDataOverviewVO">
@@ -47,6 +50,9 @@
             <if test="productId != null">
                 and ddi.product_id = #{productId}
             </if>
+            <if test="1 == 1">
+                and ddi.delete_flag = 0 and ddi.tenant_id = #{tenantId}
+            </if>
         </where>
         group by productId
     </select>
@@ -64,6 +70,9 @@
             <if test="productId != null">
                 and ddi.product_id = #{productId}
             </if>
+            <if test="1 == 1">
+                and ddi.delete_flag = 0 and ddi.tenant_id = #{tenantId}
+            </if>
         </where>
     </select>
     <select id="getDeviceStatusCollect" resultType="com.usky.iot.service.vo.DmpDataOverviewVO">
@@ -85,6 +94,9 @@
             <if test="productId != null">
                 and ddi.product_id = #{productId}
             </if>
+            <if test="1 == 1">
+                and ddi.delete_flag = 0 and ddi.tenant_id = #{tenantId}
+            </if>
         </where>
         group by productId
     </select>