update：请求合并

ZhuDongming

2019-11-21 154b73d12f9e39039fc7b099beab3881c94b2d8d

update：请求合并

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

@@ -545,21 +545,9 @@
    }



    @GetMapping("/getSensorsMap")

    public ResultBean getSensorsMapOnly(String mac){

        Map<String, String> paramMap = sensorService.getSensorsMapOnly(mac);

        ResultBean<Map<String, String>> resultBean = new ResultBean();

        resultBean.setData(paramMap);

        resultBean.setCode(ResultBean.SUCCESS);

        return resultBean;

    }



    @GetMapping("/getSensorsUnitMap")

    public ResultBean getSensorsUnitMap(String mac){

        Map<String, String> paramMap = sensorService.getSensorsUnitMap(mac);

        ResultBean<Map<String, String>> resultBean = new ResultBean();

        resultBean.setData(paramMap);

        resultBean.setCode(ResultBean.SUCCESS);

        return resultBean;

    public List<Map<String, String>> getSensorsMapOnly(String mac) {

        List<Map<String, String>> sensorsMapList = sensorService.getSensorsMaps(mac);

        return sensorsMapList;

    }



    @RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)


 src/main/java/com/moral/mapper/SensorMapper.java

@@ -28,5 +28,5 @@

    List<Sensor> getSensorsByMac(Map<String, Object> parameters);

    List<Sensor> getSensorsByMacOnly(@Param("mac") String mac);
    List<Sensor> getSensorsInfoByMac(@Param("mac") String mac);
}

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

@@ -20,6 +20,7 @@
    List<Sensor> queryListByVersionNo(Integer versionNo);

    public void addOrModify(Sensor sensor);

    public void deleteByIds(Integer... ids);

    List<Sensor> queryByOrgId(Integer organizationId);
@@ -34,7 +35,6 @@

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

    Map<String, String> getSensorsMapOnly(String mac);
    List<Map<String, String>> getSensorsMaps(String mac);

    Map<String, String> getSensorsUnitMap(String mac);
}

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

@@ -5,10 +5,14 @@
import com.moral.entity.Sensor;
import com.moral.mapper.SensorMapper;
import com.moral.service.SensorService;

import org.springframework.stereotype.Service;

import tk.mybatis.mapper.entity.Example;

import javax.annotation.Resource;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -23,28 +27,34 @@

    /**
     * 查询所有的传感器类型
     *
     * @return
     */
    @Override
    public List<Sensor> queryAll(){
        return sensorMapper.selectByExample(null);
    }

    public PageBean<Sensor> queryByPageBean(PageBean pageBean){
        return MyBatisBaseMapUtil.queryPage(sensorMapper,pageBean,ENTITY_CLASS);
    }

    @Override
    public PageBean queryByVersionId(Integer deviceVersionId){
        List<Sensor> sensorList = sensorMapper.selectByVersionId(deviceVersionId);
        return  new PageBean(sensorList);
    }

    @Override
    public List<Sensor> queryListByVersionId(Integer deviceVersionId){
        return sensorMapper.selectByVersionId(deviceVersionId);
    }

    @Override
    public List<Sensor> queryListByVersionNo(Integer versionNo){
        return sensorMapper.selectByVersionNo(versionNo);
    }

    public void addOrModify(Sensor sensor){
        try{
            if(sensor.getId()==null){
@@ -52,8 +62,7 @@
            }else{
                sensorMapper.updateByPrimaryKeySelective(sensor);
            }
        }
        catch (Exception ex){
        } catch (Exception ex) {
            throw  ex;
        }
    }
@@ -74,6 +83,7 @@

    /**
     * 获取当前组织下所有传感器并集
     *
     * @param organizationId
     * @return
     */
