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<>();

 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) {