From 22e1e78d68374ef02c588198d16001a0c01da879 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 13:40:58 +0800
Subject: [PATCH] 冗余和不标准代码修复
---
src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java | 2 ++
src/main/webapp/js/moralmap.js | 7 +++----
src/main/webapp/view/map.jsp | 10 +++++-----
src/main/java/com/moral/common/bean/PageBean.java | 2 --
src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java | 6 ------
src/main/resources/system/alarmLevels.json | 16 ++++++++--------
6 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/moral/common/bean/PageBean.java b/src/main/java/com/moral/common/bean/PageBean.java
index 01a6f9f..99193f8 100644
--- a/src/main/java/com/moral/common/bean/PageBean.java
+++ b/src/main/java/com/moral/common/bean/PageBean.java
@@ -3,9 +3,7 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-
import com.github.pagehelper.Page;
-
import lombok.Data;
/**
diff --git a/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java b/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
index 5b04510..e064724 100644
--- a/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
+++ b/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
@@ -3,14 +3,8 @@
import com.github.pagehelper.PageHelper;
import com.moral.common.bean.PageBean;
import com.moral.common.mapper.BaseMapper;
-import com.moral.entity.Account;
import lombok.extern.log4j.Log4j;
import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.mapperhelper.MapperHelper;
-import tk.mybatis.mapper.mapperhelper.MapperTemplate;
-
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Type;
import java.util.List;
@Log4j
diff --git a/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
index 5c00d47..1de644f 100644
--- a/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
@@ -23,9 +23,11 @@
@Resource
private DeviceVersionSensorMapper deviceVersionSensorMapper;
private static Class ENTITY_CLASS = DeviceVersion.class;
+ @Override
public PageBean queryByPageBean(PageBean pageBean){
return MyBatisBaseMapUtil.queryPage(deviceVersionMapper,pageBean,ENTITY_CLASS);
}
+ @Override
public void addOrModify(DeviceVersion deviceVersion){
try{
if(deviceVersion.getId()==null){
diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index 2c4a921..7ca8e65 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -88,7 +88,7 @@
"degression": [0,0,0]
},
"e9": {
- "enable": 0,
+ "enable": 1,
"increment": [
3000,
3600,
@@ -138,7 +138,7 @@
"degression": [0,0,0]
},
"e14": {
- "enable": 0,
+ "enable": 1,
"increment": [
10000,
12000,
@@ -198,7 +198,7 @@
"degression": [0,0,0]
},
"e21": {
- "enable": 0,
+ "enable": 1,
"increment": [
3,
4,
@@ -208,7 +208,7 @@
"degression": [0,0,0]
},
"e25": {
- "enable": 0,
+ "enable": 1,
"increment": [
41,
49,
@@ -218,7 +218,7 @@
"degression": [0,0,0]
},
"e26": {
- "enable": 0,
+ "enable": 1,
"increment": [
47,
57,
@@ -228,7 +228,7 @@
"degression": [0,0,0]
},
"e27": {
- "enable": 0,
+ "enable": 1,
"increment": [
71,
86,
@@ -238,7 +238,7 @@
"degression": [0,0,0]
},
"e29": {
- "enable": 0,
+ "enable": 1,
"increment": [
71,
86,
@@ -248,7 +248,7 @@
"degression": [0,0,0]
},
"e30": {
- "enable": 0,
+ "enable": 1,
"increment": [
84,
101,
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index c6c25bc..74727d4 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -48,7 +48,6 @@
minZoom: 12,
maxZoom: 20
};
- debugger;
if(!!arguments[1]) {
$.extend(defaultParam,arguments[1]);
}
@@ -313,12 +312,12 @@
if(window["console"]!=undefined){
console.log(equStr);
}
- if(!!window['external']&&window['external']['callWin']){
+ if(!!window['external']&&!!window['external']['callWin']){
window['external'].callWin(equStr);
}else{
- if(!!select&&select==='chart'&&!!window['external']&&window['external']['showChartInfo']){
+ if(!!select&&select==='chart'&&!!window['external']&&!!window['external']['showChartInfo']){
window['external'].showChartInfo(equStr);
- }else if(!!window['external']&&window['external']['showMonitorInfo']){
+ }else if(!!window['external']&&!!window['external']['showMonitorInfo']){
window['external'].showMonitorInfo(equStr);
}else{
alert(equStr);
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index b3f5813..8ed4da8 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -303,7 +303,7 @@
var mapType = getUrlParam("mapType");
var mapOption = {};
if(!!mapType && !!eval(mapType)) {
- mapOption["mapType"] = eval(mapType);
+ mapOption["mapType"] = jieval(mapType);
}
//������������������������������
moralMap.mapInit(params["regionName"],mapOption);
@@ -396,10 +396,10 @@
if(window["console"]!=undefined){
console.log(equStr);
}
- if(!!window['external']&&window['external']['callWin']){
+ if(!!window['external']&&!!window['external']['callWin']){
window['external'].callWin(equStr);
}else
- if(!!window['external']&&window['external']['showMonitorInfo']){
+ if(!!window['external']&&!!window['external']['showMonitorInfo']){
window['external'].showMonitorInfo(equStr);
}else{
alert(equStr);
@@ -486,10 +486,10 @@
var obj = {};
obj['methodName'] = 'showChart';
var objStr = JSON.stringify(obj);
- if(!!window['external']&&window['external']['callWin']){
+ if(!!window['external']&&!!window['external']['callWin']){
window['external'].callWin(objStr);
}else
- if(!!window['external']&&window['external']['showChartInfo']){
+ if(!!window['external']&&!!window['external']['showChartInfo']){
window['external'].showChartInfo("");
}else{
alert(objStr);
--
Gitblit v1.8.0