修改 3dURL

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 事件定单表(CareEventOrder)表服务实现类
@@ -508,7 +509,8 @@ public class BmsEventOrderService {
     public String getRealTimeMonitorUrl(Long orderId){
         CareEventOrder order =   this.careEventOrderService.getById(orderId);
         if (order!=null){
-            return this.careDeviceService.get3dUrl(order.getDevId());
+            Map<String,String> map =  this.careDeviceService.get3dUrl(order.getDevId());
+            return  map.get("toBms");
         }
         return null;
     }

src/main/java/com/care/client/service/PinanbaoService.java

@@ -25,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: lilt
@@ -225,7 +226,8 @@ public class PinanbaoService {
      * @return
      */
     public String getRealTimeMonitorUrl(Long devId){
-        return this.careDeviceService.get3dUrl(devId);
+        Map<String,String> map =  this.careDeviceService.get3dUrl(devId);
+        return  map.get("toWX");
     }
 
     /**

src/main/java/com/care/common/service/CareDeviceService.java

@@ -8,6 +8,7 @@ import com.care.common.vo.UserLogindConvertVO;
 import com.care.common.vo.device.DeviceVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 被监护人-设备(CareDevice)表服务接口
@@ -26,5 +27,5 @@ public interface CareDeviceService extends IService<CareDevice> {
 
     IPage<DeviceVO> queryList(PageReqVO pageReqVo, Long stationId, String status, String houseAddr, String devCode, UserLogindConvertVO loginUser);
 
-    String  get3dUrl(Long deviceId);
+    Map<String,String> get3dUrl(Long deviceId);
 }

src/main/java/com/care/common/service/impl/CareDeviceServiceImpl.java

@@ -15,12 +15,14 @@ import com.care.common.vo.PageReqVO;
 import com.care.common.vo.UserLogindConvertVO;
 import com.care.common.vo.device.DeviceVO;
 import com.care.common.vo.order.ChambEventOrderVO;
+import com.google.common.collect.Maps;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.UnsupportedEncodingException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 被监护人-设备(CareDevice)表服务实现类
@@ -30,8 +32,26 @@ import java.util.List;
  */
 @Service
 public class CareDeviceServiceImpl extends ServiceImpl<CareDeviceMapper, CareDevice> implements CareDeviceService {
-    @Value("${device.3d.url:#{null}}")
-    private String url3D;
+    @Value("${device.3d.url.host:#{null}}")
+    private String url3DUrlHost;
+    @Value("${device.3d.url.path:#{null}}")
+    private String url3DUrlPath;
+    @Override
+    public Map<String,String> get3dUrl(Long deviceId) {
+        Map<String,String> map = Maps.newHashMap();
+        CareDevice device = this.baseMapper.selectById(deviceId);
+        if (device!=null && StrUtil.isNotEmpty(device.getTopic())){
+            try {
+                String topic = java.net.URLEncoder.encode(device.getTopic(),"UTF-8");
+                String toWx =   url3DUrlHost + url3DUrlPath + topic;
+                map.put("toWX",toWx);
+                map.put("toBms", url3DUrlPath + topic);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        }
+        return map;
+    }
     /**
      * 查询房屋的设备列表
      *
@@ -55,18 +75,7 @@ public class CareDeviceServiceImpl extends ServiceImpl<CareDeviceMapper, CareDev
         return pageRes;
     }
 
-    @Override
-    public String get3dUrl(Long deviceId) {
-        CareDevice device = this.baseMapper.selectById(deviceId);
-        if (device!=null && StrUtil.isNotEmpty(device.getTopic())){
-            try {
-                return  url3D + java.net.URLEncoder.encode(device.getTopic(),"UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
+
 
     public static void main(String[] args) throws UnsupportedEncodingException {
         System.out.println(java.net.URLEncoder.encode("5JPD/monitor/f1/event","UTF-8"));

src/main/resources/application.properties

@@ -76,4 +76,5 @@ sms.notice.templateId=986791
 sms.notice.templateid.jiuzhi=1014148
 sms.notice.templateid.diedao=1014144
 
-device.3d.url=https://www.ventropic.com/rt/dist/#/?topic=
+device.3d.url.host=https://www.ventropic.com
+device.3d.url.path=/rt/dist/#/?topic=