From 700e079156d633305b5e03c3a4e54b78a49add51 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 21 九月 2023 09:29:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 234 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 198 insertions(+), 36 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
index 70a9e07..253e48c 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -7,6 +7,8 @@
import com.ruoyi.alarm.apponekey.mapper.ArdAlarmApponekeyMapper;
import com.ruoyi.alarm.camera.domain.ArdAlarmCamera;
import com.ruoyi.alarm.camera.mapper.ArdAlarmCameraMapper;
+import com.ruoyi.alarm.digitization3.domain.ArdAlarmDigitization3;
+import com.ruoyi.alarm.digitization3.mapper.ArdAlarmDigitization3Mapper;
import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
import com.ruoyi.alarm.external.mapper.ArdAlarmExternalMapper;
import com.ruoyi.alarm.global.domain.GlobalAlarmCondition;
@@ -16,7 +18,6 @@
import com.ruoyi.alarm.global.service.IGlobalAlarmService;
import com.ruoyi.alarm.radar.domain.*;
import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarFireMapper;
-import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarMapper;
import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarMoveMapper;
import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarPumpMapper;
import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
@@ -32,7 +33,9 @@
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.ConfigUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -69,6 +72,8 @@
@Slf4j(topic = "mqtt")
public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
//region 渚濊禆娉ㄥ叆
+ @Resource
+ private ArdAlarmDigitization3Mapper ardAlarmDigitization3Mapper;
@Resource
private ArdAlarmWallMapper ardAlarmWallMapper;
@Resource
@@ -148,6 +153,8 @@
countMap.put("1010", count1010);
int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1014", count1014);
+ int count1012 = ardAlarmDigitization3Mapper.selectCountByAlarmTime(refreshTime);
+ countMap.put("1012", count1012);
map.put("20000", countMap);
return map;
}
@@ -291,6 +298,22 @@
.setTotal(ardAlarmWall.getTotal());
return globalAlarmData;
}).collect(Collectors.toList());
+ case 1012:
+ List<ArdAlarmDigitization3> ardAlarmDigitization3s = ardAlarmDigitization3Mapper.selectListAllByCommand(refreshTime);
+ return ardAlarmDigitization3s.stream()
+ .map(ardAlarmDigitization3 -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmDigitization3.getId())
+ .setName(ardAlarmDigitization3.getWellNo())
+ .setAlarmType(ardAlarmDigitization3.getAlarmType())
+ .setAlarmTime(ardAlarmDigitization3.getAlarmTime())
+ .setLongitude(ardAlarmDigitization3.getLongitude())
+ .setLatitude(ardAlarmDigitization3.getLatitude())
+ .setAltitude(ardAlarmDigitization3.getAltitude())
+ .setCount(ardAlarmDigitization3.getCount())
+ .setTotal(ardAlarmDigitization3.getTotal());
+ return globalAlarmData;
+ }).collect(Collectors.toList());
case 1014:
List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
return ardAlarmTubes.stream()
@@ -368,20 +391,20 @@
// globalAlarmDataList.add(globalAlarmData);
//}
//return globalAlarmDataList;
- //浠庢暟鎹簱鑾峰彇
- List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
- return ardAlarmRadarMoves.stream()
- .map(ardAlarmRadarMove -> {
- GlobalAlarmData globalAlarmData = new GlobalAlarmData()
- .setId(ardAlarmRadarMove.getId())
- .setName(ardAlarmRadarMove.getName())
- .setAlarmTime(ardAlarmRadarMove.getAlarmTime())
- .setLongitude(ardAlarmRadarMove.getLongitude())
- .setLatitude(ardAlarmRadarMove.getLatitude())
- .setCount(ardAlarmRadarMove.getCount())
- .setTotal(ardAlarmRadarMove.getTotal());
- return globalAlarmData;
- }).collect(Collectors.toList());
+ //浠庢暟鎹簱鑾峰彇
+ List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
+ return ardAlarmRadarMoves.stream()
+ .map(ardAlarmRadarMove -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmRadarMove.getId())
+ .setName(ardAlarmRadarMove.getName())
+ .setAlarmTime(ardAlarmRadarMove.getAlarmTime())
+ .setLongitude(ardAlarmRadarMove.getLongitude())
+ .setLatitude(ardAlarmRadarMove.getLatitude())
+ .setCount(ardAlarmRadarMove.getCount())
+ .setTotal(ardAlarmRadarMove.getTotal());
+ return globalAlarmData;
+ }).collect(Collectors.toList());
case 1004:
List<ArdAlarmRadarFire> ardAlarmRadarFires = ardAlarmRadarFireMapper.selectListAllByCommand(refreshTime);
return ardAlarmRadarFires.stream()
@@ -653,6 +676,24 @@
GlobalAlarmDataList.addAll(alarmData1010);
}
+ List<ArdAlarmDigitization3> ardAlarmDigitization3s = ardAlarmDigitization3Mapper.selectListAllByCommand(refreshTime);
+ List<GlobalAlarmData> alarmData1012 = ardAlarmDigitization3s.stream()
+ .map(ardAlarmDigitization3 -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmDigitization3.getId())
+ .setName(ardAlarmDigitization3.getWellNo())
+ .setAlarmTime(ardAlarmDigitization3.getAlarmTime())
+ .setLongitude(ardAlarmDigitization3.getLongitude())
+ .setLatitude(ardAlarmDigitization3.getLatitude())
+ .setAltitude(ardAlarmDigitization3.getAltitude())
+ .setCount(ardAlarmDigitization3.getCount())
+ .setTotal(ardAlarmDigitization3.getTotal())
+ .setAlarmType("1012");
+ return globalAlarmData;
+ }).collect(Collectors.toList());
+ if (alarmData1012.size() > 0) {
+ GlobalAlarmDataList.addAll(alarmData1012);
+ }
List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
List<GlobalAlarmData> alarmData1014 = ardAlarmTubes.stream()
.map(ardAlarmTube -> {
@@ -747,6 +788,12 @@
aaw.setPageNum(pageNum);
aaw.setPageSize(pageSize);
return ardAlarmWallMapper.selectArdAlarmWallList(aaw);
+ case 1012:
+ ArdAlarmDigitization3 aad3 = new ArdAlarmDigitization3();
+ aad3.setParams(params);
+ aad3.setPageNum(pageNum);
+ aad3.setPageSize(pageSize);
+ return ardAlarmDigitization3Mapper.selectArdAlarmDigitization3List(aad3);
case 1014:
ArdAlarmTube aat = new ArdAlarmTube();
aat.setParams(params);
@@ -843,6 +890,14 @@
ardAlarmWallMapper.updateViewTimeByUserId(userId, alarmTime, DateUtils.getTime());
return ardAlarmWall;
}
+ case 1012:
+ ArdAlarmDigitization3 ardAlarmDigitization3 = ardAlarmDigitization3Mapper.selectArdAlarmDigitization3ById(condition.getId());
+ if (StringUtils.isNotNull(ardAlarmDigitization3)) {
+ String wellNo = ardAlarmDigitization3.getWellNo();
+ String alarmTime = fmtms.format(ardAlarmDigitization3.getAlarmTime());
+ ardAlarmDigitization3Mapper.updateViewTimeByWellNo(wellNo, alarmTime, DateUtils.getTime());
+ return ardAlarmDigitization3;
+ }
case 1014:
ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
if (StringUtils.isNotNull(ardAlarmTube)) {
@@ -934,13 +989,13 @@
break;
case "radar":
//region 澶勭悊闆疯揪鎶ヨ
+ String mergeTime = ConfigUtils.getConfigValue("radarMergeTime");
+ Integer radarMergeTime= mergeTime==null||"".equals(mergeTime)?10:Integer.valueOf(mergeTime);
RadarAlarmData radarAlarmData = JSONObject.parseObject(message, RadarAlarmData.class);
List<ArdAlarmRadar> ardAlarmRadars = radarAlarmData.getArdAlarmRadars();
- List<ArdAlarmRadarMove> ardAlarmRadarMoves = new ArrayList<>();
- List<ArdAlarmRadarFire> ardAlarmRadarFires = new ArrayList<>();
- List<ArdAlarmRadarPump> ardAlarmRadarPumps = new ArrayList<>();
for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
String uuid = IdUtils.simpleUUID();
+ String radarId = radarAlarmData.getRadarId();
String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
Double longitude = ardAlarmRadar.getLongitude();
Double latitude = ardAlarmRadar.getLatitude();
@@ -956,9 +1011,31 @@
ardAlarmRadarMove.setAlarmType("杩愬姩鐩爣妫�娴�");
ardAlarmRadarMove.setLongitude(longitude);
ardAlarmRadarMove.setLatitude(latitude);
- //鍏ュ簱
- ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
- ardAlarmRadarMoves.add(ardAlarmRadarMove);
+ ardAlarmRadarMove.setUpdateTime(radarAlarmData.getAlarmTime());
+ ardAlarmRadarMove.setRadarId(radarId);
+ //鑾峰彇褰撳墠鍏磋叮鐐瑰綋鍓嶉浄杈剧殑涓婁竴鏉℃暟鎹�
+ ArdAlarmRadarMove lastMoveData = ardAlarmRadarMoveMapper.selectArdAlarmRadarLastData(ardAlarmRadarMove.getName());
+ if (lastMoveData == null) {
+ //鍏ュ簱
+ ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
+ radarMoveGuide(ardAlarmRadarMove);//寮曞
+ } else {
+ //鍚﹀垯姣斿鏇存柊鏃堕棿
+ Date lastUpdateTime = lastMoveData.getUpdateTime();
+ Date alarmTime = ardAlarmRadarMove.getAlarmTime();
+ long secDatePoor = DateUtils.getSecDatePoor(alarmTime,lastUpdateTime);
+ if (secDatePoor <= radarMergeTime) {
+ //灏忎簬10绉掔殑鏂版暟鎹紝鏇存柊涓婁竴鏉�
+ ArdAlarmRadarMove updateData = new ArdAlarmRadarMove();
+ updateData.setId(lastMoveData.getId());
+ updateData.setUpdateTime(alarmTime);
+ ardAlarmRadarMoveMapper.updateArdAlarmRadarMove(updateData);
+ } else {
+ //瓒呰繃10绉掔殑鏁版嵁,鍏ュ簱
+ ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
+ radarMoveGuide(ardAlarmRadarMove);//寮曞
+ }
+ }
//鍏ョ紦瀛�
//String key = "radar_alarm:" + DateUtils.getDate();
//if (redisCache.hasKey(key)) {
@@ -978,34 +1055,75 @@
ardAlarmRadarFire.setAlarmType("鐑簮妫�娴�");
ardAlarmRadarFire.setLongitude(longitude);
ardAlarmRadarFire.setLatitude(latitude);
- //鍏ュ簱
- ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
- ardAlarmRadarFires.add(ardAlarmRadarFire);
+ ardAlarmRadarFire.setRadarId(radarId);
+ ardAlarmRadarFire.setUpdateTime(radarAlarmData.getAlarmTime());
+ //
+ ArdAlarmRadarFire lastFireData = ardAlarmRadarFireMapper.selectArdAlarmRadarLastData(ardAlarmRadarFire.getName());
+ if (lastFireData == null) {
+ //鍏ュ簱
+ ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
+ radarFireGuide(ardAlarmRadarFire);//寮曞
+ } else {
+ //鍚﹀垯姣斿鏇存柊鏃堕棿
+ Date lastUpdateTime = lastFireData.getUpdateTime();
+ Date alarmTime = ardAlarmRadarFire.getAlarmTime();
+ long secDatePoor = DateUtils.getSecDatePoor(alarmTime,lastUpdateTime);
+ if (secDatePoor <= radarMergeTime) {
+ //灏忎簬10绉掔殑鏂版暟鎹紝鏇存柊涓婁竴鏉�
+ ArdAlarmRadarFire updateData = new ArdAlarmRadarFire();
+ updateData.setId(lastFireData.getId());
+ updateData.setUpdateTime(alarmTime);
+ ardAlarmRadarFireMapper.updateArdAlarmRadarFire(updateData);
+ } else {
+ //瓒呰繃10绉掔殑鏁版嵁,鍏ュ簱
+ ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
+ radarFireGuide(ardAlarmRadarFire);//寮曞
+ }
+ }
break;
case "闆疯揪鎶芥补鏈哄仠鏈�":
ArdAlarmRadarPump ardAlarmRadarPump = new ArdAlarmRadarPump();
+ ardAlarmRadarPump.setRadarId(radarId);
ardAlarmRadarPump.setId(uuid);
ardAlarmRadarPump.setTargetId(targetId);
ardAlarmRadarPump.setAlarmTime(radarAlarmData.getAlarmTime());
ardAlarmRadarPump.setCreateTime(new Date());
ardAlarmRadarPump.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");
ardAlarmRadarPump.setAlarmType("闆疯揪鎶芥补鏈哄仠鏈�");
+ ardAlarmRadarPump.setUpdateTime(radarAlarmData.getAlarmTime());
ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
if (StringUtils.isNotNull(ardAlarmpointsWell)) {
ardAlarmRadarPump.setLongitude(ardAlarmpointsWell.getLongitude());
ardAlarmRadarPump.setLatitude(ardAlarmpointsWell.getLatitude());
}
- //鍏ュ簱
- ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
- ardAlarmRadarPumps.add(ardAlarmRadarPump);
-
+ //
+ ArdAlarmRadarPump lastPumpData = ardAlarmRadarPumpMapper.selectArdAlarmRadarLastData(ardAlarmRadarPump.getName());
+ if (lastPumpData == null) {
+ //鍏ュ簱
+ ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
+ radarPumpGuide(ardAlarmRadarPump);//寮曞
+ } else {
+ //鍚﹀垯姣斿鏇存柊鏃堕棿
+ Date lastUpdateTime = lastPumpData.getUpdateTime();
+ Date alarmTime = ardAlarmRadarPump.getAlarmTime();
+ long secDatePoor = DateUtils.getSecDatePoor(alarmTime,lastUpdateTime);
+ if (secDatePoor <= radarMergeTime) {
+ //灏忎簬10绉掔殑鏂版暟鎹紝鏇存柊涓婁竴鏉�
+ ArdAlarmRadarPump updateData = new ArdAlarmRadarPump();
+ updateData.setId(lastPumpData.getId());
+ updateData.setUpdateTime(alarmTime);
+ ardAlarmRadarPumpMapper.updateArdAlarmRadarPump(updateData);
+ } else {
+ //瓒呰繃10绉掔殑鏁版嵁,鍏ュ簱
+ ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
+ radarPumpGuide(ardAlarmRadarPump);//寮曞
+ }
+ }
break;
}
}
- radarMoveGuide(ardAlarmRadarMoves, radarAlarmData);
- radarFireGuide(ardAlarmRadarFires, radarAlarmData);
- radarPumpGuide(ardAlarmRadarPumps, radarAlarmData);
+ //endregion
break;
case "external":
//region 澶勭悊澶栬仈鎶ヨ
@@ -1072,6 +1190,23 @@
int aaak = ardAlarmApponekeyMapper.insertArdAlarmApponekey(ardAlarmApponekey);
if (aaak > 0) {
log.debug("apponekey鍏ュ簱鎴愬姛锛�" + ardAlarmApponekey);
+ }
+ //endregion
+ break;
+ case "digitization3":
+ //region 涓夊巶鏁板瓧鍖栨姤璀�
+ ArdAlarmDigitization3 ardAlarmDigitization3 = JSONObject.parseObject(message, ArdAlarmDigitization3.class);
+ //鑾峰彇缁忕含搴�
+ ArdAlarmpointsWell Well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmDigitization3.getWellNo());
+ if (Well != null) {
+ ardAlarmDigitization3.setLongitude(Well.getLongitude());
+ ardAlarmDigitization3.setLatitude(Well.getLatitude());
+ ardAlarmDigitization3.setAltitude(Well.getAltitude());
+ }
+ ardAlarmDigitization3.setCreateTime(new Date());
+ int aad = ardAlarmDigitization3Mapper.insertArdAlarmDigitization3(ardAlarmDigitization3);
+ if (aad > 0) {
+ log.debug("digitization3鍏ュ簱鎴愬姛锛�" + ardAlarmDigitization3);
}
//endregion
break;
@@ -1205,9 +1340,7 @@
return minDistanceCameraId;
}
- /**
- * 闆疯揪寮曞鍏ラ槦
- */
+ //闆疯揪鑾峰彇鐩告満寮曞鍏ラ槦
private void radarGuideToQueue(String alarmId, String radarId, String name, String alarmType, Date createTime, double[] coordinate) {
int index = name.indexOf("(");
String alarmpointName = name.substring(0, index);
@@ -1235,7 +1368,7 @@
}
}
-
+ //闆疯揪绉诲姩寮曞
private void radarMoveGuide(List<ArdAlarmRadarMove> ardAlarmRadarMoves, RadarAlarmData radarAlarmData) {
//鎸夊叴瓒ｇ偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
ardAlarmRadarMoves = ardAlarmRadarMoves.stream()
@@ -1288,7 +1421,17 @@
}
//endregion
}
+ private void radarMoveGuide(ArdAlarmRadarMove ardAlarmRadarMove) {
+ if (StringUtils.isNull(ardAlarmRadarMove.getLongitude()) || StringUtils.isNull(ardAlarmRadarMove.getLatitude())) {
+ log.debug("鍧愭爣涓虹┖涓嶅紩瀵�");
+ return;
+ }
+ double[] coordinate = new double[]{ardAlarmRadarMove.getLongitude(), ardAlarmRadarMove.getLatitude()};//鎶ヨ鍧愭爣
+ //寮曞鍏ラ槦
+ radarGuideToQueue(ardAlarmRadarMove.getId(), ardAlarmRadarMove.getRadarId(), ardAlarmRadarMove.getName(), ardAlarmRadarMove.getAlarmType(), ardAlarmRadarMove.getCreateTime(), coordinate);//鏇存柊
+ }
+ //闆疯揪闃茬伀寮曞
private void radarFireGuide(List<ArdAlarmRadarFire> ardAlarmRadarFires, RadarAlarmData radarAlarmData) {
//鎸夊叴瓒ｇ偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
ardAlarmRadarFires = ardAlarmRadarFires.stream()
@@ -1340,7 +1483,16 @@
}
//endregion
}
-
+ private void radarFireGuide(ArdAlarmRadarFire ardAlarmRadarFire) {
+ if (StringUtils.isNull(ardAlarmRadarFire.getLongitude()) || StringUtils.isNull(ardAlarmRadarFire.getLatitude())) {
+ log.debug("鍧愭爣涓虹┖涓嶅紩瀵�");
+ return;
+ }
+ double[] coordinate = new double[]{ardAlarmRadarFire.getLongitude(), ardAlarmRadarFire.getLatitude()};//鎶ヨ鍧愭爣
+ //寮曞鍏ラ槦
+ radarGuideToQueue(ardAlarmRadarFire.getId(), ardAlarmRadarFire.getRadarId(), ardAlarmRadarFire.getName(), ardAlarmRadarFire.getAlarmType(), ardAlarmRadarFire.getCreateTime(), coordinate);//鏇存柊
+ }
+ //闆疯揪鎶芥补鏈哄仠鏈哄紩瀵�
private void radarPumpGuide(List<ArdAlarmRadarPump> ardAlarmRadarPumps, RadarAlarmData radarAlarmData) {
//鎸夊叴瓒ｇ偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
ardAlarmRadarPumps = ardAlarmRadarPumps.stream()
@@ -1392,4 +1544,14 @@
}
//endregion
}
+ private void radarPumpGuide(ArdAlarmRadarPump ardAlarmRadarPump) {
+ if (StringUtils.isNull(ardAlarmRadarPump.getLongitude()) || StringUtils.isNull(ardAlarmRadarPump.getLatitude())) {
+ //鍧愭爣涓虹┖涓嶅紩瀵�
+ log.debug("鍧愭爣涓虹┖涓嶅紩瀵�");
+ return;
+ }
+ double[] coordinate = new double[]{ardAlarmRadarPump.getLongitude(), ardAlarmRadarPump.getLatitude()};//鎶ヨ鍧愭爣
+ //寮曞鍏ラ槦
+ radarGuideToQueue(ardAlarmRadarPump.getId(), ardAlarmRadarPump.getRadarId(), ardAlarmRadarPump.getName(), ardAlarmRadarPump.getAlarmType(), ardAlarmRadarPump.getCreateTime(), coordinate);//鏇存柊
+ }
}
--
Gitblit v1.9.3