roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

临时提交

Browse Source
This commit is contained in:
648540858
2024-08-23 17:50:29 +08:00
parent 5169eb66a3
commit d2654660cb
18 changed files with 153 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/genersoft/iot/vmp/gb28181/service/IRegionService.java
View File

@@ -11,18 +11,13 @@ public interface IRegionService {
void add(Region region);
boolean deleteByDeviceId(String regionDeviceId);
boolean deleteByDeviceId(Integer regionDeviceId);
/**
* 查询区划列表
*/
PageInfo<Region> query(String query, int page, int count);
/**
* 查询子区划列表
*/
PageInfo<Region> queryChildRegionList(String regionParentId, int page, int count);
/**
* 更新区域
*/
@@ -32,7 +27,7 @@ public interface IRegionService {
Region queryRegionByDeviceId(String regionDeviceId);
List<RegionTree> queryForTree(String query, String parent);
List<RegionTree> queryForTree(String query, Integer parent);
void syncFromChannel();

16
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
View File

@@ -344,22 +344,6 @@ public class GbChannelServiceImpl implements IGbChannelService {
return channelList;
}
private Set<Region> getAllRegion(Set<Region> regionChannelList ) {
if (regionChannelList.isEmpty()) {
return new HashSet<>();
}
Set<Region> channelList = regionMapper.queryParentInChannelList(regionChannelList);
if (channelList.isEmpty()) {
return channelList;
}
Set<Region> allParentRegion = getAllRegion(channelList);
channelList.addAll(allParentRegion);
return channelList;
}
@Override
public CommonGBChannel getOne(int id) {
return commonGBChannelMapper.queryById(id);

14
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GroupServiceImpl.java
View File

@@ -216,6 +216,7 @@ public class GroupServiceImpl implements IGroupService {
}
@Override
@Transactional
public boolean batchAdd(List<Group> groupList) {
if (groupList== null || groupList.isEmpty()) {
return false;
@@ -225,15 +226,20 @@ public class GroupServiceImpl implements IGroupService {
groupMapForVerification.put(group.getDeviceId(), group);
}
// 查询数据库中已经存在的.
List<Group> regionListInDb = groupManager.queryInGroupListByDeviceId(groupList);
if (!regionListInDb.isEmpty()) {
for (Group group : regionListInDb) {
List<Group> groupListInDb = groupManager.queryInGroupListByDeviceId(groupList);
if (!groupListInDb.isEmpty()) {
for (Group group : groupListInDb) {
groupMapForVerification.remove(group.getDeviceId());
}
}
if (!groupMapForVerification.isEmpty()) {
groupManager.batchAdd(new ArrayList<>(groupMapForVerification.values()));
List<Group> groupListForAdd = new ArrayList<>(groupMapForVerification.values());
groupManager.batchAdd(groupListForAdd);
// 更新分组关系
groupManager.updateParentId(groupListForAdd);
groupManager.updateParentIdWithBusinessGroup(groupListForAdd);
}
return true;
}
}

31
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/RegionServiceImpl.java
View File

@@ -45,7 +45,7 @@ public class RegionServiceImpl implements IRegionService {
public void add(Region region) {
Assert.hasLength(region.getName(), "名称必须存在");
Assert.hasLength(region.getDeviceId(), "国标编号必须存在");
if (ObjectUtils.isEmpty(region.getParentDeviceId().trim())) {
if (ObjectUtils.isEmpty(region.getParentDeviceId()) || ObjectUtils.isEmpty(region.getParentDeviceId().trim())) {
region.setParentDeviceId(null);
}
region.setCreateTime(DateUtil.getNow());
@@ -60,8 +60,8 @@ public class RegionServiceImpl implements IRegionService {
@Override
@Transactional
public boolean deleteByDeviceId(String regionDeviceId) {
Region region = regionMapper.queryOneByDeviceId(regionDeviceId);
public boolean deleteByDeviceId(Integer regionDeviceId) {
Region region = regionMapper.queryOne(regionDeviceId);
// 获取所有子节点
List<Region> allChildren = getAllChildren(regionDeviceId);
allChildren.add(region);
@@ -71,8 +71,8 @@ public class RegionServiceImpl implements IRegionService {
return true;
}
private List<Region> getAllChildren(String deviceId) {
if (deviceId == null || deviceId.length() >= 8) {
private List<Region> getAllChildren(Integer deviceId) {
if (deviceId == null) {
return new ArrayList<>();
}
List<Region> children = regionMapper.getChildren(deviceId);
@@ -82,7 +82,7 @@ public class RegionServiceImpl implements IRegionService {
List<Region> regions = new ArrayList<>(children);
for (Region region : children) {
if (region.getDeviceId().length() < 8) {
regions.addAll(getAllChildren(region.getDeviceId()));
regions.addAll(getAllChildren(region.getId()));
}
}
return regions;
@@ -95,14 +95,6 @@ public class RegionServiceImpl implements IRegionService {
return new PageInfo<>(regionList);
}
@Override
public PageInfo<Region> queryChildRegionList(String regionParentId, int page, int count) {
Assert.hasLength(regionParentId, "上级行政区划编号必须存在");
PageHelper.startPage(page, count);
List<Region> all = regionMapper.getChildren(regionParentId);
return new PageInfo<>(all);
}
@Override
@Transactional
public void update(Region region) {
@@ -122,11 +114,14 @@ public class RegionServiceImpl implements IRegionService {
}
@Override
public List<RegionTree> queryForTree(String query, String parent) {
public List<RegionTree> queryForTree(String query, Integer parent) {
List<RegionTree> regionList = regionMapper.queryForTree(query, parent);
if (parent != null) {
List<RegionTree> channelList = commonGBChannelMapper.queryForRegionTreeByCivilCode(query, parent);
regionList.addAll(channelList);
Region parentRegion = regionMapper.queryOne(parent);
if (parentRegion != null) {
List<RegionTree> channelList = commonGBChannelMapper.queryForRegionTreeByCivilCode(query, parentRegion.getDeviceId());
regionList.addAll(channelList);
}
}
return regionList;
}
@@ -189,7 +184,7 @@ public class RegionServiceImpl implements IRegionService {
regionMapForVerification.put(region.getDeviceId(), region);
}
// 查询数据库中已经存在的.
List<Region> regionListInDb = regionMapper.queryInRegionList(regionList);
List<Region> regionListInDb = regionMapper.queryInRegionListByDeviceId(regionList);
if (!regionListInDb.isEmpty()) {
for (Region region : regionListInDb) {
regionMapForVerification.remove(region.getDeviceId());