From bac19f583c60f86fd15a13230ea70bfc3a6645b1 Mon Sep 17 00:00:00 2001
From: chenghong <24211317@qq.com>
Date: 星期一, 14 八月 2023 11:44:41 +0800
Subject: [PATCH] 解决两个国标平台相互级联时，上级不能获取目录的问题
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 400 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 326 insertions(+), 74 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
index ec30cd4..b484806 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -1,31 +1,43 @@
package com.genersoft.iot.vmp.service.impl;
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.DynamicTask;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
+import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd.CatalogResponseMessageHandler;
-import com.genersoft.iot.vmp.gb28181.utils.Coordtransform;
-import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.gb28181.task.impl.CatalogSubscribeTask;
import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeTask;
-import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd.CatalogResponseMessageHandler;
+import com.genersoft.iot.vmp.service.IDeviceChannelService;
+import com.genersoft.iot.vmp.service.IDeviceService;
+import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
+import com.genersoft.iot.vmp.storager.dao.PlatformChannelMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.util.ObjectUtils;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -37,8 +49,8 @@
private final static Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class);
- private final String registerExpireTaskKeyPrefix = "device-register-expire-";
-
+ @Autowired
+ private SIPCommander cmder;
@Autowired
private DynamicTask dynamicTask;
@@ -52,13 +64,28 @@
private IRedisCatchStorage redisCatchStorage;
@Autowired
+ private IInviteStreamService inviteStreamService;
+
+ @Autowired
private DeviceMapper deviceMapper;
+
+ @Autowired
+ private PlatformChannelMapper platformChannelMapper;
+
+ @Autowired
+ private IDeviceChannelService deviceChannelService;
@Autowired
private DeviceChannelMapper deviceChannelMapper;
@Autowired
- private IVideoManagerStorage storage;
+ DataSourceTransactionManager dataSourceTransactionManager;
+
+ @Autowired
+ TransactionDefinition transactionDefinition;
+
+ @Autowired
+ private UserSetting userSetting;
@Autowired
private ISIPCommander commander;
@@ -70,7 +97,7 @@
private IMediaServerService mediaServerService;
@Override
- public void online(Device device) {
+ public void online(Device device, SipTransactionInfo sipTransactionInfo) {
logger.info("[璁惧涓婄嚎] deviceId锛歿}->{}:{}", device.getDeviceId(), device.getIp(), device.getPort());
Device deviceInRedis = redisCatchStorage.getDevice(device.getDeviceId());
Device deviceInDb = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
@@ -78,22 +105,66 @@
String now = DateUtil.getNow();
if (deviceInRedis != null && deviceInDb == null) {
// redis 瀛樺湪鑴忔暟鎹�
- redisCatchStorage.clearCatchByDeviceId(device.getDeviceId());
+ inviteStreamService.clearInviteInfo(device.getDeviceId());
}
device.setUpdateTime(now);
- device.setOnline(1);
+ device.setKeepaliveTime(now);
+ if (device.getKeepaliveIntervalTime() == 0) {
+ // 榛樿蹇冭烦闂撮殧60
+ device.setKeepaliveIntervalTime(60);
+ }
+ if (sipTransactionInfo != null) {
+ device.setSipTransactionInfo(sipTransactionInfo);
+ }else {
+ if (deviceInRedis != null) {
+ device.setSipTransactionInfo(deviceInRedis.getSipTransactionInfo());
+ }
+ }
- // 绗竴娆′笂绾�
- if (device.getCreateTime() == null) {
+ // 绗竴娆′笂绾� 鎴栧垯璁惧涔嬪墠鏄绾跨姸鎬�--杩涜閫氶亾鍚屾鍜岃澶囦俊鎭煡璇�
+ if (deviceInDb == null) {
+ device.setOnLine(true);
device.setCreateTime(now);
+ device.setUpdateTime(now);
logger.info("[璁惧涓婄嚎,棣栨娉ㄥ唽]: {}锛屾煡璇㈣澶囦俊鎭互鍙婇�氶亾淇℃伅", device.getDeviceId());
deviceMapper.add(device);
redisCatchStorage.updateDevice(device);
- commander.deviceInfoQuery(device);
+ try {
+ commander.deviceInfoQuery(device);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鏌ヨ璁惧淇℃伅: {}", e.getMessage());
+ }
sync(device);
}else {
- deviceMapper.update(device);
- redisCatchStorage.updateDevice(device);
+
+ if (deviceInDb != null) {
+ device.setSwitchPrimarySubStream(deviceInDb.isSwitchPrimarySubStream());
+ }
+ if(!device.isOnLine()){
+ device.setOnLine(true);
+ device.setCreateTime(now);
+ deviceMapper.update(device);
+ redisCatchStorage.updateDevice(device);
+ if (userSetting.getSyncChannelOnDeviceOnline()) {
+ logger.info("[璁惧涓婄嚎,绂荤嚎鐘舵�佷笅閲嶆柊娉ㄥ唽]: {}锛屾煡璇㈣澶囦俊鎭互鍙婇�氶亾淇℃伅", device.getDeviceId());
+ try {
+ commander.deviceInfoQuery(device);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鏌ヨ璁惧淇℃伅: {}", e.getMessage());
+ }
+ sync(device);
+ // TODO 濡傛灉璁惧涓嬬殑閫氶亾绾ц仈鍒颁簡鍏朵粬骞冲彴锛岄偅涔堥渶瑕佸彂閫佷簨浠舵垨鑰卬otify缁欎笂绾у钩鍙�
+ }
+ }else {
+ if (deviceChannelMapper.queryAllChannels(device.getDeviceId()).size() == 0) {
+ logger.info("[璁惧涓婄嚎]: {}锛岄�氶亾鏁颁负0,鏌ヨ閫氶亾淇℃伅", device.getDeviceId());
+ sync(device);
+ }
+
+ deviceMapper.update(device);
+ redisCatchStorage.updateDevice(device);
+ }
+
}
// 涓婄嚎娣诲姞璁㈤槄
@@ -105,33 +176,58 @@
addMobilePositionSubscribe(device);
}
// 鍒锋柊杩囨湡浠诲姟
- String registerExpireTaskKey = registerExpireTaskKeyPrefix + device.getDeviceId();
- dynamicTask.startDelay(registerExpireTaskKey, ()-> offline(device.getDeviceId()), device.getExpires() * 1000);
+ String registerExpireTaskKey = VideoManagerConstants.REGISTER_EXPIRE_TASK_KEY_PREFIX + device.getDeviceId();
+ // 濡傛灉绗竴娆℃敞鍐岄偅涔堝繀椤诲湪60 * 3鏃堕棿鍐呮敹鍒颁竴涓績璺筹紝鍚﹀垯璁惧绂荤嚎
+ dynamicTask.startDelay(registerExpireTaskKey, ()-> offline(device.getDeviceId(), "棣栨娉ㄥ唽鍚庢湭鑳芥敹鍒板績璺�"), device.getKeepaliveIntervalTime() * 1000 * 3);
+ if (userSetting.getDeviceStatusNotify()) {
+ // 鍙戦�乺edis娑堟伅
+ redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, true);
+ }
+
+//
+// try {
+// cmder.alarmSubscribe(device, 600, "0", "4", "0", "2023-7-27T00:00:00", "2023-7-28T00:00:00");
+// } catch (InvalidArgumentException e) {
+// throw new RuntimeException(e);
+// } catch (SipException e) {
+// throw new RuntimeException(e);
+// } catch (ParseException e) {
+// throw new RuntimeException(e);
+// }
+
}
@Override
- public void offline(String deviceId) {
+ public void offline(String deviceId, String reason) {
+ logger.warn("[璁惧绂荤嚎]锛寋}, device锛歿}", reason, deviceId);
Device device = deviceMapper.getDeviceByDeviceId(deviceId);
if (device == null) {
return;
}
- String registerExpireTaskKey = registerExpireTaskKeyPrefix + deviceId;
+ String registerExpireTaskKey = VideoManagerConstants.REGISTER_EXPIRE_TASK_KEY_PREFIX + deviceId;
dynamicTask.stop(registerExpireTaskKey);
- device.setOnline(0);
+ device.setOnLine(false);
redisCatchStorage.updateDevice(device);
deviceMapper.update(device);
+ //杩涜閫氶亾绂荤嚎
+ deviceChannelMapper.offlineByDeviceId(deviceId);
// 绂荤嚎閲婃斁鎵�鏈塻src
List<SsrcTransaction> ssrcTransactions = streamSession.getSsrcTransactionForAll(deviceId, null, null, null);
if (ssrcTransactions != null && ssrcTransactions.size() > 0) {
for (SsrcTransaction ssrcTransaction : ssrcTransactions) {
mediaServerService.releaseSsrc(ssrcTransaction.getMediaServerId(), ssrcTransaction.getSsrc());
- mediaServerService.closeRTPServer(deviceId, ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
+ mediaServerService.closeRTPServer(ssrcTransaction.getMediaServerId(), ssrcTransaction.getStream());
streamSession.remove(deviceId, ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
}
}
// 绉婚櫎璁㈤槄
removeCatalogSubscribe(device);
removeMobilePositionSubscribe(device);
+ if (userSetting.getDeviceStatusNotify()) {
+ // 鍙戦�乺edis娑堟伅
+ redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, false);
+ }
+
}
@Override
@@ -142,7 +238,7 @@
logger.info("[娣诲姞鐩綍璁㈤槄] 璁惧{}", device.getDeviceId());
// 娣诲姞鐩綍璁㈤槄
CatalogSubscribeTask catalogSubscribeTask = new CatalogSubscribeTask(device, sipCommander, dynamicTask);
- // 鎻愬墠寮�濮嬪埛鏂拌闃�
+ // 鍒锋柊璁㈤槄
int subscribeCycleForCatalog = Math.max(device.getSubscribeCycleForCatalog(),30);
// 璁剧疆鏈�灏忓�间负30
dynamicTask.startCron(device.getDeviceId() + "catalog", catalogSubscribeTask, (subscribeCycleForCatalog -1) * 1000);
@@ -156,7 +252,7 @@
}
logger.info("[绉婚櫎鐩綍璁㈤槄]: {}", device.getDeviceId());
String taskKey = device.getDeviceId() + "catalog";
- if (device.getOnline() == 1) {
+ if (device.isOnLine()) {
Runnable runnable = dynamicTask.get(taskKey);
if (runnable instanceof ISubscribeTask) {
ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
@@ -177,8 +273,8 @@
MobilePositionSubscribeTask mobilePositionSubscribeTask = new MobilePositionSubscribeTask(device, sipCommander, dynamicTask);
// 璁剧疆鏈�灏忓�间负30
int subscribeCycleForCatalog = Math.max(device.getSubscribeCycleForMobilePosition(),30);
- // 鎻愬墠寮�濮嬪埛鏂拌闃�
- dynamicTask.startCron(device.getDeviceId() + "mobile_position" , mobilePositionSubscribeTask, (subscribeCycleForCatalog -1 ) * 1000);
+ // 鍒锋柊璁㈤槄
+ dynamicTask.startCron(device.getDeviceId() + "mobile_position" , mobilePositionSubscribeTask, (subscribeCycleForCatalog) * 1000);
return true;
}
@@ -189,7 +285,7 @@
}
logger.info("[绉婚櫎绉诲姩浣嶇疆璁㈤槄]: {}", device.getDeviceId());
String taskKey = device.getDeviceId() + "mobile_position";
- if (device.getOnline() == 1) {
+ if (device.isOnLine()) {
Runnable runnable = dynamicTask.get(taskKey);
if (runnable instanceof ISubscribeTask) {
ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
@@ -218,15 +314,28 @@
}
int sn = (int)((Math.random()*9+1)*100000);
catalogResponseMessageHandler.setChannelSyncReady(device, sn);
- sipCommander.catalogQuery(device, sn, event -> {
- String errorMsg = String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg);
+ try {
+ sipCommander.catalogQuery(device, sn, event -> {
+ String errorMsg = String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg);
+ catalogResponseMessageHandler.setChannelSyncEnd(device.getDeviceId(), errorMsg);
+ });
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍚屾閫氶亾], 淇′护鍙戦�佸け璐ワ細{}", e.getMessage() );
+ String errorMsg = String.format("鍚屾閫氶亾澶辫触锛屼俊浠ゅ彂閫佸け璐ワ細 %s", e.getMessage());
catalogResponseMessageHandler.setChannelSyncEnd(device.getDeviceId(), errorMsg);
- });
+ }
}
@Override
- public Device queryDevice(String deviceId) {
- return deviceMapper.getDeviceByDeviceId(deviceId);
+ public Device getDevice(String deviceId) {
+ Device device = redisCatchStorage.getDevice(deviceId);
+ if (device == null) {
+ device = deviceMapper.getDeviceByDeviceId(deviceId);
+ if (device != null) {
+ redisCatchStorage.updateDevice(device);
+ }
+ }
+ return device;
}
@Override
@@ -243,10 +352,14 @@
@Override
public void checkDeviceStatus(Device device) {
- if (device == null || device.getOnline() == 0) {
+ if (device == null || !device.isOnLine()) {
return;
}
- sipCommander.deviceStatusQuery(device, null);
+ try {
+ sipCommander.deviceStatusQuery(device, null);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 璁惧鐘舵�佹煡璇�: {}", e.getMessage());
+ }
}
@@ -258,19 +371,145 @@
@Override
public void updateDevice(Device device) {
+ String now = DateUtil.getNow();
+ device.setUpdateTime(now);
+ device.setCharset(device.getCharset().toUpperCase());
+ device.setUpdateTime(DateUtil.getNow());
+ if (deviceMapper.update(device) > 0) {
+ redisCatchStorage.updateDevice(device);
+ }
+ }
+
+ /**
+ * 鏇存柊閫氶亾鍧愭爣绯�
+ */
+ private void updateDeviceChannelGeoCoordSys(Device device) {
+ List<DeviceChannel> deviceChannels = deviceChannelMapper.getAllChannelWithCoordinate(device.getDeviceId());
+ if (deviceChannels.size() > 0) {
+ List<DeviceChannel> deviceChannelsForStore = new ArrayList<>();
+ for (DeviceChannel deviceChannel : deviceChannels) {
+ deviceChannelsForStore.add(deviceChannelService.updateGps(deviceChannel, device));
+ }
+ deviceChannelService.updateChannels(device.getDeviceId(), deviceChannelsForStore);
+ }
+ }
+
+
+ @Override
+ public List<BaseTree<DeviceChannel>> queryVideoDeviceTree(String deviceId, String parentId, boolean onlyCatalog) {
+ Device device = deviceMapper.getDeviceByDeviceId(deviceId);
+ if (device == null) {
+ return null;
+ }
+ if (ObjectUtils.isEmpty(parentId) ) {
+ parentId = deviceId;
+ }
+ List<DeviceChannel> rootNodes = deviceChannelMapper.getSubChannelsByDeviceId(deviceId, parentId, onlyCatalog);
+ return transportChannelsToTree(rootNodes, "");
+ }
+
+ @Override
+ public List<DeviceChannel> queryVideoDeviceInTreeNode(String deviceId, String parentId) {
+ Device device = deviceMapper.getDeviceByDeviceId(deviceId);
+ if (device == null) {
+ return null;
+ }
+ if (ObjectUtils.isEmpty(parentId) || parentId.equals(deviceId)) {
+ return deviceChannelMapper.getSubChannelsByDeviceId(deviceId, null, false);
+ }else {
+ return deviceChannelMapper.getSubChannelsByDeviceId(deviceId, parentId, false);
+ }
+ }
+
+ private List<BaseTree<DeviceChannel>> transportChannelsToTree(List<DeviceChannel> channels, String parentId) {
+ if (channels == null) {
+ return null;
+ }
+ List<BaseTree<DeviceChannel>> treeNotes = new ArrayList<>();
+ if (channels.size() == 0) {
+ return treeNotes;
+ }
+ for (DeviceChannel channel : channels) {
+
+ BaseTree<DeviceChannel> node = new BaseTree<>();
+ node.setId(channel.getChannelId());
+ node.setDeviceId(channel.getDeviceId());
+ node.setName(channel.getName());
+ node.setPid(parentId);
+ node.setBasicData(channel);
+ node.setParent(false);
+ if (channel.getChannelId().length() <= 8) {
+ node.setParent(true);
+ }else {
+ if (channel.getChannelId().length() != 20) {
+ node.setParent(channel.getParental() == 1);
+ }else {
+ try {
+ int type = Integer.parseInt(channel.getChannelId().substring(10, 13));
+ if (type == 215 || type == 216 || type == 200) {
+ node.setParent(true);
+ }
+ }catch (NumberFormatException e) {
+ node.setParent(false);
+ }
+ }
+ }
+ treeNotes.add(node);
+ }
+ Collections.sort(treeNotes);
+ return treeNotes;
+ }
+
+ @Override
+ public boolean isExist(String deviceId) {
+ return deviceMapper.getDeviceByDeviceId(deviceId) != null;
+ }
+
+ @Override
+ public void addDevice(Device device) {
+ device.setOnLine(false);
+ device.setCreateTime(DateUtil.getNow());
+ device.setUpdateTime(DateUtil.getNow());
+ deviceMapper.addCustomDevice(device);
+ }
+
+ @Override
+ public void updateCustomDevice(Device device) {
Device deviceInStore = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
if (deviceInStore == null) {
logger.warn("鏇存柊璁惧鏃舵湭鎵惧埌璁惧淇℃伅");
return;
}
- if (!StringUtils.isEmpty(device.getName())) {
+ if(deviceInStore.isSwitchPrimarySubStream() != device.isSwitchPrimarySubStream()){
+ //褰撲慨鏀硅澶囩殑涓诲瓙鐮佹祦寮�鍏虫椂锛岄渶瑕佹牎楠屾槸鍚﹀瓨鍦ㄦ祦锛屽鏋滃瓨鍦ㄦ祦鍒欑洿鎺ュ叧闂�
+ List<SsrcTransaction> ssrcTransactionForAll = streamSession.getSsrcTransactionForAll(device.getDeviceId(), null, null, null);
+ if(ssrcTransactionForAll != null){
+ for (SsrcTransaction ssrcTransaction: ssrcTransactionForAll) {
+ try {
+ cmder.streamByeCmd(device, ssrcTransaction.getChannelId(), ssrcTransaction.getStream(), null, null);
+ } catch (InvalidArgumentException | SsrcTransactionNotFoundException | ParseException | SipException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ deviceChannelMapper.clearPlay(device.getDeviceId());
+ inviteStreamService.clearInviteInfo(device.getDeviceId());
+ }
+
+ if (!ObjectUtils.isEmpty(device.getName())) {
deviceInStore.setName(device.getName());
}
- if (!StringUtils.isEmpty(device.getCharset())) {
+ if (!ObjectUtils.isEmpty(device.getCharset())) {
deviceInStore.setCharset(device.getCharset());
}
- if (!StringUtils.isEmpty(device.getMediaServerId())) {
+ if (!ObjectUtils.isEmpty(device.getMediaServerId())) {
deviceInStore.setMediaServerId(device.getMediaServerId());
+ }
+ if (!ObjectUtils.isEmpty(device.getCharset())) {
+ deviceInStore.setCharset(device.getCharset());
+ }
+ if (!ObjectUtils.isEmpty(device.getSdpIp())) {
+ deviceInStore.setSdpIp(device.getSdpIp());
}
// 鐩綍璁㈤槄鐩稿叧鐨勪俊鎭�
@@ -302,43 +541,56 @@
removeMobilePositionSubscribe(deviceInStore);
}
}
- // 鍧愭爣绯诲彉鍖栵紝闇�瑕侀噸鏂拌绠桮CJ02鍧愭爣鍜學GS84鍧愭爣
- if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
- updateDeviceChannelGeoCoordSys(device);
+ if (deviceInStore.getGeoCoordSys() != null) {
+ // 鍧愭爣绯诲彉鍖栵紝闇�瑕侀噸鏂拌绠桮CJ02鍧愭爣鍜學GS84鍧愭爣
+ if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
+ updateDeviceChannelGeoCoordSys(device);
+ }
+ }else {
+ device.setGeoCoordSys("WGS84");
+ }
+ if (device.getCharset() == null) {
+ device.setCharset("GB2312");
}
- String now = DateUtil.getNow();
- device.setUpdateTime(now);
- device.setCharset(device.getCharset().toUpperCase());
- device.setUpdateTime(DateUtil.getNow());
- if (deviceMapper.update(device) > 0) {
- redisCatchStorage.updateDevice(device);
+ // 鏇存柊redis
+ redisCatchStorage.updateDevice(device);
+ deviceMapper.updateCustom(device);
+ }
+ @Override
+ public boolean delete(String deviceId) {
+ TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+ boolean result = false;
+ try {
+ platformChannelMapper.delChannelForDeviceId(deviceId);
+ deviceChannelMapper.cleanChannelsByDeviceId(deviceId);
+ if ( deviceMapper.del(deviceId) < 0 ) {
+ //浜嬪姟鍥炴粴
+ dataSourceTransactionManager.rollback(transactionStatus);
+ }
+ result = true;
+ dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
+ }catch (Exception e) {
+ dataSourceTransactionManager.rollback(transactionStatus);
}
+ if (result) {
+ redisCatchStorage.removeDevice(deviceId);
+ }
+ return result;
}
- /**
- * 鏇存柊閫氶亾鍧愭爣绯�
- */
- private void updateDeviceChannelGeoCoordSys(Device device) {
- List<DeviceChannel> deviceChannels = deviceChannelMapper.getAllChannelWithCoordinate(device.getDeviceId());
- if (deviceChannels.size() > 0) {
- for (DeviceChannel deviceChannel : deviceChannels) {
- if ("WGS84".equals(device.getGeoCoordSys())) {
- deviceChannel.setLongitudeWgs84(deviceChannel.getLongitude());
- deviceChannel.setLatitudeWgs84(deviceChannel.getLatitude());
- Double[] position = Coordtransform.WGS84ToGCJ02(deviceChannel.getLongitude(), deviceChannel.getLatitude());
- deviceChannel.setLongitudeGcj02(position[0]);
- deviceChannel.setLatitudeGcj02(position[1]);
- }else if ("GCJ02".equals(device.getGeoCoordSys())) {
- deviceChannel.setLongitudeGcj02(deviceChannel.getLongitude());
- deviceChannel.setLatitudeGcj02(deviceChannel.getLatitude());
- Double[] position = Coordtransform.GCJ02ToWGS84(deviceChannel.getLongitude(), deviceChannel.getLatitude());
- deviceChannel.setLongitudeWgs84(position[0]);
- deviceChannel.setLatitudeWgs84(position[1]);
- }
- }
- }
- storage.updateChannels(device.getDeviceId(), deviceChannels);
+ @Override
+ public ResourceBaseInfo getOverview() {
+ List<Device> onlineDevices = deviceMapper.getOnlineDevices();
+ List<Device> all = deviceMapper.getAll();
+ return new ResourceBaseInfo(all.size(), onlineDevices.size());
}
+
+ @Override
+ public List<Device> getAll() {
+ return deviceMapper.getAll();
+ }
+
+
}
--
Gitblit v1.8.0