From e51e2d053b498e236097bcb4012c8446d672be86 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 19 May 2020 16:35:46 +0800
Subject: [PATCH] 设备版本添加大屏界面控制
---
src/main/java/com/moral/service/impl/OrganizationLayoutServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/OrganizationLayoutServiceImpl.java b/src/main/java/com/moral/service/impl/OrganizationLayoutServiceImpl.java
index dea8ca8..d4814ad 100644
--- a/src/main/java/com/moral/service/impl/OrganizationLayoutServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OrganizationLayoutServiceImpl.java
@@ -1,8 +1,19 @@
package com.moral.service.impl;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
-import com.moral.entity.*;
+import com.moral.entity.DictionaryData;
+import com.moral.entity.OrganizationLayout;
+import com.moral.entity.OrganizationSensorUnit;
+import com.moral.entity.Sensor;
+import com.moral.entity.SensorUnit;
import com.moral.entity.layout.RealTimeDeviceLayout;
import com.moral.entity.layout.RtdLayoutUpload;
import com.moral.entity.layout.SensorComb;
@@ -11,15 +22,10 @@
import com.moral.mapper.OrganizationSensorUnitMapper;
import com.moral.mapper.SensorMapper;
import com.moral.service.OrganizationLayoutService;
+
import org.springframework.data.annotation.Transient;
import org.springframework.stereotype.Service;
import tk.mybatis.mapper.entity.Example;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
@Service
public class OrganizationLayoutServiceImpl implements OrganizationLayoutService{
@@ -215,7 +221,8 @@
public RealTimeDeviceLayout queryRtdLayoutWithUnit(Integer orgId, Integer versionNo) {
String pageType = getPageType(versionNo);
if(queryPageConfigCountByOrgId(orgId,pageType) == 0 ){
- orgId = dataMapper.selectSupperOrgId();
+ // orgId = dataMapper.selectSupperOrgId();
+ orgId = 0;
}
RealTimeDeviceLayout rtdLayout = queryRealTimeDeviceLayout(orgId,versionNo);
loadUnitToComb(orgId,rtdLayout);
--
Gitblit v1.8.0