2022-09-2 预案和逃生疏散调用喇叭接口补充ip属性。

zd-api/zd-api-system/src/main/java/com/zd/system/api/domain/PlayVo.java

@@ -1,16 +1,34 @@
 package com.zd.system.api.domain;
 
 import com.zd.common.core.utils.StringUtils;
+import io.swagger.annotations.ApiModelProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Optional;
 
+/**
+ * @author 董高升
+ * @descript 播放vo
+ */
 public class PlayVo {
+
+    private static Logger logger = LoggerFactory.getLogger(PlayVo.class);
+
+    @ApiModelProperty(required = true, notes = "设备编号")
     private String sn;
+    @ApiModelProperty(required = false, notes = "方便对接时传递任务类型")
     private String type;
+    @ApiModelProperty(required = false, notes = "任务名称")
     private String name;
+    @ApiModelProperty(required = true, notes = "播放速度")
     private Integer speed;
+    @ApiModelProperty(required = false, notes = "播放参数")
     private ParamVo params;
+    @ApiModelProperty(required = true, notes = "远程端口")
     private int port;
+    @ApiModelProperty(required = true, notes = "设备Ip")
+    private String deviceIp;
 
     public String getSn() {
         return sn;
@@ -45,9 +63,6 @@ public class PlayVo {
     }
 
     public ParamVo getParams() {
-        if (params==null){
-            params=new ParamVo();
-        }
         return params;
     }
 
@@ -81,4 +96,11 @@ public class PlayVo {
         this.speed = Optional.ofNullable(speed).orElse(50);
     }
 
+    public String getDeviceIp() {
+        return deviceIp;
+    }
+
+    public void setDeviceIp(String deviceIp) {
+        this.deviceIp = deviceIp;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabExitLineServiceImpl.java

@@ -496,6 +496,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
                             if(com.zd.common.core.utils.StringUtils.isNotNull(map.get("deviceSn")) && com.zd.common.core.utils.StringUtils.isNotNull(map.get("port"))){
                                 PlayVo playVo = new PlayVo();
                                 playVo.setSn(map.get("deviceSn")+"");
+                                playVo.setDeviceIp(map.get("deviceIp")+"");
                                 playVo.setPort(Integer.parseInt(map.get("port")+""));
                                 ParamVo paramVo=new ParamVo();
                                 playVo.setParams(paramVo);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -1144,6 +1144,7 @@ public class LabRiskPlanServiceImpl implements ILabRiskPlanService {
                                 if(StringUtils.isNotNull(map.get("deviceSn")) && StringUtils.isNotNull(map.get("port"))){
                                     PlayVo playVo = new PlayVo();
                                     playVo.setSn(map.get("deviceSn")+"");
+                                    playVo.setDeviceIp(map.get("deviceIp")+"");
                                     playVo.setPort(Integer.parseInt(map.get("port")+""));
                                     ParamVo paramVo=new ParamVo();
                                     playVo.setParams(paramVo);