Pre Merge pull request !36 from 阿斌/N/A

行政规划错误。江苏南通海门市，修改为海门区，浙江杭州删除下城区、江干区，新增钱塘区，临平区

Signed-off-by: 阿斌 <38912748@qq.com>

src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java

@@ -120,85 +120,83 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
         List<DeviceChannel> updateChannels = new ArrayList<>();
         HashMap<String, DeviceChannel> channelsInStore = new HashMap<>();
         int result = 0;
-        if (channels != null && !channels.isEmpty()) {
-            List<DeviceChannel> channelList = channelMapper.queryChannelsByDeviceDbId(device.getId());
-            if (channelList.isEmpty()) {
-                for (DeviceChannel channel : channels) {
-                    channel.setDataDeviceId(device.getId());
-                    InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, channel.getId());
-                    if (inviteInfo != null && inviteInfo.getStreamInfo() != null) {
-                        channel.setStreamId(inviteInfo.getStreamInfo().getStream());
-                    }
-                    String now = DateUtil.getNow();
+        List<DeviceChannel> channelList = channelMapper.queryChannelsByDeviceDbId(device.getId());
+        if (channelList.isEmpty()) {
+            for (DeviceChannel channel : channels) {
+                channel.setDataDeviceId(device.getId());
+                InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, channel.getId());
+                if (inviteInfo != null && inviteInfo.getStreamInfo() != null) {
+                    channel.setStreamId(inviteInfo.getStreamInfo().getStream());
+                }
+                String now = DateUtil.getNow();
+                channel.setUpdateTime(now);
+                channel.setCreateTime(now);
+                addChannels.add(channel);
+            }
+        }else {
+            for (DeviceChannel deviceChannel : channelList) {
+                channelsInStore.put(deviceChannel.getDataDeviceId() + deviceChannel.getDeviceId(), deviceChannel);
+            }
+            for (DeviceChannel channel : channels) {
+                InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, channel.getId());
+                if (inviteInfo != null && inviteInfo.getStreamInfo() != null) {
+                    channel.setStreamId(inviteInfo.getStreamInfo().getStream());
+                }
+                String now = DateUtil.getNow();
+                channel.setUpdateTime(now);
+                DeviceChannel deviceChannelInDb = channelsInStore.get(channel.getDataDeviceId() + channel.getDeviceId());
+                if ( deviceChannelInDb != null) {
+                    channel.setId(deviceChannelInDb.getId());
                     channel.setUpdateTime(now);
+                    updateChannels.add(channel);
+                }else {
                     channel.setCreateTime(now);
+                    channel.setUpdateTime(now);
                     addChannels.add(channel);
                 }
-            }else {
-                for (DeviceChannel deviceChannel : channelList) {
-                    channelsInStore.put(deviceChannel.getDataDeviceId() + deviceChannel.getDeviceId(), deviceChannel);
-                }
-                for (DeviceChannel channel : channels) {
-                    InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, channel.getId());
-                    if (inviteInfo != null && inviteInfo.getStreamInfo() != null) {
-                        channel.setStreamId(inviteInfo.getStreamInfo().getStream());
-                    }
-                    String now = DateUtil.getNow();
-                    channel.setUpdateTime(now);
-                    DeviceChannel deviceChannelInDb = channelsInStore.get(channel.getDataDeviceId() + channel.getDeviceId());
-                    if ( deviceChannelInDb != null) {
-                        channel.setId(deviceChannelInDb.getId());
-                        channel.setUpdateTime(now);
-                        updateChannels.add(channel);
-                    }else {
-                        channel.setCreateTime(now);
-                        channel.setUpdateTime(now);
-                        addChannels.add(channel);
-                    }
-                }
             }
