From 42deb8f70b03629dbfc03a8d84ef17012fabaedf Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 6 Feb 2024 14:18:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?#=20=E8=A7=86=E9=A2=91=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../station/service/impl/StationVideoTypeServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java index 858bbf7..90c8ff3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java @@ -247,7 +247,7 @@ public class StationVideoTypeServiceImpl extends BaseServiceImpl queryWrapper = Wrappers.lambdaQuery().select(StationVideoTypeEntity::getPointCode,StationVideoTypeEntity::getCreateDept).eq(StationVideoTypeEntity::getDeptId, refDept); List> pointCodeList = this.listMaps(queryWrapper); - List pointCodes = pointCodeList.stream().map(m -> m.get("point_code")).map(String::valueOf).collect(Collectors.toList()); + List pointCodes = pointCodeList.stream().map(m -> (String) m.get("point_code")).collect(Collectors.toList()); List cameras = hikVideoService.cameras(regionCode); cameras.stream().forEach(camera -> { if(pointCodes.contains(camera.getString("cameraIndexCode"))) { @@ -257,10 +257,17 @@ public class StationVideoTypeServiceImpl extends BaseServiceImpl devIndexCodes = cameras.stream().map(obj -> obj.get("encodeDevIndexCode")).map(String::valueOf).distinct().collect(Collectors.toList()); + List devIndexCodes = cameras.stream().map(obj -> obj.getString("encodeDevIndexCode")).distinct().collect(Collectors.toList()); Map deviceMap = new HashMap<>(); devIndexCodes.forEach(devIndexCode -> { - String deviceName = Optional.ofNullable(hikVideoService.getDeviceSingle(devIndexCode)).map(o -> Optional.ofNullable(o.getString("name")).orElse("其他")).orElse(null); + String deviceName; + // 级联的下级平台无设备编码 统计为其他 + if(StringUtil.isBlank(devIndexCode) || Func.isEmpty(devIndexCode)) { + deviceName = "其他"; + } + else { + deviceName = Optional.ofNullable(hikVideoService.getDeviceSingle(devIndexCode)).map(o -> o.getString("name")).orElse("其他"); + } deviceMap.put(devIndexCode,deviceName); }); return cameras.stream().collect(Collectors.groupingBy(c -> deviceMap.get(c.getString("encodeDevIndexCode")))); From b80b565de47fc4a12b6ab74b122a8b6f1798f4ab Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 6 Feb 2024 14:50:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?#=20=E8=A7=86=E9=A2=91=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operational/station/service/impl/StationVideoTypeServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java index 90c8ff3..ca4272b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java @@ -252,6 +252,7 @@ public class StationVideoTypeServiceImpl extends BaseServiceImpl { if(pointCodes.contains(camera.getString("cameraIndexCode"))) { camera.put("disabled",true); + camera.put("cameraName",Optional.ofNullable(camera.getString("cameraName")).orElse("")+"(已接入)"); } else { camera.put("disabled",false); From 46124d8b773e340fc20124304fcd04b4c3c145b6 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 6 Feb 2024 14:51:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?#=20=E5=B9=B3=E5=8F=B0jar=E5=8C=85api?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 911dbde..a7e275d 100644 --- a/pom.xml +++ b/pom.xml @@ -14,10 +14,10 @@ pom - 5.0.1.RELEASE - 5.0.3-SNAPSHOT - - 5.1.0.RELEASE + 5.1.1.RELEASE + + + UTF-8 1.8 @@ -63,7 +63,7 @@ org.springblade blade-flow-api - ${bladex.flow.version} + ${bladex.project.version} org.springblade @@ -73,7 +73,7 @@ com.hnac.hzinfo.data hzinfo-data-sdk - ${hzinfo.data.sdk.version} + ${bladex.project.version} com.xuxueli