|
@@ -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());
|
|
|
}
|