From 296d509996b9500c35be0b81860fa14c1d275048 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 10:47:51 +0800
Subject: [PATCH] 更改五分钟数据接口,添加界面左侧站点设备信息接口

---
 src/main/java/com/moral/controller/ScreenController.java |  278 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 263 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 1b6ff2b..cfe9a84 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -2,6 +2,8 @@
 
 import java.io.*;
 import java.lang.reflect.Array;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.ParseException;
@@ -18,6 +20,7 @@
 import com.alibaba.fastjson.JSONArray;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.googlecode.aviator.AviatorEvaluator;
 import com.googlecode.aviator.Expression;
 import com.moral.common.bean.Constants;
@@ -35,11 +38,13 @@
 import com.moral.entity.alarm.AlarmSensorLevel;
 import com.moral.entity.charts.DataSortCondition;
 import com.moral.entity.layout.RealTimeDeviceLayout;
+import com.moral.mapper.HistoryMapper;
 import com.moral.service.*;
 import com.moral.util.*;
 
 import com.rabbitmq.client.*;
 import com.rabbitmq.client.Channel;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -47,6 +52,7 @@
 import io.swagger.models.auth.In;
 import jdk.nashorn.internal.runtime.regexp.joni.Regex;
 import net.sf.json.JSONString;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.net.ftp.FTPClient;
@@ -71,6 +77,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 import org.xml.sax.InputSource;
+
 import static com.moral.common.util.ResourceUtil.getValue;
 import static com.moral.common.util.WebUtils.getParametersStartingWith;
 import static java.util.Calendar.*;
@@ -85,6 +92,9 @@
 @Api(tags = "Screen", description = "������������")
 public class ScreenController {
     public static Logger log = Logger.getLogger(ScreenController.class);
+
+    @Resource
+    private HistoryMapper historyMapper;
     @Resource
     AlarmConfigService alarmConfigService;
     @Resource
@@ -166,6 +176,9 @@
 
     @Resource
     private ScreenVersionService screenVersionService;
+
+    @Resource
+    private DeviceAdjustValueTimingService deviceAdjustValueTimingService;
 
     /**
      * Screen login. ������������
@@ -694,6 +707,9 @@
         //������������������������������������������������
         ParameterUtils.getTimeType4Time(parameters);
         String time1 = (String) parameters.get("time");
+        time1 = time1.replaceAll(" ", "");
+        parameters.put("time",time1);
+
         String mac1 = (String) parameters.get("mac");
         List<Map<String, Object>> list = null;
         if (mac1 != null && mac1.equals("p5dnd7a0392018") && time1.substring(0, 4).equals("2019")) {
@@ -704,13 +720,42 @@
             parameters.put("sensors", Arrays.asList(sensorKey));
             // monitorPointService.isCompensateCalculation(parameters);
             list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+
+
+            /* 0���������������������11������������0���������������������1-24������������������������0������������������������������������24������������
+                ������������������24���������������23-24���������24������������������������0���������������
+             */
+            /*������������start-------------------------------------------------------------------------*/
+            list.remove(0);
+            if (list.size() == 23) {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+                //���������������������yyyy-MM-dd HH:mm:ss
+                time1 = time1 + " 00:00:00";
+                Date date = sdf.parse(time1);
+                date = DateUtil.rollDay(date, 1);
+                //������������������������
+                String time2 = sdf2.format(date);
+                parameters.put("time", time2);
+                /*���������������0������������������24���������������������������*/
+                List<Map<String, Object>> nextDayList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+                if(!ObjectUtils.isEmpty(nextDayList)){
+                    time1=time1.replaceAll(" 00:00:00"," 24");
+                    Map<String, Object> datas = nextDayList.get(0);
+                    datas.put("time",time1);
+                    list.add(datas);
+                }
+            }
+            /*������������end-------------------------------------------------------------------------*/
+
+
             for (Map<String, Object> map : list) {
                 String time = map.get("time").toString();
                 time = time.substring(time.length() - 2);
                 map.put("time", Integer.valueOf(time));
-                if (parameters.get("type").equals("day")) {
+             /*   if (parameters.get("type").equals("day")) {
                     map.put("time", Integer.valueOf(time) + 1);
-                }
+                }*/
                 map.put("value", map.remove(sensorKey));
             }
         }
@@ -1448,12 +1493,13 @@
     public ModelAndView pollutionSource(ModelAndView model, HttpServletRequest request) throws Exception {
         Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
         String timeStr = parameters.get("time").toString();
-        String YearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-"));
+        String yearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-"));
         String Hour = timeStr.substring(timeStr.lastIndexOf("-") + 1);
-        String time = YearAndDay + " " + Hour + ":00:00";
+        String time = yearAndDay + " " + Hour + ":00:00";
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);
         int month = timeLocalDateTime.getMonth().getValue();
+        parameters.put("yearAndDay",yearAndDay);
         Point dirPoint = historyHourlyService.getDirPoint(parameters);
         Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters);
         if (MapUtils.isEmpty(getPollutionSourceData)) {
@@ -2023,7 +2069,7 @@
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.MINUTE, (calendar.get(Calendar.MINUTE) - 2));
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        String time = df.format(calendar.getTime()) + ":00";
+        //String time = df.format(calendar.getTime()) + ":00";
         int year = calendar.get(Calendar.YEAR);
         int month = calendar.get(Calendar.MONTH) + 1;
         String mon;
