From 7a0aeaea540803c0768c10c63ac5e78849f01c7a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Feb 2018 15:25:09 +0800
Subject: [PATCH] 地图相关 bug修复
---
src/main/resources/mapper/DeviceMapper.xml | 3 ++-
src/main/webapp/js/moralmap.js | 12 +++++++++++-
src/main/webapp/view/map.jsp | 18 +++++++++++-------
src/main/java/com/moral/controller/ScreenController.java | 3 +--
4 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index e8bd1c8..4309f5b 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -136,9 +136,8 @@
@GetMapping("alarm-levels")
public Object getAlarmLevels(HttpServletRequest request, Integer orgId) {
List<Map<String,Object>> sensorAlarmList = null;
- AlarmConfigValue alarmConfigValue = null;
try {
- alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get();
+ AlarmConfigValue alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get();
Map<String,AlarmSensorLevel> alarmLevelMap = alarmConfigValue.getAlarmLevels();
sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {
AlarmSensorLevel alarmSensorLevel = alarmLevelMap.get(key);
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 0098098..8ce75ca 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -158,8 +158,9 @@
</where>
</select>
<select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
- SELECT dev.* from device dev
+ SELECT dev.*,dve.version as device_version_value from device dev
left join monitor_point mpt on dev.monitor_point_id = mpt.id
+ left join device_version dve on dev.device_version_id = dve.id
<where>
<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
mpt.organization_id = #{orgId,jdbcType=VARCHAR}
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 4efef27..7dde6fd 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -255,6 +255,10 @@
}
moralMap.onItermClick = function(index) {
var row = moralMap.getPopupEqu(index);
+ if(row['mac']==null){
+ alert("mac���������������������������������������");
+ return;
+ }
var equ = {
name: row['name'],
mac: (row['mac']).toLowerCase(),
@@ -452,7 +456,7 @@
enableMassClear: true
})
//������������
- var eventType = ['click', 'mouseover', 'mouseout'];
+ var eventType = ['click'];
for(var index in eventType) {
var eventName = eventType[index];
if(_option[eventName] != undefined && typeof _option[eventName] == "function") {
@@ -658,8 +662,14 @@
if(moralMask["infoWindow"] == undefined) {
moralMask["infoWindow"] = infoWindow;
}
+ var mouseOverHandle = option['mouseover'];
//���������������������
moralMask.addEventListener("mouseover", function() {
+ if(mouseOverHandle!=null&&mouseOverHandle instanceof Function){
+ //���arguments���������������
+ var args = Array.prototype.slice.call(arguments);
+ mouseOverHandle.apply(this, args);
+ }
moralMap.closeSearchBox();
baiduMap.openInfoWindow(infoWindow, this._point); //������������������
if(infoWindow.getContent() == "") {
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 0b02bf5..425eb41 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -314,8 +314,18 @@
for(var i in objs) {
var obj = objs[i];
if(moralMap.getEquipment(obj["mac"])==null){
+ obj['mouseover'] = function (type) {
+ if(type.target.getData()==null){
+ //��������������������������������������������������� ������������������
+ refreshAllState();
+ }
+ }
obj['click'] = function(){
- var _obj = this.getOption();
+ var _obj = this.getOption();
+ if(_obj['mac']==null){
+ alert("mac���������������������������������������");
+ return;
+ }
var equ = {
name: _obj['name'],
mac: (_obj['mac']).toLowerCase(),
@@ -333,12 +343,6 @@
alert(equStr);
}
}
- obj['mouseover'] = function (type) {
- if(type.target.getData()==null){
- //��������������������������������������������������� ������������������
- refreshAllState();
- }
- }
var moralMask = new moralMap.Equipment(obj);
moralMap.addOverlay(moralMask);
}
--
Gitblit v1.8.0