From 2e98b20bea4463e4465e3c19059d0744a09aec06 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 14:34:41 +0800
Subject: [PATCH] gb28181版本升级-补充

---
 src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java |  633 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 633 insertions(+), 0 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
new file mode 100644
index 0000000..5ae7251
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -0,0 +1,633 @@
+package com.genersoft.iot.vmp.service.impl;
+
+import com.genersoft.iot.vmp.conf.DynamicTask;
+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.IDeviceChannelService;
+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.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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.support.incrementer.AbstractIdentityColumnMaxValueIncrementer;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+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;
+
+/**
+ * 设备业务(目录订阅)
+ */
+@Service
+public class DeviceServiceImpl implements IDeviceService {
+
+    private final static Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class);
+
+    private final String  registerExpireTaskKeyPrefix = "device-register-expire-";
+
+    @Autowired
+    private DynamicTask dynamicTask;
+
+    @Autowired
+    private ISIPCommander sipCommander;
+
+    @Autowired
+    private CatalogResponseMessageHandler catalogResponseMessageHandler;
+
+    @Autowired
+    private IRedisCatchStorage redisCatchStorage;
+
+    @Autowired
+    private DeviceMapper deviceMapper;
+
+    @Autowired
+    private PlatformChannelMapper platformChannelMapper;
+
+    @Autowired
+    private IDeviceChannelService deviceChannelService;
+
+    @Autowired
+    private DeviceChannelMapper deviceChannelMapper;
+
+    @Autowired
+    DataSourceTransactionManager dataSourceTransactionManager;
+
+    @Autowired
+    TransactionDefinition transactionDefinition;
+
+    @Autowired
+    private IVideoManagerStorage storage;
+
+    @Autowired
+    private ISIPCommander commander;
+
+    @Autowired
+    private VideoStreamSessionManager streamSession;
+
+    @Autowired
+    private IMediaServerService mediaServerService;
+
+    @Override
+    public void online(Device device) {
+        logger.info("[设备上线] deviceId:{}->{}:{}", device.getDeviceId(), device.getIp(), device.getPort());
+        Device deviceInRedis = redisCatchStorage.getDevice(device.getDeviceId());
+        Device deviceInDb = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
+
+        String now = DateUtil.getNow();
+        if (deviceInRedis != null && deviceInDb == null) {
+            // redis 存在脏数据
+            redisCatchStorage.clearCatchByDeviceId(device.getDeviceId());
+        }
+        device.setUpdateTime(now);
+
+        // 第一次上线 或则设备之前是离线状态--进行通道同步和设备信息查询
+        if (device.getCreateTime() == null) {
+            device.setOnline(1);
+            device.setCreateTime(now);
+            logger.info("[设备上线,首次注册]: {},查询设备信息以及通道信息", device.getDeviceId());
+            deviceMapper.add(device);
+            redisCatchStorage.updateDevice(device);
+            try {
+                commander.deviceInfoQuery(device);
+            } catch (InvalidArgumentException | SipException | ParseException e) {
+                logger.error("[命令发送失败] 查询设备信息: {}", e.getMessage());
+            }
+            sync(device);
+        }else {
+
+            if(device.getOnline() == 0){
+                device.setOnline(1);
+                device.setCreateTime(now);
+                logger.info("[设备上线,离线状态下重新注册]: {},查询设备信息以及通道信息", device.getDeviceId());
+                deviceMapper.update(device);
+                redisCatchStorage.updateDevice(device);
+                try {
+                    commander.deviceInfoQuery(device);
+                } catch (InvalidArgumentException | SipException | ParseException e) {
+                    logger.error("[命令发送失败] 查询设备信息: {}", e.getMessage());
+                }
+                sync(device);
+                // TODO 如果设备下的通道级联到了其他平台,那么需要发送事件或者notify给上级平台
+            }else {
+                if (deviceChannelMapper.queryAllChannels(device.getDeviceId()).size() == 0) {
+                    logger.info("[设备上线]: {},通道数为0,查询通道信息", device.getDeviceId());
+                    sync(device);
+                }
+
+                deviceMapper.update(device);
+                redisCatchStorage.updateDevice(device);
+            }
+
+        }
+
+        // 上线添加订阅
+        if (device.getSubscribeCycleForCatalog() > 0) {
+            // 查询在线设备那些开启了订阅,为设备开启定时的目录订阅
+            addCatalogSubscribe(device);
+        }
+        if (device.getSubscribeCycleForMobilePosition() > 0) {
+            addMobilePositionSubscribe(device);
+        }
+        // 刷新过期任务
+        String registerExpireTaskKey = registerExpireTaskKeyPrefix + device.getDeviceId();
+        dynamicTask.startDelay(registerExpireTaskKey, ()-> offline(device.getDeviceId()), device.getExpires() * 1000);
+    }
+
+    @Override
+    public void offline(String deviceId) {
+        logger.info("[设备离线], device:{}", deviceId);
+        Device device = deviceMapper.getDeviceByDeviceId(deviceId);
+        if (device == null) {
+            return;
+        }
+        String registerExpireTaskKey = registerExpireTaskKeyPrefix + deviceId;
+        dynamicTask.stop(registerExpireTaskKey);
+        device.setOnline(0);
+        redisCatchStorage.updateDevice(device);
+        deviceMapper.update(device);
+        //进行通道离线
+        deviceChannelMapper.offlineByDeviceId(deviceId);
+        // 离线释放所有ssrc
+        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(ssrcTransaction.getMediaServerId(), ssrcTransaction.getStream());
+                streamSession.remove(deviceId, ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
+            }
+        }
+        // 移除订阅
+        removeCatalogSubscribe(device);
+        removeMobilePositionSubscribe(device);
+    }
+
+    @Override
+    public boolean addCatalogSubscribe(Device device) {
+        if (device == null || device.getSubscribeCycleForCatalog() < 0) {
+            return false;
+        }
+        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);
+        return true;
+    }
+
+    @Override
+    public boolean removeCatalogSubscribe(Device device) {
+        if (device == null || device.getSubscribeCycleForCatalog() < 0) {
+            return false;
+        }
+        logger.info("[移除目录订阅]: {}", device.getDeviceId());
+        String taskKey = device.getDeviceId() + "catalog";
+        if (device.getOnline() == 1) {
+            Runnable runnable = dynamicTask.get(taskKey);
+            if (runnable instanceof ISubscribeTask) {
+                ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
+                subscribeTask.stop();
+            }
+        }
+        dynamicTask.stop(taskKey);
+        return true;
+    }
+
+    @Override
+    public boolean addMobilePositionSubscribe(Device device) {
+        if (device == null || device.getSubscribeCycleForMobilePosition() < 0) {
+            return false;
+        }
+        logger.info("[添加移动位置订阅] 设备{}", device.getDeviceId());
+        // 添加目录订阅
+        MobilePositionSubscribeTask mobilePositionSubscribeTask = new MobilePositionSubscribeTask(device, sipCommander, dynamicTask);
+        // 设置最小值为30
+        int subscribeCycleForCatalog = Math.max(device.getSubscribeCycleForMobilePosition(),30);
+        // 刷新订阅
+        dynamicTask.startCron(device.getDeviceId() + "mobile_position" , mobilePositionSubscribeTask, (subscribeCycleForCatalog) * 1000);
+        return true;
+    }
+
+    @Override
+    public boolean removeMobilePositionSubscribe(Device device) {
+        if (device == null || device.getSubscribeCycleForCatalog() < 0) {
+            return false;
+        }
+        logger.info("[移除移动位置订阅]: {}", device.getDeviceId());
+        String taskKey = device.getDeviceId() + "mobile_position";
+        if (device.getOnline() == 1) {
+            Runnable runnable = dynamicTask.get(taskKey);
+            if (runnable instanceof ISubscribeTask) {
+                ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
+                subscribeTask.stop();
+            }
+        }
+        dynamicTask.stop(taskKey);
+        return true;
+    }
+
+    @Override
+    public SyncStatus getChannelSyncStatus(String deviceId) {
+        return catalogResponseMessageHandler.getChannelSyncProgress(deviceId);
+    }
+
+    @Override
+    public Boolean isSyncRunning(String deviceId) {
+        return catalogResponseMessageHandler.isSyncRunning(deviceId);
+    }
+
+    @Override
+    public void sync(Device device) {
+        if (catalogResponseMessageHandler.isSyncRunning(device.getDeviceId())) {
+            logger.info("开启同步时发现同步已经存在");
+            return;
+        }
+        int sn = (int)((Math.random()*9+1)*100000);
+        catalogResponseMessageHandler.setChannelSyncReady(device, sn);
+        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 getDevice(String deviceId) {
+        Device device = redisCatchStorage.getDevice(deviceId);
+        if (device == null) {
+            device = deviceMapper.getDeviceByDeviceId(deviceId);
+            if (device != null) {
+                redisCatchStorage.updateDevice(device);
+            }
+        }
+        return device;
+    }
+
+    @Override
+    public List<Device> getAllOnlineDevice() {
+        return deviceMapper.getOnlineDevices();
+    }
+
+    @Override
+    public boolean expire(Device device) {
+        Instant registerTimeDate = Instant.from(DateUtil.formatter.parse(device.getRegisterTime()));
+        Instant expireInstant = registerTimeDate.plusMillis(TimeUnit.SECONDS.toMillis(device.getExpires()));
+        return expireInstant.isBefore(Instant.now());
+    }
+
+    @Override
+    public void checkDeviceStatus(Device device) {
+        if (device == null || device.getOnline() == 0) {
+            return;
+        }
+        try {
+            sipCommander.deviceStatusQuery(device, null);
+        } catch (InvalidArgumentException | SipException | ParseException e) {
+            logger.error("[命令发送失败] 设备状态查询: {}", e.getMessage());
+        }
+
+    }
+
+    @Override
+    public Device getDeviceByHostAndPort(String host, int port) {
+        return deviceMapper.getDeviceByHostAndPort(host, port);
+    }
+
+    @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);
+       }
+    }
+
+
+    /**
+     *
+     * @param deviceId
+     * @param parentId
+     * @param onlyCatalog
+     * @param deptId
+     * @return
+     */
+    @Override
+    public List<BaseTree<DeviceChannel>> queryVideoDeviceTree(String deviceId,
+                                                              String parentId,
+                                                              boolean onlyCatalog,
+                                                              String deptId) {
+        Device device = deviceMapper.getDeviceByDeviceId(deviceId);
+        if (device == null) {
+            return null;
+        }
+        if (parentId == null || parentId.equals(deviceId)) {
+            // 字根节点开始查询
+            List<DeviceChannel> rootNodes = getRootNodes(deviceId, TreeType.CIVIL_CODE.equals(device.getTreeType()), true, !onlyCatalog,deptId);
+            return transportChannelsToTree(rootNodes, "");
+        }
+
+        if (TreeType.CIVIL_CODE.equals(device.getTreeType())) {
+            if (parentId.length()%2 != 0) {
+                return null;
+            }
+            // 使用行政区划展示树
+//            if (parentId.length() > 10) {
+//                // TODO 可能是行政区划与业务分组混杂的情形
+//                return null;
+//            }
+
+            if (parentId.length() == 10 ) {
+                if (onlyCatalog) {
+                    return null;
+                }
+                // parentId为行业编码, 其下不会再有行政区划
+                List<DeviceChannel> channels = deviceChannelMapper.getChannelsByCivilCode(deviceId, parentId);
+                List<BaseTree<DeviceChannel>> trees = transportChannelsToTree(channels, parentId);
+                return trees;
+            }
+            // 查询其下的行政区划和摄像机
+            List<DeviceChannel> channelsForCivilCode = deviceChannelMapper.getChannelsWithCivilCodeAndLength(deviceId, parentId, parentId.length() + 2);
+            if (!onlyCatalog) {
+                List<DeviceChannel> channels = deviceChannelMapper.getChannelsByCivilCode(deviceId, parentId);
+
+                for(DeviceChannel channel : channels) {
+                    boolean flag = false;
+                    for(DeviceChannel deviceChannel : channelsForCivilCode) {
+                        if(channel.getChannelId().equals(deviceChannel.getChannelId())) {
+                            flag = true;
+                        }
+                    }
+                    if(!flag) {
+                        channelsForCivilCode.add(channel);
+                    }
+                }
+            }
+            List<BaseTree<DeviceChannel>> trees = transportChannelsToTree(channelsForCivilCode, parentId);
+            return trees;
+
+        }
+        // 使用业务分组展示树
+        if (TreeType.BUSINESS_GROUP.equals(device.getTreeType())) {
+            if (parentId.length() < 14 ) {
+                return null;
+            }
+            List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, parentId, null, null, null,deptId);
+            List<BaseTree<DeviceChannel>> trees = transportChannelsToTree(deviceChannels, parentId);
+            return trees;
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<DeviceChannel> queryVideoDeviceInTreeNode(String deviceId, String parentId,String deptId) {
+        Device device = deviceMapper.getDeviceByDeviceId(deviceId);
+        if (device == null) {
+            return null;
+        }
+        if (parentId == null || parentId.equals(deviceId)) {
+            // 字根节点开始查询
+            List<DeviceChannel> rootNodes = getRootNodes(deviceId, TreeType.CIVIL_CODE.equals(device.getTreeType()), false, true,deptId);
+            return rootNodes;
+        }
+
+        if (TreeType.CIVIL_CODE.equals(device.getTreeType())) {
+            if (parentId.length()%2 != 0) {
+                return null;
+            }
+            // 使用行政区划展示树
+            if (parentId.length() > 10) {
+                // TODO 可能是行政区划与业务分组混杂的情形
+                return null;
+            }
+
+            if (parentId.length() == 10 ) {
+                // parentId为行业编码, 其下不会再有行政区划
+                List<DeviceChannel> channels = deviceChannelMapper.getChannelsByCivilCode(deviceId, parentId);
+                return channels;
+            }
+            // 查询其下的行政区划和摄像机
+            List<DeviceChannel> channels = deviceChannelMapper.getChannelsByCivilCode(deviceId, parentId);
+            return channels;
+
+        }
+        // 使用业务分组展示树
+        if (TreeType.BUSINESS_GROUP.equals(device.getTreeType())) {
+            if (parentId.length() < 14 ) {
+                return null;
+            }
+            List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, parentId, null, null, null,deptId);
+            return deviceChannels;
+        }
+
+        return null;
+    }
+
+    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) {
+                String gbCodeType = channel.getChannelId().substring(10, 13);
+                node.setParent(gbCodeType.equals(ChannelIdType.BUSINESS_GROUP) || gbCodeType.equals(ChannelIdType.VIRTUAL_ORGANIZATION) );
+            }else {
+                node.setParent(true);
+            }
+            treeNotes.add(node);
+        }
+        Collections.sort(treeNotes);
+        return treeNotes;
+    }
+
+    private List<DeviceChannel> getRootNodes(String deviceId, boolean isCivilCode, boolean haveCatalog, boolean haveChannel,String deptId) {
+        if (!haveCatalog && !haveChannel) {
+            return null;
+        }
+        List<DeviceChannel> result = new ArrayList<>();
+        if (isCivilCode) {
+            // 使用行政区划
+            Integer length= deviceChannelMapper.getChannelMinLength(deviceId);
+            if (length == null) {
+                return null;
+            }
+            if (length <= 10) {
+                if (haveCatalog) {
+                    List<DeviceChannel> provinceNode = deviceChannelMapper.getChannelsWithCivilCodeAndLength(deviceId, null, length);
+                    if (provinceNode != null && provinceNode.size() > 0) {
+                        result.addAll(provinceNode);
+                    }
+                }
+
+                if (haveChannel) {
+                    // 查询那些civilCode不在通道中的不规范通道,放置在根目录
+                    List<DeviceChannel> nonstandardNode = deviceChannelMapper.getChannelWithoutCiviCode(deviceId);
+                    if (nonstandardNode != null && nonstandardNode.size() > 0) {
+                        result.addAll(nonstandardNode);
+                    }
+                }
+            }else {
+                if (haveChannel) {
+                    List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, null, null, null, null,deptId);
+                    if (deviceChannels != null && deviceChannels.size() > 0) {
+                        result.addAll(deviceChannels);
+                    }
+                }
+            }
+
+        }else {
+            // 使用业务分组+虚拟组织
+
+            // 只获取业务分组
+            List<DeviceChannel> deviceChannels = deviceChannelMapper.getBusinessGroups(deviceId, ChannelIdType.BUSINESS_GROUP);
+            if (deviceChannels != null && deviceChannels.size() > 0) {
+                result.addAll(deviceChannels);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public boolean isExist(String deviceId) {
+        return deviceMapper.getDeviceByDeviceId(deviceId) != null;
+    }
+
+    @Override
+    public void addDevice(Device device) {
+        device.setOnline(0);
+        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 (!ObjectUtils.isEmpty(device.getName())) {
+            deviceInStore.setName(device.getName());
+        }
+        if (!ObjectUtils.isEmpty(device.getCharset())) {
+            deviceInStore.setCharset(device.getCharset());
+        }
+        if (!ObjectUtils.isEmpty(device.getMediaServerId())) {
+            deviceInStore.setMediaServerId(device.getMediaServerId());
+        }
+
+        //  目录订阅相关的信息
+        if (device.getSubscribeCycleForCatalog() > 0) {
+            if (deviceInStore.getSubscribeCycleForCatalog() == 0 || deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
+                deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
+                // 开启订阅
+                addCatalogSubscribe(deviceInStore);
+            }
+        }else if (device.getSubscribeCycleForCatalog() == 0) {
+            if (deviceInStore.getSubscribeCycleForCatalog() != 0) {
+                deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
+                // 取消订阅
+                removeCatalogSubscribe(deviceInStore);
+            }
+        }
+
+        // 移动位置订阅相关的信息
+        if (device.getSubscribeCycleForMobilePosition() > 0) {
+            if (deviceInStore.getSubscribeCycleForMobilePosition() == 0 || deviceInStore.getSubscribeCycleForMobilePosition() != device.getSubscribeCycleForMobilePosition()) {
+                deviceInStore.setMobilePositionSubmissionInterval(device.getMobilePositionSubmissionInterval());
+                deviceInStore.setSubscribeCycleForMobilePosition(device.getSubscribeCycleForMobilePosition());
+                // 开启订阅
+                addMobilePositionSubscribe(deviceInStore);
+            }
+        }else if (device.getSubscribeCycleForMobilePosition() == 0) {
+            if (deviceInStore.getSubscribeCycleForMobilePosition() != 0) {
+                // 取消订阅
+                removeMobilePositionSubscribe(deviceInStore);
+            }
+        }
+        // 坐标系变化,需要重新计算GCJ02坐标和WGS84坐标
+        if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
+            updateDeviceChannelGeoCoordSys(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);
+        }
+        return result;
+    }
+}

--
Gitblit v1.9.3