fix:修复监测设备、监控对象、监测点位不能根据组织id查询bug

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/service/impl/MonitorDeviceServiceImpl.java

@@ -12,6 +12,7 @@
  */
 package vip.xiaonuo.coldchain.modular.monitordevice.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -28,6 +29,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import rk.netDevice.sdk.p2.ParamData;
 import rk.netDevice.sdk.p2.ParamIdsData;
+import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.coldchain.core.bean.influxdb.SensorData;
 import vip.xiaonuo.coldchain.core.cache.monitordevice.MonitorDeviceCache;
 import vip.xiaonuo.coldchain.core.renke.RenKeService;
@@ -76,6 +79,7 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
 
     @Override
     public Page<MonitorDevice> page(MonitorDevicePageParam monitorDevicePageParam) {
+        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         QueryWrapper<MonitorDevice> queryWrapper = new QueryWrapper<MonitorDevice>().checkSqlInjection();
         if (ObjectUtil.isNotEmpty(monitorDevicePageParam.getDeviceName())) {
             queryWrapper.lambda().like(MonitorDevice::getDeviceName, monitorDevicePageParam.getDeviceName());
@@ -89,10 +93,11 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
         } else {
             queryWrapper.lambda().orderByAsc(MonitorDevice::getSortCode);
         }
-        queryWrapper.lambda().eq(MonitorDevice::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);
+        queryWrapper.lambda().eq(MonitorDevice::getCreateOrg,loginUser.getOrgId()).eq(MonitorDevice::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);
         Page<MonitorDevice> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
         for (MonitorDevice record : page.getRecords()) {
             MonitorDeviceType monitorDeviceType = monitorDeviceTypeService.getById(record.getModelName());
+            record.setCreateOrgName(loginUser.getOrgName());
             if (ObjectUtil.isNotNull(monitorDeviceType)) {
                 record.setTypeName(monitorDeviceType.getName());
             }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/impl/MonitorTargetServiceImpl.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.coldchain.modular.monitordevice.service.MonitorDeviceService;
 import vip.xiaonuo.coldchain.modular.monitortarget.entity.MonitorTarget;
@@ -61,6 +62,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
 
     @Override
     public Page<MonitorTarget> page(MonitorTargetPageParam monitorTargetPageParam) {
+        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         QueryWrapper<MonitorTarget> queryWrapper = new QueryWrapper<MonitorTarget>().checkSqlInjection();
         if (ObjectUtil.isNotEmpty(monitorTargetPageParam.getName())) {
             queryWrapper.lambda().like(MonitorTarget::getName, monitorTargetPageParam.getName());
@@ -71,11 +73,12 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
         } else {
             queryWrapper.lambda().orderByAsc(MonitorTarget::getId);
         }
-        queryWrapper.lambda().eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
+        queryWrapper.lambda().eq(MonitorTarget::getCreateOrg,loginUser.getOrgId()).eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
         Page<MonitorTarget> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
         //获取设备区域列表并赋值返回
         page.getRecords().forEach(monitorTarget -> {
             monitorTarget.setMonitorTargetRegionList(monitorTargetRegionService.getRegionListByTargetId(monitorTarget.getId()));
+            monitorTarget.setCreateOrgName(loginUser.getOrgName());
         });
         return page;
     }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortargetregion/service/impl/MonitorTargetRegionServiceImpl.java

@@ -28,6 +28,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.coldchain.modular.monitordevice.entity.MonitorDevice;
 import vip.xiaonuo.coldchain.modular.monitordevice.service.MonitorDeviceService;
 import vip.xiaonuo.coldchain.modular.monitortarget.entity.MonitorTarget;
@@ -67,6 +69,7 @@ public class MonitorTargetRegionServiceImpl extends ServiceImpl<MonitorTargetReg
 
     @Override
     public Page<MonitorTargetRegion> page(MonitorTargetRegionPageParam monitorTargetRegionPageParam) {
+        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         QueryWrapper<MonitorTargetRegion> queryWrapper = new QueryWrapper<MonitorTargetRegion>().checkSqlInjection();
         if (ObjectUtil.isNotEmpty(monitorTargetRegionPageParam.getName())) {
             queryWrapper.lambda().like(MonitorTargetRegion::getName, monitorTargetRegionPageParam.getName());
@@ -81,13 +84,14 @@ public class MonitorTargetRegionServiceImpl extends ServiceImpl<MonitorTargetReg
         } else {
             queryWrapper.lambda().orderByAsc(MonitorTargetRegion::getId);
         }
-        queryWrapper.lambda().eq(MonitorTargetRegion::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);
+        queryWrapper.lambda().eq(MonitorTargetRegion::getCreateOrg,loginUser.getOrgId()).eq(MonitorTargetRegion::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);
         Page<MonitorTargetRegion> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
         for (MonitorTargetRegion monitorTargetRegion : page.getRecords()) {
             String targetId = monitorTargetService.getById(monitorTargetRegion.getMonitorTargetId()).getName();
             monitorTargetRegion.setTargetName(targetId);
             String deviceName = monitorDeviceService.getById(monitorTargetRegion.getMonitorDeviceId()).getDeviceName();
             monitorTargetRegion.setDeviceName(deviceName);
+            monitorTargetRegion.setCreateOrgName(loginUser.getOrgName());
         }
         return page;
     }