blame | history | patch | commit | commitdiff | ignore whitespace
jinpengyong
2020-10-23 2c42977a1a38e4f079c5c44fe51a46c27b865f80 
 src/main/java/com/moral/task/HistoryTableInsertTask.java


@@ -1,22 +1,12 @@


package com.moral.task;




import java.math.BigDecimal;


import java.text.SimpleDateFormat;


import java.time.LocalDateTime;


import java.time.temporal.ChronoUnit;


import java.util.ArrayList;


import java.util.Arrays;


import java.util.HashMap;


import java.util.LinkedHashMap;


import java.util.List;


import java.util.Map;


import java.util.*;




import javax.annotation.Resource;




import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


import org.springframework.stereotype.Component;


import org.springframework.util.CollectionUtils;


import org.springframework.util.ObjectUtils;




import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONArray;


@@ -33,6 +23,12 @@


import com.xxl.job.core.biz.model.ReturnT;


import com.xxl.job.core.handler.annotation.XxlJob;


import com.xxl.job.core.log.XxlJobLogger;




import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


import org.springframework.stereotype.Component;


import org.springframework.util.CollectionUtils;


import org.springframework.util.ObjectUtils;




@Component


public class HistoryTableInsertTask {


@@ -332,10 +328,17 @@


    public ReturnT insertHistorySpecialTable(String params) {


        Map macMap = JSON.parseObject(params);


        List<String> macList = (List<String>) macMap.get("mac");


        LocalDateTime value = LocalDateTime.now();


        SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


        Calendar calendar=Calendar.getInstance();


        Date date=calendar.getTime();


        String s=format.format(date);


        calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - 1);


        Date date1=calendar.getTime();


        String s1=format.format(date1);


        Map<String, Object> devices = new HashMap<>();


        devices.put("macList", macList);


        devices.put("time", value);


        devices.put("startTime", s1);


        devices.put("endTime", s);


        try {


            int count = historyService.insertHistorySpecialTable(devices);


            XxlJobLogger.log("insertHistorySpecialTable:" + count);


@@ -356,12 +359,12 @@


    public ReturnT insertHistoryO3Table(String params) {


        Map macMap = JSON.parseObject(params);


        List<String> macList = (List<String>) macMap.get("mac");


        String temperatureRatio = macMap.get("temperatureRatio").toString();


        String illuminationRatio = macMap.get("illuminationRatio").toString();


        String pressureRatio1 = macMap.get("pressureRatio1").toString();


        String pressureRatio2 = macMap.get("pressureRatio2").toString();


        String humidityRatio = macMap.get("humidityRatio").toString();


        String windSpeedRatio = macMap.get("windSpeedRatio").toString();


        BigDecimal temperatureRatio;


        BigDecimal humidityRatio;


        LocalDateTime time = LocalDateTime.now();


        LocalDateTime value = time.truncatedTo(ChronoUnit.HOURS);


        LocalDateTime illuminationTime = value.minusHours(1);


@@ -421,10 +424,14 @@


                                } else {


                                    illumination = new BigDecimal("0");


                                }


                                BigDecimal bignum1 = temperature.multiply(new BigDecimal(temperatureRatio));


                                BigDecimal bignum2 = illumination.divide(new BigDecimal(illuminationRatio));


                                temperatureRatio = new BigDecimal("8").add(new BigDecimal("32").divide(temperature.subtract(new BigDecimal("12")), 4, BigDecimal.ROUND_HALF_UP));


                                BigDecimal bignum1 = temperature.multiply(temperatureRatio);


                                BigDecimal bignum2 = illumination.divide(new BigDecimal(illuminationRatio), 4, BigDecimal.ROUND_HALF_UP);


                                BigDecimal bignum3 = new BigDecimal(pressureRatio1).divide(pressure.subtract(new BigDecimal(pressureRatio2)), 4, BigDecimal.ROUND_HALF_UP);


                                BigDecimal bignum4 = humidity.multiply(new BigDecimal(humidityRatio));


                                BigDecimal index = humidity.subtract(new BigDecimal("100")).divide(new BigDecimal("50"), 4, BigDecimal.ROUND_HALF_UP);


                                double indexDouble = Math.pow(0.8, index.doubleValue());


                                humidityRatio = new BigDecimal("1").add(BigDecimal.valueOf(indexDouble));


                                BigDecimal bignum4 = humidity.multiply(humidityRatio);


                                BigDecimal bignum5 = windSpeed.multiply(new BigDecimal(windSpeedRatio));


                                BigDecimal result = bignum1.add(bignum2).add(bignum3).subtract(bignum4).subtract(bignum5).setScale(4, BigDecimal.ROUND_HALF_UP);


                                jo.put("e15", result);