设备版本添加大屏界面控制

ZhuDongming

2020-05-19 e51e2d053b498e236097bcb4012c8446d672be86

设备版本添加大屏界面控制

 src/main/java/com/moral/controller/OrganizationLayoutController.java

@@ -1,22 +1,27 @@
package com.moral.controller;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import javax.annotation.Resource;

import com.moral.common.bean.ResultBean;
import com.moral.entity.DeviceVersion;
import com.moral.entity.Sensor;
import com.moral.entity.layout.RealTimeDeviceLayout;
import com.moral.entity.layout.RtdLayoutUpload;
import com.moral.entity.layout.SensorComb;
import com.moral.service.DeviceVersionService;
import com.moral.service.OrganizationLayoutService;
import com.moral.service.SensorService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("org-layout")

 src/main/java/com/moral/service/impl/HistoryServiceImpl.java

@@ -23,10 +23,6 @@


import javax.annotation.Resource;



import org.apache.commons.collections.CollectionUtils;

import org.springframework.stereotype.Service;

import org.springframework.util.ObjectUtils;



import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson.JSONObject;

import com.googlecode.aviator.AviatorEvaluator;

@@ -46,6 +42,10 @@
import com.moral.service.HistoryService;

import com.moral.service.ProfessionService;

import com.moral.util.AQICalculation;



import org.apache.commons.collections.CollectionUtils;

import org.springframework.stereotype.Service;

import org.springframework.util.ObjectUtils;



@Service

public class HistoryServiceImpl implements HistoryService {

@@ -485,6 +485,8 @@
        String startTime = parameters.get("startTime").toString();

        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

        LocalDateTime startTimeLocalDateTime = LocalDateTime.parse(startTime, dateTimeFormatter);

        LocalDateTime today = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);

        LocalDateTime startTimeDay = startTimeLocalDateTime.truncatedTo(ChronoUnit.DAYS);

        int year = startTimeLocalDateTime.getYear();

        int month = startTimeLocalDateTime.getMonthValue();

        String monthStr = month < 10 ? ("0" + month) : month + "";

@@ -496,7 +498,9 @@
        }

        parameters.put("sensorKeys", sensorKeys);

        List<Map<String, Object>> listMap = null;

        if (today.compareTo(startTimeDay) == 0) {

        listMap = historyMapper.listGetSensorData(parameters);

        }

        if (CollectionUtils.isEmpty(listMap)) {

            listMap = historyMapper.getCarSensorData(parameters);

            if (CollectionUtils.isEmpty(listMap)) {


 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);

 src/main/resources/mapper/DeviceVersionMapper.xml

@@ -24,10 +24,6 @@
                (
                   SELECT id FROM monitor_point mpt
                   WHERE mpt.organization_id = #{orgId,jdbcType=INTEGER}
                        or EXISTS (
                        SELECT * from dictionary_data where dict_data_key = 'auth_config_super_org' and dict_data_value = #{orgId,jdbcType=INTEGER}
                        )

                )
              )
          order by dvn.create_time desc

 src/main/resources/mapper/HistoryHourlyMapper.xml

 src/main/resources/mapper/HistoryMapper.xml

 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -228,8 +228,7 @@
        AND h.time >= #{start}
        AND h.time <![CDATA[<=]]> #{end}
        AND h.mac in
        <foreach collection="macs" open="(" separator="," close=")"
                 item="mac">
        <foreach collection="macs" open="(" separator="," close=")" item="mac">
      #{mac}
    </foreach>
        GROUP BY