@@ -2032,8 +2078,8 @@
         } else {
             mon = "" + month;
         }
-        String table = "history_minutely_" + year + mon;
-        List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId, time, table);
+        String table = "history_five_minutely_" + year + mon;
+        List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId, table);
         return list;
     }
 
@@ -2053,8 +2099,8 @@
         } else {
             mon = "" + month;
         }
-        String table = "history_minutely_" + year + mon;
-        List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId, time, table);
+        String table = "history_five_minutely_" + year + mon;
+        List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId, table);
         return list;
     }
 
@@ -2062,9 +2108,28 @@
     @ApiOperation(value = "���������������������������", notes = "���������������������������")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "monitorPointId", defaultValue = "1", value = "���������id", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "time", value = "���6���(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
     public ResultBean<List<Map<String, Object>>> getWeatherNextDayDataByRegion(HttpServletRequest request) throws Exception {
         Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<String> sensorKeys=new ArrayList<>();
+        sensorKeys.add("e15");
+        parameters.put("sensorKeys",sensorKeys);
+        List<Map<String, Object>> resultList = weatherService.getForecastAndReal(parameters);
+        return new ResultBean<List<Map<String, Object>>>(resultList);
+    }
+
+
+    @GetMapping("forecastPM")
+    @ApiOperation(value = "������������������������������", notes = "������������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPointId", defaultValue = "1", value = "���������id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> getForecastAndRealPM(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<String> sensorKeys=new ArrayList<>();
+        sensorKeys.add("e1");
+        sensorKeys.add("e2");
+        parameters.put("sensorKeys",sensorKeys);
         List<Map<String, Object>> resultList = weatherService.getForecastAndReal(parameters);
         return new ResultBean<List<Map<String, Object>>>(resultList);
     }
