报警信息传输云端

business-service/src/main/java/com/ozs/service/entity/vo/ReqMsgAlarmVo.java

@@ -44,4 +44,7 @@ public class ReqMsgAlarmVo implements Serializable {
 
     /** 报警图片地址 */
     private String[] imageUrls;
+
+    /** 报警行别 */
+    private String lineDirStr;
 }

business-service/src/main/java/com/ozs/service/utils/PublishClient.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.filter.Filter;
 import com.alibaba.fastjson2.filter.SimplePropertyPreFilter;
+import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.sign.Md5Utils;
 import com.ozs.common.utils.stateSecrets.SM4Utils;
 import com.ozs.common.utils.uuid.IdUtils;
@@ -21,6 +22,7 @@ import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 
 import javax.annotation.PostConstruct;
 import java.util.ArrayList;
@@ -172,6 +174,12 @@ public class PublishClient {
         log.info("alarmPush---start");
 
             try {
+                if (StringUtils.isEmpty(reqMsgAlarmVo.getAlarmMile())){
+                    reqMsgAlarmVo.setAlarmMile("");
+                }
+                if (ObjectUtils.isEmpty(reqMsgAlarmVo.getLineDir())){
+                    reqMsgAlarmVo.setLineDirStr("");
+                }
                 String s = JSON.toJSONString(reqMsgAlarmVo);
                 MqttMessage message = new MqttMessage();
                 /**