From 6fb820e49cac478d2f52faf78fe1703ed332c05c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Wed, 8 Nov 2023 18:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E7=BB=84=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmp/service/ICommonGbChannelService.java    |  3 +++
 .../impl/CommonGbChannelServiceImpl.java        |  6 ++++++
 .../iot/vmp/service/impl/GroupServiceImpl.java  |  7 ++++++-
 .../iot/vmp/storager/dao/GroupMapper.java       | 16 ++++++++--------
 .../channel/CommonChannelController.java        | 17 +++++++++++++++++
 src/main/resources/all-application.yml          |  2 +-
 6 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/ICommonGbChannelService.java b/src/main/java/com/genersoft/iot/vmp/service/ICommonGbChannelService.java
index 483af336..35d7f76b 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/ICommonGbChannelService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/ICommonGbChannelService.java
@@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.service;
 import com.genersoft.iot.vmp.common.CommonGbChannel;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.Gb28181CodeType;
 import com.github.pagehelper.PageInfo;
 
 import java.util.ArrayList;
@@ -49,4 +50,6 @@ public interface ICommonGbChannelService {
     PageInfo<CommonGbChannel> queryChannelListInGroup(String groupDeviceId, String query, int page, int count);
 
     PageInfo<CommonGbChannel> queryChannelList(String query, int page, int count);
+
+    String getRandomCode(Gb28181CodeType type);
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/CommonGbChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/CommonGbChannelServiceImpl.java
index 0e02e816..2aa04349 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/CommonGbChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/CommonGbChannelServiceImpl.java
@@ -621,4 +621,10 @@ public class CommonGbChannelServiceImpl implements ICommonGbChannelService {
         List<CommonGbChannel> all = commonGbChannelMapper.query(query);
         return new PageInfo<>(all);
     }
+
+    @Override
+    public String getRandomCode(Gb28181CodeType type) {
+
+        return "";
+    }
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/GroupServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/GroupServiceImpl.java
index 85c59862..66aace07 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/GroupServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/GroupServiceImpl.java
@@ -8,6 +8,7 @@ import com.genersoft.iot.vmp.service.IGroupService;
 import com.genersoft.iot.vmp.service.bean.Group;
 import com.genersoft.iot.vmp.storager.dao.GroupMapper;
 import com.genersoft.iot.vmp.storager.dao.CommonGbChannelMapper;
+import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageHelper;
@@ -67,6 +68,8 @@ public class GroupServiceImpl implements IGroupService {
     public boolean add(Group group) {
         assert group.getCommonGroupDeviceId() != null;
         assert group.getCommonGroupDeviceId() != null;
+        group.setCommonGroupCreateTime(DateUtil.getNow());
+        group.setCommonGroupUpdateTime(DateUtil.getNow());
         return groupMapper.add(group) > 0;
     }
 
@@ -94,7 +97,9 @@ public class GroupServiceImpl implements IGroupService {
             groupMapper.updateParentDeviceId(groupInDb.getCommonGroupDeviceId(), group.getCommonGroupDeviceId());
             // 修改所有通用通道中分组编号
             commonGbChannelDao.updateChanelGroup(groupInDb.getCommonGroupDeviceId(), group.getCommonGroupDeviceId());
-        }else if (groupInDb.getCommonGroupParentId().equals(group.getCommonGroupParentId())
+        }else if (
+                ((groupInDb.getCommonGroupParentId() == null && group.getCommonGroupParentId() == null)
+                        || groupInDb.getCommonGroupParentId().equals(group.getCommonGroupParentId()))
                 && groupInDb.getCommonGroupName().equals(group.getCommonGroupName())) {
             // 数据无变化
             return false;
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/GroupMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/GroupMapper.java
index cbe2f950..c8d42781 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/GroupMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/GroupMapper.java
@@ -53,15 +53,15 @@ public interface GroupMapper {
 
     @Update(value = {" <script>" +
             "UPDATE wvp_common_group " +
-            "SET common_group_update_time=#{commonGroupUpdateTime}" +
-            "<if test='commonGroupName != null'>, common_group_name=#{commonGroupName}</if>" +
-            "<if test='commonGroupDeviceId != null'>, common_group_device_id=#{commonGroupDeviceId}</if>" +
-            "<if test='commonGroupParentId != null'>, common_group_parent_id=#{commonGroupParentId}</if>" +
-            "<if test='commonGroupTopId != null'>, common_group_top_id=#{commonGroupTopId}</if>" +
-            "<if test='commonGroupUpdateTime != null'>, common_group_update_time=#{commonGroupUpdateTime}</if>" +
-            "WHERE common_group_id=#{commonGroupId}" +
+            "SET common_group_update_time=#{group.commonGroupUpdateTime}" +
+            "<if test='group.commonGroupName != null'>, common_group_name=#{group.commonGroupName}</if>" +
+            "<if test='group.commonGroupDeviceId != null'>, common_group_device_id=#{group.commonGroupDeviceId}</if>" +
+            "<if test='group.commonGroupParentId != null'>, common_group_parent_id=#{group.commonGroupParentId}</if>" +
+            "<if test='group.commonGroupTopId != null'>, common_group_top_id=#{group.commonGroupTopId}</if>" +
+            "<if test='group.commonGroupUpdateTime != null'>, common_group_update_time=#{group.commonGroupUpdateTime}</if>" +
+            "WHERE common_group_id=#{group.commonGroupId}" +
             " </script>"})
-    int update(@Param("Group") Group Group);
+    int update(@Param("group") Group group);
 
 
     @Insert(value = "<script>" +
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java
index 43848f9d..693ee758 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java
@@ -1,6 +1,7 @@
 package com.genersoft.iot.vmp.vmanager.channel;
 
 import com.genersoft.iot.vmp.common.CommonGbChannel;
+import com.genersoft.iot.vmp.gb28181.bean.Gb28181CodeType;
 import com.genersoft.iot.vmp.service.ICommonGbChannelService;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
@@ -103,4 +104,20 @@ public class CommonChannelController {
         commonGbChannelService.update(commonGbChannel);
     }
 
+    @Operation(summary = "获取一个随机的可用国标编号")
+    @Parameter(name = "type", description = "类型： " +
+            "CIVIL_CODE_PROVINCE 省级编号 " +
+            "CIVIL_CODE_CIT 市级编号" +
+            "CIVIL_CODE_GRASS_ROOTS 区级编号" +
+            "CIVIL_CODE_GRASS_ROOTS 基层接入单位编号 " +
+            "BUSINESS_GROUP 业务分组 " +
+            "VIRTUAL_ORGANIZATION 虚拟组织 ", required = true)
+    @ResponseBody
+    @GetMapping("/code/random")
+    public String getRandomCode(
+            @RequestParam(required = true) Gb28181CodeType type
+    ){
+        return commonGbChannelService.getRandomCode(type);
+    }
+
 }
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index e0123793..7586aa41 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -178,7 +178,7 @@ user-settings:
     # 国标是否录制
     record-sip: true
     # 是否将日志存储进数据库
-    logInDatabase: true
+    log-in-database: true
     # 使用推流状态作为推流通道状态
     use-pushing-as-status: true
     # 使用来源请求ip作为streamIp,当且仅当你只有zlm节点它与wvp在一起的情况下开启