Merge remote-tracking branch 'origin/master'

沈斌

2017-11-06 1cbd89e5aceb71e990c42b8599e45f2703588878

Merge remote-tracking branch 'origin/master'

 src/main/java/com/moral/monitor/controller/ScreenController.java

@@ -178,10 +178,10 @@


    @RequestMapping(value = "/alarm-levels", method = RequestMethod.GET)

    public Map<String,Object> getAlarmLevels(HttpServletRequest request){

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

        Map<String,Object> result = new LinkedHashMap<String, Object>();

        try {

            InputStreamReader reader = new InputStreamReader(resource.getInputStream());

            result = new JSONReader(reader).readObject(new TypeReference<Map<String,Object>>(){});

            result = new JSONReader(reader).readObject(new TypeReference<LinkedHashMap<String,Object>>(){});

        } catch (IOException e) {

            e.printStackTrace();

            result.put("msg", "系统错误，请联系管理员！原因如下："+e.getMessage());


 src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java

@@ -50,20 +50,16 @@
        // 1.0 实际标准值

        resultMap.put("standard", ResourceUtil.getValue(parameters.get("macKey") + "-standard"));



        //resultMap.put("average", 90.0384 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);

		
        //resultMap.put("AQI", 236.71 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);



		
        // 2.0 本月平均值

        Date date = new Date();

        // 每月一日的数据取上月的数据

        if (1 == Calendar.getInstance().get(Calendar.DAY_OF_MONTH)) {

            // 上个月1日00:00:00

            parameters.put("start", DateUtils.truncate(DateUtils.addMonths(date, -1), Calendar.MONTH));

        } else {

            // 这个月1日00:00:00

            parameters.put("start", DateUtils.truncate(date, Calendar.MONTH));

        }

        // 这个月1日00:00:00

        parameters.put("start", DateUtils.truncate(date, Calendar.MONTH));

        // 今日00:00:00

        parameters.put("end", DateUtils.truncate(date, Calendar.DATE));



@@ -117,12 +113,12 @@
            }

        }

        

        double AQI = Collections.max(IAQIs);

        // 空值临时处理

        if (AQI == 0.0) {

            AQI = 60.670;

        }

        if (!resultMap.containsKey("AQI")) {

            double AQI = Collections.max(IAQIs);

            // 空值临时处理

            if (AQI == 0.0) {

                AQI = 60.670;

            }

            resultMap.put("AQI", String.format("%.0f", AQI));

        }

         


 src/main/resources/system/alarmLevels.json

@@ -1,97 +1,97 @@
{
    "e1":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":35,
        "level2":115,
        "level3":250
    },
    "e2":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":50,
        "level2":250,
        "level3":420
    },
    "e3":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":2000,
        "level2":5000,
        "level3":8000
    },
    "e4":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":10,
        "level2":30,
        "level3":60
    },
    "e5":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":0.01,
        "level2":0.02,
        "level3":0.05
    },
    "e6":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":60,
        "level2":100,
        "level3":160
    },
    "e7":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":35,
        "level2":30,
        "level3":40
    },
    "e8":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":30,
        "level2":40,
        "level3":50
    },
    "e9":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":0.01,
        "level2":0.02,
        "level3":0.03
    },
    "e10":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":2,
        "level2":14,
        "level3":36
    },
    "e11":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":0.05,
        "level2":0.475,
        "level3":1.6
    },
    "e12":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":10000,
        "level2":15000,
        "level3":25000
    },
    "e13":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":30,
        "level2":50,
        "level3":90
    },
    "e14":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":2,
        "level2":4,
        "level3":6
    },
    "e15":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":0.16,
        "level2":0.3,
        "level3":0.8
    },
    "e16":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":0.04,
        "level2":0.18,
        "level3":0.565
    },
    "e17":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":1,
        "level2":2,
        "level3":5
    },
    "e18":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":5,
        "level2":6,
        "level3":8
    },
    "e19":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":480,
        "level2":580,
        "level3":680
    }
}