moral.git - Gitblit

parent: ea66c01f | patch | commit | ignore whitespace

jinpengyong

2022-12-14 ad1cb1a11e642ce600d8480b8d3aa6a27f6732f9

国控站数据维护问题

3 files modified

	screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java	32 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java	5 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java	54 ●●●●● patch \| view \| raw \| blame \| history

 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

@@ -444,11 +444,10 @@
        return deviceInfo;
    }

    @Autowired
    private  HistoryHourlyMapper historyHourlyMapper;
    @Override
    public Map<String, Object> adjustDeviceData(Map<String, Object> deviceData,String code) {
        String mac = deviceData.remove("mac").toString();
//        String mac = deviceData.remove("mac").toString();
        String mac = deviceData.get("mac").toString();
        //从redis获取校准公式
        Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
        if (!ObjectUtils.isEmpty(adjustFormula)) {
@@ -459,27 +458,7 @@
            if (govMpInfo.get("guid") != null) {
                aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
            }
            if (code.equals("2")){
                if (ObjectUtils.isEmpty(aqiMap.get("a21005")) || ObjectUtils.isEmpty(aqiMap.get("a21026"))
                 || ObjectUtils.isEmpty(aqiMap.get("a21004")) || ObjectUtils.isEmpty(aqiMap.get("a34002"))
                 || ObjectUtils.isEmpty(aqiMap.get("a34004")) || ObjectUtils.isEmpty(aqiMap.get("a05024"))
                 || ObjectUtils.isEmpty(aqiMap)){
                    HashMap<String, Object> result = new HashMap<>();
                    String dataTime = deviceData.get("DataTime").toString();
                    Date time = DateUtils.getDate(dataTime, DateUtils.yyyyMMddHHmmss_EN);
                    String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -2), DateUtils.yyyyMM_EN);
                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
                    String format = simpleDateFormat.format(DateUtils.addHours(time, -2));
                    result.put("timeUnits",yearAndMonth);
                    result.put("mac",mac);
                    result.put("time",format);
                    Map<String, Object> map = historyHourlyMapper.selectHistoryHourly(result);
                    if (!ObjectUtils.isEmpty(map)){
                       return JSON.parseObject(map.get("value").toString(),  Map.class);
                    }
                }
            }
            return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
            return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap,code);
        }
        deviceData.remove("DataTime");
        return deviceData;
@@ -487,7 +466,8 @@

    @Override
    public Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData) {
        String mac = deviceData.remove("mac").toString();
//        String mac = deviceData.remove("mac").toString();
        String mac = deviceData.get("mac").toString();
        //从redis获取校准公式
        Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
        if (!ObjectUtils.isEmpty(adjustFormula)) {
@@ -498,7 +478,7 @@
            if (ObjectUtils.isEmpty(aqiMap)) {
                aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
            }
            return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
            return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap,"0");
        }
        deviceData.remove("DataTime");
        return deviceData;

 screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java

