소스 검색

修复行政区瞭望塔null的问题

limeng 2 달 전
부모
커밋
9d9d773fa4

+ 2 - 1
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/dahua/BayonetInfoVO.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.event.centereventteventcatalogue.domain.dahua;
 
+import com.ruoyi.common.core.utils.StringUtils;
 import com.sooka.sponest.monitor.api.domain.CenterdataTCamera;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -57,7 +58,7 @@ public class BayonetInfoVO {
     public String toString(CenterdataTCamera centerdataTCamera) {
         String toString = new ToStringBuilder(this, ToStringStyle.NO_CLASS_NAME_STYLE)
 //                .append("行政区:", centerdataTCamera.getCameraName())
-                .append("瞭望塔:", getChannelName())
+                .append("瞭望塔:", StringUtils.isEmpty(getChannelName())?"无":getChannelName())
 //                .append("方向:", getDirection())
 //                .append("距离:", getDistance())
 //                .append("高程:", getHeight())

+ 3 - 2
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/dahua/DaHuaOtherEventVO.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.event.centereventteventcatalogue.domain.dahua;
 
+import com.ruoyi.common.core.utils.StringUtils;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -44,8 +45,8 @@ public class DaHuaOtherEventVO {
     @Override
     public String toString() {
         String toString = new ToStringBuilder(this, ToStringStyle.NO_CLASS_NAME_STYLE)
-                .append("行政区:", getDistrictName())
-                .append("瞭望塔:", getAddress())
+                .append("行政区:", StringUtils.isEmpty(getDistrictName())?"无":getDistrictName())
+                .append("瞭望塔:", StringUtils.isEmpty(getAddress())?"无":getAddress())
 //                .append("方向:", getDirection())
 //                .append("距离:", getDistance())
 //                .append("高程:", getHeight())