@@ -2178,7 +2243,7 @@
                     for (Map<String, Object> dataMap : dataList) {
                         JSONObject dataJson = JSONObject.parseObject(dataMap.get("json").toString());
                         if (dataMap.get("time").toString().equals(day + " 00:00:00.0")) {
-                            oneSensorMap.put(dataMap.get("time").toString().substring(0, 10), dataJson.getJSONArray(key).get(2));
+                            oneSensorMap.put(dataMap.get("time").toString().substring(0, 10), dataJson.getJSONArray(key).get(0));
                             break;
                         } else {
                             continue;
@@ -2194,7 +2259,7 @@
                     for (Map sameDayHourlyMap : sameDayHourlyList) {
                         List<Double> arr = new ArrayList<>();
                         JSONObject hourlyJson = JSONObject.parseObject(sameDayHourlyMap.get("json").toString());
-                        arr.add(Double.parseDouble(hourlyJson.getJSONArray(key).get(2).toString()));
+                        arr.add(Double.parseDouble(hourlyJson.getJSONArray(key).get(0).toString()));
                         Double sum = 0.0;
                         for (int i = 0; i < arr.size(); i++) {
                             sum += arr.get(i);
@@ -2230,8 +2295,10 @@
                     for (Map<String, Object> hourlyMap : hourlyList) {
                         JSONObject dataJson = JSONObject.parseObject(hourlyMap.get("json").toString());
                         if (hourlyMap.get("time").toString().equals(hour + ".0")) {
-                            oneSensorMap.put(hourlyMap.get("time").toString().substring(0, 19), dataJson.getJSONArray(key).get(2));
-                            break;
+                            if (dataJson.getJSONArray(key) != null) {
+                                oneSensorMap.put(hourlyMap.get("time").toString().substring(0, 19), dataJson.getJSONArray(key).get(0));
+                                break;
+                            }
                         } else {
                             continue;
                         }
@@ -2550,4 +2617,185 @@
         List<Map<String, Object>> list = historyMinutelyService.getAllDeviceDataToExcel(parameters);
         return new ResultBean<List<Map<String, Object>>>(list);
     }
-}
\ No newline at end of file
+
+    /*@PostMapping("insertAdjustValue")
+    @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "������id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "���������������08:30:00���", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "dataArray", value = "������", required = false, paramType = "query", dataType = "String")})
+    public void insertAdjustValue(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        int device_id = Integer.parseInt(parameters.get("id").toString());
+        String hour_minute_second = parameters.get("time").toString();
+        String[] arr = hour_minute_second.split(":");
+        int seconds = Integer.parseInt(arr[0])*3600+Integer.parseInt(arr[1])*60+Integer.parseInt(arr[2]);
+        String value = parameters.get("dataArray").toString();
+        deviceAdjustValueTimingService.insertData(device_id,seconds,value);;
+    }*/
+
+    @PostMapping("insertAdjustValue")
+    public  int insertAdjustValue(@RequestBody HashMap map){
+        try{
+            int device_id = Integer.parseInt(map.get("id").toString());
+            String time = map.get("time").toString();
+            String[] arr = time.split(":");
+            int seconds = Integer.parseInt(arr[0])*3600+Integer.parseInt(arr[1])*60+Integer.parseInt(arr[2]);
+            //String t = URLEncoder.encode(������,"UTF-8")
+            List list = (List) map.get("dataArray");
+            String val="";
+            for (int i = 0; i <list.size() ; i++) {
+                if (i==0){
+                    val=val+list.get(i);
+                }else {
+                    val=val+","+list.get(i);
+                }
+            }
+            String value = "{"+val+"}";
+            deviceAdjustValueTimingService.insertData(device_id,seconds,value);
+            return 1;
+        }catch (Exception e){
+            log.warn(e);
+        }
+        return 0;
+    }
+
+    @RequestMapping("/biaozhun")
+    @ResponseBody
+    public List<Device> queryDevice(String macOrName){
+        List<Device> deviceList = new ArrayList<>();
+        if (!macOrName.equals("")){
+             deviceList= deviceService.getDevice(macOrName);
+        }
+        return deviceList;
+    }
+
+    @RequestMapping("/getBiaoZhun")
+    @ResponseBody
+    public List<DeviceAdjustValueTiming> getBiaoZhun(String id){
+        List<DeviceAdjustValueTiming> dataByDeviceid = deviceAdjustValueTimingService.getDataByDeviceid(Integer.parseInt(id));
+        for (DeviceAdjustValueTiming deviceAdjustValueTiming : dataByDeviceid) {
+            int seconds = Integer.parseInt(deviceAdjustValueTiming.getSeconds());
+            String hour = String.valueOf(seconds/3600);
+            int millAndSeconds = seconds%3600;
+            String mill = String.valueOf(millAndSeconds/60);
+            String second = String.valueOf(millAndSeconds%60);
+            if (hour.length()<2){
+                hour="0"+hour;
+            }
+            if (mill.length()<2){
+                mill="0"+mill;
+            }
+            if (second.length()<2){
+                second="0"+second;
+            }
+            String time = hour+":"+mill+":"+second;
+            Map<String, String> value = deviceAdjustValueTiming.getValue();
+            Collection<String> values = value.values();
+            deviceAdjustValueTiming.setSeconds(time);
+        }
+        return dataByDeviceid;
+    }
+
+
+    @RequestMapping("/getSensor")
+    @ResponseBody
+    public  List<Map<String, Object>> getSensor(String id){
+        List<Map<String, Object>> allSensors = sensorService.getSensorByDeviceId(id);
+        return allSensors;
+    }
+
+    @RequestMapping("/deleteBiaoZhun")
+    @ResponseBody
+    public int deleteBiaoZhun(String id){
+        int i= deviceAdjustValueTimingService.delete(id);
+        return i;
+    }
+
+
+    @GetMapping("/monitorAVGData")
+    @ApiOperation(value = "monitor������������������", notes = "monitor������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPointIds", value = "������monitorid", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<List<Map<String,Object>>>> monitorAVGData(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        String monitorPointIds = (String) parameters.get("monitorPointIds");
+        String time = (String) parameters.get("time");
+        time = time+" 00:00:00";
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd mm:HH:ss");//���������������MM
+        Date date = simpleDateFormat.parse(time);
+        Calendar calendar = new GregorianCalendar();
+        calendar.setTime(date);
+        calendar.add(calendar.DATE,+1);
+        String date1= simpleDateFormat.format(date);
+        String date2= simpleDateFormat.format(calendar.getTime());
+        String[] mIds = monitorPointIds.split(",");
+        List<List<Map<String,Object>>> lists = new ArrayList<>();
+        if (mIds.length==1 && mIds.length!=0){
+            String mId = mIds[0];
+            List<Map<String,Object>> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mId, date1, date2);
+            Double maxO3 = Double.parseDouble(dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 1).get("maxO3").toString());
+            Map<String,Object> dailyAvgData =new HashMap<>();
+            if (dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 2).get("data")!=""){
+                dailyAvgData = (Map<String, Object>) dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 2).get("data");
+                dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
+            }else {
+                dailyAvgData= historyHourlyService.getAvgDataByMId(mId, date1, date2);
+                dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
+            }
+            dataAvbByMIdAndTime.remove(dataAvbByMIdAndTime.size() - 1);
+            dataAvbByMIdAndTime.remove(dataAvbByMIdAndTime.size() - 1);
+            Map<String,Object> dayMap = new HashMap<>();
+            dayMap.put("data",dailyAvgData);
+            dayMap.put("time",date1.substring(0,11));
+            dataAvbByMIdAndTime.add(dayMap);
+            for (int i = 0; i <dataAvbByMIdAndTime.size() ; i++) {
+                if (i!=dataAvbByMIdAndTime.size()-1){
+                    Map<String, Object> map1 = AQICalculation2.hourlyAQI((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data"));
+                    if (Double.parseDouble(map1.get("AQI").toString())>=50.0){
+                        ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("primary_pollutants",map1.get("maxSensor"));
+                        ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("AQI",map1.get("AQI"));
+                    }else {
+                        ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("primary_pollutants","-");
+                        ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("AQI",map1.get("AQI"));
+                    }
+                }else {
+                    Map<String, Object> map1 = AQICalculation2.dayAQI((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data"));
+                        if (Double.parseDouble(map1.get("AQI").toString())>=50.0){
+                            ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("primary_pollutants",map1.get("maxSensor"));
+                            ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("AQI",map1.get("AQI"));
+                        }else {
+                            ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("primary_pollutants","-");
+                            ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("AQI",map1.get("AQI"));
+                        }
+                }
+            }
+            lists.add(dataAvbByMIdAndTime);
+            //List<Device> devicesByMonitorPointId = deviceService.getDevicesByMonitorPointId(Integer.valueOf(mId));
+        }else {
+            for (int i = 0; i <mIds.length ; i++) {
+                List<Map<String,Object>> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mIds[i], date1, date2);
+                Double maxO3 = Double.parseDouble(dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 1).get("maxO3").toString());
+                Map<String,Object> dailyAvgData =new HashMap<>();
+                if (dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 2).get("data")!=""){
+                    dailyAvgData = (Map<String, Object>) dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 2).get("data");
+                    dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
+                }else {
+                    dailyAvgData= historyHourlyService.getAvgDataByMId(mIds[i], date1, date2);
+                    dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
+                }
+                dataAvbByMIdAndTime.remove(dataAvbByMIdAndTime.size() - 1);
+                dataAvbByMIdAndTime.remove(dataAvbByMIdAndTime.size() - 1);
+                Map<String,Object> dayMap = new HashMap<>();
+                dayMap.put("data",dailyAvgData);
+                dayMap.put("time",date1.substring(0,11));
+                dataAvbByMIdAndTime.add(dayMap);
+                lists.add(dataAvbByMIdAndTime);
+            }
+            List<Map<String, Object>> dataByMonitorPoints = historyHourlyService.getDataByMonitorPoints(mIds, date1, date2);
+            lists.add(dataByMonitorPoints);
+        }
+        return new ResultBean<List<List<Map<String,Object>>>>(lists);
+    }
+}

--
Gitblit v1.8.0