-            Set<String> channelSet = new HashSet<>();
-            // 滤重
-            List<DeviceChannel> addChannelList = new ArrayList<>();
-            List<DeviceChannel> updateChannelList = new ArrayList<>();
-            addChannels.forEach(channel -> {
-                if (channelSet.add(channel.getDeviceId())) {
-                    addChannelList.add(channel);
-                }
-            });
-            channelSet.clear();
-            updateChannels.forEach(channel -> {
-                if (channelSet.add(channel.getDeviceId())) {
-                    updateChannelList.add(channel);
-                }
-            });
+        }
+        Set<String> channelSet = new HashSet<>();
+        // 滤重
+        List<DeviceChannel> addChannelList = new ArrayList<>();
+        List<DeviceChannel> updateChannelList = new ArrayList<>();
+        addChannels.forEach(channel -> {
+            if (channelSet.add(channel.getDeviceId())) {
+                addChannelList.add(channel);
+            }
+        });
+        channelSet.clear();
+        updateChannels.forEach(channel -> {
+            if (channelSet.add(channel.getDeviceId())) {
+                updateChannelList.add(channel);
+            }
+        });
 
-            int limitCount = 500;
-            if (!addChannelList.isEmpty()) {
-                if (addChannelList.size() > limitCount) {
-                    for (int i = 0; i < addChannelList.size(); i += limitCount) {
-                        int toIndex = i + limitCount;
-                        if (i + limitCount > addChannelList.size()) {
-                            toIndex = addChannelList.size();
-                        }
-                        result += channelMapper.batchAdd(addChannelList.subList(i, toIndex));
+        int limitCount = 500;
+        if (!addChannelList.isEmpty()) {
+            if (addChannelList.size() > limitCount) {
+                for (int i = 0; i < addChannelList.size(); i += limitCount) {
+                    int toIndex = i + limitCount;
+                    if (i + limitCount > addChannelList.size()) {
+                        toIndex = addChannelList.size();
                     }
-                }else {
-                    result += channelMapper.batchAdd(addChannelList);
+                    result += channelMapper.batchAdd(addChannelList.subList(i, toIndex));
                 }
+            }else {
+                result += channelMapper.batchAdd(addChannelList);
             }
-            if (!updateChannelList.isEmpty()) {
-                if (updateChannelList.size() > limitCount) {
-                    for (int i = 0; i < updateChannelList.size(); i += limitCount) {
-                        int toIndex = i + limitCount;
-                        if (i + limitCount > updateChannelList.size()) {
-                            toIndex = updateChannelList.size();
-                        }
-                        result += channelMapper.batchUpdate(updateChannelList.subList(i, toIndex));
+        }
+        if (!updateChannelList.isEmpty()) {
+            if (updateChannelList.size() > limitCount) {
+                for (int i = 0; i < updateChannelList.size(); i += limitCount) {
+                    int toIndex = i + limitCount;
+                    if (i + limitCount > updateChannelList.size()) {
+                        toIndex = updateChannelList.size();
                     }
-                }else {
-                    result += channelMapper.batchUpdate(updateChannelList);
+                    result += channelMapper.batchUpdate(updateChannelList.subList(i, toIndex));
                 }
+            }else {
+                result += channelMapper.batchUpdate(updateChannelList);
             }
         }
         return result;

src/main/resources/civilCode.csv

@@ -861,7 +861,7 @@
 320623,如东县,3206
 320681,启东市,3206
 320682,如皋市,3206
-320684,海门市,3206
+320684,海门区,3206
 320685,海安市,3206
 3207,连云港市,32
 320703,连云区,3207
@@ -918,8 +918,6 @@
 33,浙江省, 
 3301,杭州市,33
 330102,上城区,3301
-330103,下城区,3301
-330104,江干区,3301
 330105,拱墅区,3301
 330106,西湖区,3301
 330108,滨江区,3301
@@ -927,6 +925,8 @@
 330110,余杭区,3301
 330111,富阳区,3301
 330112,临安区,3301
+330113,临平区,3301
+330114,钱塘区,3301
 330122,桐庐县,3301
 330127,淳安县,3301
 330182,建德市,3301

web/src/router/index.js

@@ -60,7 +60,7 @@ export const constantRoutes = [
     component: Layout,
     redirect: '/live',
     children: [{
-      path: 'live',
+      path: '',
       name: 'Live',
       component: () => import('@/views/live/index'),
       meta: { title: '分屏监控', icon: 'live' }