From 808b5c18e6acbb75bad247f0a8edda60976abd06 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 15:14:50 +0800
Subject: [PATCH] chore:五分钟数据补0提交
---
screen-api/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java
index 019fc8e..4ed8de9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java
@@ -4,8 +4,10 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.moral.api.entity.Device;
import com.moral.api.entity.OrganizationLayout;
+import com.moral.api.entity.SpecialDevice;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.OrganizationLayoutMapper;
+import com.moral.api.mapper.SpecialDeviceMapper;
import com.moral.api.service.OrganizationLayoutService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -35,6 +37,9 @@
@Autowired(required = false)
private DeviceMapper deviceMapper;
+ @Autowired(required = false)
+ private SpecialDeviceMapper specialDeviceMapper;
+
@Transactional
@Override
public Map<String, Object> getLayoutByMac(String mac) {
@@ -42,19 +47,30 @@
wrapper_device.eq("is_delete",Constants.NOT_DELETE);
wrapper_device.eq("mac",mac);
Device device = deviceMapper.selectOne(wrapper_device);
- if (ObjectUtils.isEmpty(device)){
+ QueryWrapper<SpecialDevice> wrapper_specialDevice = new QueryWrapper<>();
+ wrapper_specialDevice.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_specialDevice.eq("mac",mac);
+ SpecialDevice specialDevice = specialDeviceMapper.selectOne(wrapper_specialDevice);
+ if (ObjectUtils.isEmpty(device) && ObjectUtils.isEmpty(specialDevice)){
return null;
}
- int organizationId = device.getOrganizationId();
- int versionId = device.getDeviceVersionId();
+ int organizationId;
+ if (!ObjectUtils.isEmpty(device)){
+ organizationId = device.getOrganizationId();
+ }else {
+ organizationId = specialDevice.getOrganizationId();
+ }
+ int versionId;
+ if (!ObjectUtils.isEmpty(device)){
+ versionId = device.getDeviceVersionId();
+ }else {
+ versionId = specialDevice.getDeviceVersionId();
+ }
QueryWrapper<OrganizationLayout> wrapper_organizationLayout = new QueryWrapper<>();
wrapper_organizationLayout.eq("organization_id",organizationId);
wrapper_organizationLayout.eq("version_id",versionId);
wrapper_organizationLayout.eq("is_delete",Constants.NOT_DELETE);
List<OrganizationLayout> organizationLayouts = organizationLayoutMapper.selectList(wrapper_organizationLayout);
- if (ObjectUtils.isEmpty(organizationLayouts) || organizationLayouts.size()==0){
- return null;
- }
Map<String, Object> resultMap = new HashMap<>();
List<OrganizationLayout> chartSensorKeyList = new ArrayList<>();
List<OrganizationLayout> coreMonitorItemsList = new ArrayList<>();
--
Gitblit v1.8.0