From c3883cee792651c5331635b367ea3daea43bf170 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 10 Nov 2023 09:36:55 +0800
Subject: [PATCH] fix：小程序token变化问题修复
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index ea2d2a4..453be39 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -2,7 +2,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.config.mybatis.MybatisPlusConfig;
import com.moral.api.entity.*;
import com.moral.api.mapper.DeviceMapper;
@@ -10,6 +12,8 @@
import com.moral.api.mapper.HistoryHourlyMapper;
import com.moral.api.mapper.OrganizationUnitAlarmMapper;
import com.moral.api.mapper.UnitConversionMapper;
+import com.moral.api.pojo.vo.device.AppDeviceVo;
+import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.SensorService;
@@ -495,6 +499,43 @@
return device;
}
+ /**
+ * ������������
+ *
+ * @param mac
+ * @return
+ */
+ @Override
+ public List<AppDeviceVo> getFuzzySearch(String mac) {
+ QxUser user = UserHelper.getCurrentUser();
+ Integer organizationId = user.getOrganizationId();
+// Integer organizationId = 24;
+ List<AppDeviceVo> devices;
+ if (organizationId!=24){
+ devices = deviceMapper.getDevices(mac,organizationId);
+ }else {
+ devices = deviceMapper.getDevices(mac,null);
+ }
+ return devices;
+ }
+
+
+ /**
+ * ������������������������
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public List<Device> getOrganizationDevice(Integer id) {
+ LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Device::getMonitorPointId,id);
+ wrapper.eq(Device::getIsDelete,Constants.NOT_DELETE);
+ wrapper.orderByAsc(Device::getCreateTime);
+ List<Device> devices = deviceMapper.selectList(wrapper);
+ return devices;
+ }
+
private Device getDeviceUnitAlramInforByMacFromDb(String mac){
QueryWrapper<Device> wrapper = new QueryWrapper<>();
wrapper.eq("mac",mac);
--
Gitblit v1.8.0