@@ -81,20 +91,24 @@
    public List<Sensor> queryByOrgId(Integer organizationId) {
        return sensorMapper.selectByOrgId(organizationId);
    }

    @Override
    public List<Sensor> getAllSensors() {
        return sensorMapper.selectAll();
    }

    @Override
    public Map<String, Object> getSensorBySensorKey(String sensorKey) {
        Map<String, Object> map = sensorMapper.getSensorBySensorKey(sensorKey);
        return map;
    }

    @Override
    public List<Map<String, Object>> getSensorByDeviceId(String id) {
        List<Map<String,Object>> list = sensorMapper.getSensorByDeviceId(id);
        return list;
    }

    @Override
    public List<Map<String, Object>> getSensorByMonitorPointId(String monitor_point_id) {
        List<Map<String,Object>> list = sensorMapper.getSensorByMonitorPointId(monitor_point_id);
@@ -112,22 +126,20 @@
    }

    @Override
    public Map<String, String> getSensorsMapOnly(String mac) {
        List<Sensor> sensors = sensorMapper.getSensorsByMacOnly(mac);
        Map<String, String> sensorMap = new HashMap<>();
    public List<Map<String, String>> getSensorsMaps(String mac) {
        List<Sensor> sensors = sensorMapper.getSensorsInfoByMac(mac);
        Map<String, String> sensorsDescriptionMap = new HashMap<>();
        for (Sensor sensor : sensors) {
            sensorMap.put(sensor.getSensorKey(), sensor.getDescription());
            sensorsDescriptionMap.put(sensor.getSensorKey(), sensor.getDescription());
        }
        return sensorMap;
        Map<String, String> sensorsUnitMap = new HashMap<>();
        for (Sensor sensor : sensors) {
            sensorsUnitMap.put(sensor.getSensorKey(), sensor.getUnit());
        }
        List<Map<String, String>> sensorsMapList = new ArrayList<>();
        sensorsMapList.add(sensorsDescriptionMap);
        sensorsMapList.add(sensorsUnitMap);
        return sensorsMapList;
    }

    @Override
    public Map<String, String> getSensorsUnitMap(String mac) {
        List<Sensor> sensors = sensorMapper.getSensorsByMacOnly(mac);
        Map<String, String> sensorMap = new HashMap<>();
        for (Sensor sensor : sensors) {
            sensorMap.put(sensor.getSensorKey(), sensor.getUnit());
        }
        return sensorMap;
    }
}

 src/main/resources/mapper/SensorMapper.xml

@@ -160,7 +160,7 @@
        </if>
    </select>

    <select id="getSensorsByMacOnly" resultMap="BaseResultMap">
    <select id="getSensorsInfoByMac" resultMap="BaseResultMap">
        SELECT
        DISTINCT s.*
        FROM

 src/main/webapp/js/moralmap.js

@@ -654,23 +654,15 @@
    //设备以mac为key储存
    //监控点对象 包装MoralMark对象
    moralMap.Equipment = function (option) {
        var sensorsMap;
        var sensorsDescriptionMap;
        var sensorsUnitMap;
        $.ajax({
            url: "getSensorsMap?mac=" + option['mac'],
            type: "get",
            dataType: "json",
            success: function (data) {
                sensorsMap = data.data;
            }
        });

        $.ajax({
            url: "getSensorsUnitMap?mac=" + option['mac'],
            type: "get",
            dataType: "json",
            success: function (data) {
                sensorsUnitMap = data.data;
                sensorsDescriptionMap = data[0];
                sensorsUnitMap = data[1];
            }
        });

@@ -844,10 +836,6 @@
            }

            moralMap.showSensors = function (jsonData) {
                var address = (option["address"] == null) ? "" : option["address"];
                if (address.length > 18) {
                    address = address.slice(0, 18) + "...";
                }
                var adressOutHtml = '<div style="min-height:20px;overflow:auto;max-height:400px;font-size: 12px;" onmouseover="moralMap.clearCloseInfoWindow()" onmouseout="moralMap.closeInfoWindow()">';
                var y, m, d, h, mm, s;
                var date = new Date(jsonData['time']);
@@ -861,9 +849,9 @@
                adressOutHtml += '<p style="height: 18px;line-height: 18px">' + "时间：&nbsp;" + date + "&nbsp;</p>";
                for (var prop in jsonData) {
                    if (jsonData.hasOwnProperty(prop) && prop != 'ver' && prop != 'methodName' && prop != 'mac' && prop != 'time') {
                        for (var key in sensorsMap) {
                        for (var key in sensorsDescriptionMap) {
                            if (prop == key) {
                                var sensorsDescription = sensorsMap[key];
                                var sensorsDescription = sensorsDescriptionMap[key];
                            }
                        }
                        for (var key in sensorsUnitMap) {

 src/main/webapp/view/map.jsp

@@ -749,7 +749,6 @@
    }

    function callJS(jsonData) {
        // $("#searchParam").val(jsonData);
        var jsonData = JSON.parse(jsonData);
        var methodName = jsonData.methodName;
        if ("JumpBaiduMap" == methodName) {