update(post)

于紫祥_1901

2020-10-22 3a4442da13b6f1300956bd63a5d106c5b2fc7184

update(post)

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

@@ -2227,7 +2227,6 @@
    }



    @GetMapping("/contrastFactor")
    @ApiOperation(value = "因子对比", notes = "因子对比")
    @ApiImplicitParams(value = {
@@ -2262,13 +2261,9 @@
    }


    @GetMapping("/tellAlarm")
    @PostMapping("/tellAlarm")
    @ResponseBody
    public List<List> tellAlarm(@Param("states") String states,
                                  @Param("orgId") String orgId,
                                  @Param("accountId") String accountId,
                                  @Param("states1") String states1,
                                  @Param("regionCode") String regionCode) {
    public List<List> tellAlarm(String states, String orgId, String accountId, String states1, String regionCode) {
        JSONArray stateList = JSONArray.parseArray(states);//最新的设备数据
        JSONArray stateList1 = JSONArray.parseArray(states1);//前10秒的设备数据
        List<List> lookList = new ArrayList<>();
@@ -2443,7 +2438,7 @@
                        }
                        String state = (String) dataMap.get("state");
                        String state1 = (String) dataMap.get("state1");
                        List<Map> mapList=new ArrayList();
                        List<Map> mapList = new ArrayList();
                        for (String key : list) {
                            if (((Map) aEMap.get("eMap")).containsKey(key)) {
                                Double val = Double.valueOf(sensorMap.get(key).toString());
@@ -2455,23 +2450,23 @@
                                    if ((state1.equals("0") || state1.equals("1")) && Integer.parseInt(state) > 1) {
                                        if (val > Double.valueOf(String.valueOf(valueList.get(1)))) {
                                            Map lookMap = new HashMap();
                                            lookMap.put("time",time);
                                            lookMap.put("name",device.getName());
                                            lookMap.put("sensor",sensors.get("description"));
                                            lookMap.put("value",val + ""+sensors.get("unit"));
                                            lookMap.put("time", time);
                                            lookMap.put("name", device.getName());
                                            lookMap.put("sensor", sensors.get("description"));
                                            lookMap.put("value", val + "" + sensors.get("unit"));
                                            mapList.add(lookMap);
                                           //lookString = time+" "+device.getName()+sensors.get("description")+"="+val + sensors.get("unit")+"超标";
                                           //System.out.println(time + "====" + device.getName() + "=====" + sensors.get("description") + "======" + val + sensors.get("unit"));
                                            //lookString = time+" "+device.getName()+sensors.get("description")+"="+val + sensors.get("unit")+"超标";
                                            //System.out.println(time + "====" + device.getName() + "=====" + sensors.get("description") + "======" + val + sensors.get("unit"));
                                        }
                                    }
                                }else {//判断非六参因子超标
                                } else {//判断非六参因子超标
                                    if (state1.equals("0")) {
                                        if (val > Double.valueOf(String.valueOf(valueList.get(0)))) {
                                            Map lookMap = new HashMap();
                                            lookMap.put("time",time);
                                            lookMap.put("name",device.getName());
                                            lookMap.put("sensor",sensors.get("description"));
                                            lookMap.put("value",val + ""+sensors.get("unit"));
                                            lookMap.put("time", time);
                                            lookMap.put("name", device.getName());
                                            lookMap.put("sensor", sensors.get("description"));
                                            lookMap.put("value", val + "" + sensors.get("unit"));
                                            mapList.add(lookMap);
                                        }
                                    }
@@ -2479,9 +2474,9 @@

                            }
                        }
                        if (mapList.size()>0){
                        if (mapList.size() > 0) {
                            lookList.add(mapList);
                        }else {
                        } else {
                            continue;
                        }
                    }
@@ -2491,24 +2486,24 @@
        return lookList;
    }

  /*  @GetMapping("/lianxian")
    @ApiOperation(value = "连线", notes = "连线" )
    @GetMapping("multiDeviceContrast")
    @ApiOperation(value = "多设备因子对比", notes = "多设备因子对比")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "macs", value = "设备mac,如有多个用逗号分隔", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "sensorKey", value = "传感器key", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "time", value = "时间,日期(格式：2018-03-12)", required = true, paramType = "query", dataType = "String"),})
    public ResultBean<List<Map<String, Object>>> multiDeviceSensor(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        ParameterUtils.getTimeType4Time(parameters);
        List<Map<String, Object>> list = historyMinutelyService.getMultiDeviceSensorData(parameters);
        return new ResultBean<List<Map<String, Object>>>(list);
    }
    /*  @GetMapping("/lianxian")
      @ApiOperation(value = "连线", notes = "连线" )
      @GetMapping("multiDeviceContrast")
      @ApiOperation(value = "多设备因子对比", notes = "多设备因子对比")
      @ApiImplicitParams(value = {
              @ApiImplicitParam(name = "macs", value = "设备mac,如有多个用逗号分隔", required = true, paramType = "query", dataType = "String"),
              @ApiImplicitParam(name = "sensorKey", value = "传感器key", required = true, paramType = "query", dataType = "String"),
              @ApiImplicitParam(name = "time", value = "时间,日期(格式：2018-03-12)", required = true, paramType = "query", dataType = "String"),})
      public ResultBean<List<Map<String, Object>>> multiDeviceSensor(HttpServletRequest request) throws Exception {
          Map<String, Object> parameters = getParametersStartingWith(request, null);
          ParameterUtils.getTimeType4Time(parameters);
          List<Map<String, Object>> list = historyMinutelyService.getMultiDeviceSensorData(parameters);
          return new ResultBean<List<Map<String, Object>>>(list);
      }

    /*
    * 根据大屏版本号获取版本更新信息
    */
      /*
      * 根据大屏版本号获取版本更新信息
      */
    @GetMapping("screenVersion")
    public Map<String, Object> getScreenVersion(HttpServletRequest request) {
        Map<String, Object> parameters = getParametersStartingWith(request, null);

 src/main/resources/application.yml

@@ -4,13 +4,6 @@
  session-timeout: 30
  tomcat.max-threads: 0
  tomcat.uri-encoding: UTF-8
  max-http-header-size: 10000000
  jsp-servlet:
    init-parameters:
            development: true




spring:
  thymeleaf:

 src/main/webapp/js/newmoralmap.js

@@ -1218,7 +1218,7 @@
        paramMap["states1"] = state1;
        $.ajax({
            url: "/screen/tellAlarm",
            type: "get",
            type: "post",
            dataType: "json",
            data: paramMap,
            success: function (info) {