地图显示位置异常问题

jinpengyong

2020-10-19 746d419165c66d6a1f33a0a9df199e0b6daf3114

地图显示位置异常问题

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

@@ -39,12 +39,14 @@

import com.rabbitmq.client.*;
import com.rabbitmq.client.Channel;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
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;
@@ -69,6 +71,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.*;
@@ -164,6 +167,7 @@

    @Resource
    private ScreenVersionService screenVersionService;

    /**
     * Screen login. 大屏登录
     *
@@ -2257,10 +2261,40 @@
        return new ResultBean<List<Map<String, Object>>>(list);
    }

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

    @GetMapping("devices-sensors-excel")
    @ApiOperation(value = "所有设备多因子数据报表", notes = "所有设备多因子数据报表")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "monitor_point_id", defaultValue = "5", value = "监控站点id", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "sensorKey", value = "传感器key,多个逗号隔开", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "time", value = "时间(格式：2020-04-09)", required = true, paramType = "query", dataType = "String")})
    public ResultBean<List<Map<String, Object>>> getDevicesToExcel(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        ParameterUtils.getTimeType4Time(parameters);
        /*String[] sensorKeys = parameters.get("sensorKey").toString().split(",");
        parameters.put("sensorKeys", Arrays.asList(sensorKeys));
        List<String> macList = new ArrayList<>();
        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
        for (MonitorPoint m : monitorPoints) {
            for (Device d : m.getDevices()) {
                macList.add(d.getMac());
            }
        }
        parameters.put("macs", macList);
        List<Map<String, Object>> list = new ArrayList<>();
        if (!CollectionUtils.isEmpty(macList)) {
            list = historyMinutelyService.getDevicesAvgDataToExcel(parameters);
        }*/
        List<Map<String, Object>> list = historyMinutelyService.getDevicesSensorsToExcel(parameters);
        return new ResultBean<List<Map<String, Object>>>(list);
    }
}

 src/main/java/com/moral/service/HistoryMinutelyService.java

@@ -34,10 +34,12 @@

    List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters) throws Exception;

    List<Map<String,Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;
    List<Map<String, Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;

    List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters) throws Exception;

    List<Map<String,Object>> getFiveMinutesDataByMacsAndTime(Map<String,Object> parameters);
    List<Map<String, Object>> getFiveMinutesDataByMacsAndTime(Map<String, Object> parameters);

    List<Map<String, Object>> getDevicesSensorsToExcel(Map<String, Object> parameters);

}

 src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java

@@ -1005,4 +1005,11 @@
        }
        return list;
    }

    @Override
    public List<Map<String, Object>> getDevicesSensorsToExcel(Map<String, Object> parameters) {
        String[] sensorKeys = parameters.get("sensorKey").toString().split(",");
        parameters.put("sensorKeys", Arrays.asList(sensorKeys));
        return null;
    }
}

 src/main/webapp/js/newmoralmap.js

@@ -56,6 +56,7 @@
        // 将地址解析结果显示在地图上,并调整地图视野
        // 创建地址解析器实例
        var myGeo = new BMap.Geocoder();
        address = address.replace(/\s*/g, "");
        myGeo.getPoint(address, function (point) {
            if (point) {
                if ("大同市" == cityName) {
@@ -217,10 +218,6 @@
                } else if ("渝北区" == cityName) {
                    var longitude = 106.638135;
                    var latitude = 29.709625;
                    point = new BMap.Point(longitude, latitude);
                } else if ("射阳县" == regoinNames[2]) {
                    var longitude = 120.332826;
                    var latitude = 33.772274;
                    point = new BMap.Point(longitude, latitude);
                }
                map.centerAndZoom(point, showZoom);
@@ -1234,11 +1231,11 @@
    }


    moralMap.getRoad=function(data,regionCode){
    moralMap.getRoad = function (data, regionCode) {

        var wind =data["e23"];
        var mac=data["mac"];
        var windSpeed=data["e18"] ;
        var wind = data["e23"];
        var mac = data["mac"];
        var windSpeed = data["e18"];
        var speedLevel;
        if (windSpeed >= 0 && windSpeed <= 0.2) {
            speedLevel = 0;
@@ -1264,9 +1261,9 @@
            url: "/screen/getAlarm",
            type: "get",
            dataType: "json",
            data:{"windData":wind,"code":regionCode,"mac":mac,"speedLevel":speedLevel},
            data: {"windData": wind, "code": regionCode, "mac": mac, "speedLevel": speedLevel},
            success: function (info) {
                console.log("---------------"+info);
                console.log("---------------" + info);
            },

        })