@@ -546,7 +546,8 @@

    @Override
    public Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData) {
        String mac = deviceData.remove("mac").toString();
//        String mac = deviceData.remove("mac").toString();
        String mac = deviceData.get("mac").toString();
        //从redis获取校准公式
        Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
        if (!org.springframework.util.ObjectUtils.isEmpty(adjustFormula)) {
@@ -567,7 +568,7 @@
            if (null != govMpInfo && null != govMpInfo.get("guid")) {
                aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
            }
            return adjustDataUtils.adjust(deviceData, adjustFormula, org.springframework.util.ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
            return adjustDataUtils.adjust(deviceData, adjustFormula, org.springframework.util.ObjectUtils.isEmpty(aqiMap) ? null : aqiMap,"0");
        }
        deviceData.remove("DataTime");
        return deviceData;

 screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java

@@ -1,11 +1,13 @@
package com.moral.api.util;

import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -14,24 +16,30 @@
import java.util.Set;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.Expression;
import com.moral.api.entity.DeviceAdjustValue;
import com.moral.api.mapper.HistoryHourlyMapper;
import com.moral.constant.Constants;
import com.moral.util.DateUtils;

@Slf4j
@Component
public class AdjustDataUtils {

    @Autowired
    private HistoryHourlyMapper historyHourlyMapper;
    /**
     * @param deviceData    设备数据
     * @param adjustFormula 校准公式，包含所有因子校准公式，key为因子code,value为校准公式（各个时间段的公式List）
     * @param aqiMap        与设备绑定的国控站点aqi数据
     * @return Map<String, Object> 校准后数据
     */
    public Map<String, Object> adjust(Map<String, Object> deviceData, Map<String, Object> adjustFormula, Map<String, Object> aqiMap) {
    public Map<String, Object> adjust(Map<String, Object> deviceData, Map<String, Object> adjustFormula, Map<String, Object> aqiMap,String code) {
        try {
            Date time = DateUtils.getDate((String) deviceData.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
            String mac = deviceData.remove("mac").toString();
            long finalTime = DateUtils.dataToTimeStampTime(time, DateUtils.HH_mm_ss_EN).getTime();

            //先校准烟气流速，再用流速校准烟气流量
@@ -97,6 +105,50 @@
                    deviceData.put(key, Double.parseDouble(String.format("%.4f", measuredValue)));
                }
            }
          if (code.equals("2")){
              HashMap<String, Object> result = new HashMap<>();
              String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -2), DateUtils.yyyyMM_EN);
              SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
              String format = simpleDateFormat.format(DateUtils.addHours(time, -2));
              result.put("timeUnits",yearAndMonth);
              result.put("mac",mac);
              result.put("time",format);
              Map<String, Object> map = historyHourlyMapper.selectHistoryHourly(result);
              if (ObjectUtils.isEmpty(map)){
                  return deviceData;
              }
              if (ObjectUtils.isEmpty(aqiMap.get("a21005"))){
                  JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
                  String a21005 = jsonObject.get("a21005").toString();
                  deviceData.put("a21005",Double.parseDouble(a21005));
              }
              if (ObjectUtils.isEmpty(aqiMap.get("a21026"))){
                  JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
                  String a21026 = jsonObject.get("a21026").toString();
                  deviceData.put("a21026",Double.parseDouble(a21026));
              }
              if (ObjectUtils.isEmpty(aqiMap.get("a21004"))){
                  JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
                  String a21004 = jsonObject.get("a21004").toString();
                  deviceData.put("a21004",Double.parseDouble(a21004));
              }
              if (ObjectUtils.isEmpty(aqiMap.get("a34002"))){
                  JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
                  String a34002 = jsonObject.get("a34002").toString();
                  deviceData.put("a34002",Double.parseDouble(a34002));
              }
              if (ObjectUtils.isEmpty(aqiMap.get("a34004"))){
                  JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
                  String a34004 = jsonObject.get("a34004").toString();
                  deviceData.put("a34004",Double.parseDouble(a34004));
              }
              if (ObjectUtils.isEmpty(aqiMap.get("a05024"))){
                  JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
                  String a05024 = jsonObject.get("a05024").toString();
                  deviceData.put("a05024",Double.parseDouble(a05024));
              }
          }

        } catch (Exception e) {
            log.error("param[0] deviceData:" + JSON.toJSONString(deviceData));
        }

			@@ -444,11 +444,10 @@
			return deviceInfo;
			}

			@Autowired
			private HistoryHourlyMapper historyHourlyMapper;
			@Override
			public Map<String, Object> adjustDeviceData(Map<String, Object> deviceData,String code) {
			String mac = deviceData.remove("mac").toString();
			// String mac = deviceData.remove("mac").toString();
			String mac = deviceData.get("mac").toString();
			//从redis获取校准公式
			Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
			if (!ObjectUtils.isEmpty(adjustFormula)) {
			@@ -459,27 +458,7 @@
			if (govMpInfo.get("guid") != null) {
			aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
			}
			if (code.equals("2")){
			if (ObjectUtils.isEmpty(aqiMap.get("a21005")) \|\| ObjectUtils.isEmpty(aqiMap.get("a21026"))
			\|\| ObjectUtils.isEmpty(aqiMap.get("a21004")) \|\| ObjectUtils.isEmpty(aqiMap.get("a34002"))
			\|\| ObjectUtils.isEmpty(aqiMap.get("a34004")) \|\| ObjectUtils.isEmpty(aqiMap.get("a05024"))
			\|\| ObjectUtils.isEmpty(aqiMap)){
			HashMap<String, Object> result = new HashMap<>();
			String dataTime = deviceData.get("DataTime").toString();
			Date time = DateUtils.getDate(dataTime, DateUtils.yyyyMMddHHmmss_EN);
			String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -2), DateUtils.yyyyMM_EN);
			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
			String format = simpleDateFormat.format(DateUtils.addHours(time, -2));
			result.put("timeUnits",yearAndMonth);
			result.put("mac",mac);
			result.put("time",format);
			Map<String, Object> map = historyHourlyMapper.selectHistoryHourly(result);
			if (!ObjectUtils.isEmpty(map)){
			return JSON.parseObject(map.get("value").toString(), Map.class);
			}
			}
			}
			return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
			return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap,code);
			}
			deviceData.remove("DataTime");
			return deviceData;
			@@ -487,7 +466,8 @@

			@Override
			public Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData) {
			String mac = deviceData.remove("mac").toString();
			// String mac = deviceData.remove("mac").toString();
			String mac = deviceData.get("mac").toString();
			//从redis获取校准公式
			Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
			if (!ObjectUtils.isEmpty(adjustFormula)) {
			@@ -498,7 +478,7 @@
			if (ObjectUtils.isEmpty(aqiMap)) {
			aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
			}
			return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
			return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap,"0");
			}
			deviceData.remove("DataTime");
			return deviceData;

			@@ -546,7 +546,8 @@

			@Override
			public Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData) {
			String mac = deviceData.remove("mac").toString();
			// String mac = deviceData.remove("mac").toString();
			String mac = deviceData.get("mac").toString();
			//从redis获取校准公式
			Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
			if (!org.springframework.util.ObjectUtils.isEmpty(adjustFormula)) {
			@@ -567,7 +568,7 @@
			if (null != govMpInfo && null != govMpInfo.get("guid")) {
			aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
			}
			return adjustDataUtils.adjust(deviceData, adjustFormula, org.springframework.util.ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
			return adjustDataUtils.adjust(deviceData, adjustFormula, org.springframework.util.ObjectUtils.isEmpty(aqiMap) ? null : aqiMap,"0");
			}
			deviceData.remove("DataTime");
			return deviceData;

			@@ -1,11 +1,13 @@
			package com.moral.api.util;

			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Component;
			import org.springframework.util.ObjectUtils;
			import org.springframework.util.StringUtils;

			import java.math.BigDecimal;
			import java.text.SimpleDateFormat;
			import java.util.Date;
			import java.util.HashMap;
			import java.util.List;
			@@ -14,24 +16,30 @@
			import java.util.Set;

			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONObject;
			import com.googlecode.aviator.AviatorEvaluator;
			import com.googlecode.aviator.Expression;
			import com.moral.api.entity.DeviceAdjustValue;
			import com.moral.api.mapper.HistoryHourlyMapper;
			import com.moral.constant.Constants;
			import com.moral.util.DateUtils;

			@Slf4j
			@Component
			public class AdjustDataUtils {

			@Autowired
			private HistoryHourlyMapper historyHourlyMapper;
			/**
			* @param deviceData 设备数据
			* @param adjustFormula 校准公式，包含所有因子校准公式，key为因子code,value为校准公式（各个时间段的公式List）
			* @param aqiMap 与设备绑定的国控站点aqi数据
			* @return Map<String, Object> 校准后数据
			*/
			public Map<String, Object> adjust(Map<String, Object> deviceData, Map<String, Object> adjustFormula, Map<String, Object> aqiMap) {
			public Map<String, Object> adjust(Map<String, Object> deviceData, Map<String, Object> adjustFormula, Map<String, Object> aqiMap,String code) {
			try {
			Date time = DateUtils.getDate((String) deviceData.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
			String mac = deviceData.remove("mac").toString();
			long finalTime = DateUtils.dataToTimeStampTime(time, DateUtils.HH_mm_ss_EN).getTime();

			//先校准烟气流速，再用流速校准烟气流量
			@@ -97,6 +105,50 @@
			deviceData.put(key, Double.parseDouble(String.format("%.4f", measuredValue)));
			}
			}
			if (code.equals("2")){
			HashMap<String, Object> result = new HashMap<>();
			String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -2), DateUtils.yyyyMM_EN);
			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
			String format = simpleDateFormat.format(DateUtils.addHours(time, -2));
			result.put("timeUnits",yearAndMonth);
			result.put("mac",mac);
			result.put("time",format);
			Map<String, Object> map = historyHourlyMapper.selectHistoryHourly(result);
			if (ObjectUtils.isEmpty(map)){
			return deviceData;
			}
			if (ObjectUtils.isEmpty(aqiMap.get("a21005"))){
			JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
			String a21005 = jsonObject.get("a21005").toString();
			deviceData.put("a21005",Double.parseDouble(a21005));
			}
			if (ObjectUtils.isEmpty(aqiMap.get("a21026"))){
			JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
			String a21026 = jsonObject.get("a21026").toString();
			deviceData.put("a21026",Double.parseDouble(a21026));
			}
			if (ObjectUtils.isEmpty(aqiMap.get("a21004"))){
			JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
			String a21004 = jsonObject.get("a21004").toString();
			deviceData.put("a21004",Double.parseDouble(a21004));
			}
			if (ObjectUtils.isEmpty(aqiMap.get("a34002"))){
			JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
			String a34002 = jsonObject.get("a34002").toString();
			deviceData.put("a34002",Double.parseDouble(a34002));
			}
			if (ObjectUtils.isEmpty(aqiMap.get("a34004"))){
			JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
			String a34004 = jsonObject.get("a34004").toString();
			deviceData.put("a34004",Double.parseDouble(a34004));
			}
			if (ObjectUtils.isEmpty(aqiMap.get("a05024"))){
			JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
			String a05024 = jsonObject.get("a05024").toString();
			deviceData.put("a05024",Double.parseDouble(a05024));
			}
			}

			} catch (Exception e) {
			log.error("param[0] deviceData:" + JSON.toJSONString(deviceData));
			}