工业级后台API v2
blame | history | patch | commit | commitdiff | ignore whitespace
jinpengyong
2020-09-08 adde1ed1a99622c80a95dea83e294711d295c55c 
 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);