修改 3D URL bug

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

@@ -44,4 +44,6 @@ public interface CareEventOrderChambService extends IService<CareEventOrderChamb
      */
 
     ChambEventOrderCountVO getOrderCountByChambId(Long chambId);
+
+    CareEventOrderChamb getChambOrderByOrderId(Long orderId);
 }

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

@@ -42,7 +42,7 @@ public class CareDeviceServiceImpl extends ServiceImpl<CareDeviceMapper, CareDev
         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 topic = java.net.URLEncoder.encode(device.getDevCode(),"UTF-8");
                 String toWx =   url3DUrlHost + url3DUrlPath + topic;
                 map.put("toWX",toWx);
                 map.put("toBms", url3DUrlPath + topic);

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

@@ -1,6 +1,7 @@
 package com.care.common.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,7 +26,7 @@ public class CareEventOrderChambServiceImpl extends ServiceImpl<CareEventOrderCh
     /**
      * 待处理的工单
      *
-     * @param page
+     * @param pageReqVo
      * @param chambId
      * @return
      */
@@ -44,7 +45,7 @@ public class CareEventOrderChambServiceImpl extends ServiceImpl<CareEventOrderCh
     /**
      * 进行中的工单
      *
-     * @param page
+     * @param pageReqVo
      * @param chambId
      * @return
      */
@@ -63,7 +64,7 @@ public class CareEventOrderChambServiceImpl extends ServiceImpl<CareEventOrderCh
     /**
      * 完成的工单
      *
-     * @param page
+     * @param pageReqVo
      * @param chambId
      * @return
      */
@@ -88,4 +89,13 @@ public class CareEventOrderChambServiceImpl extends ServiceImpl<CareEventOrderCh
     public ChambEventOrderCountVO getOrderCountByChambId(Long chambId){
         return  this.baseMapper.getOrderCountByChambId(chambId);
     }
+
+    @Override
+    public CareEventOrderChamb getChambOrderByOrderId(Long orderId) {
+        QueryWrapper<CareEventOrderChamb> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareEventOrderChamb::getOrderId,orderId);
+        CareEventOrderChamb order = this.getOne(queryWrapper);
+        return order;
+    }
+
 }

src/main/java/com/care/keeper/service/KeeperApiService.java

@@ -107,7 +107,7 @@ public class KeeperApiService {
     }
 
     public ChambEventOrderVO getChambOrder(Long id){
-        CareEventOrderChamb orderChamb = this.careEventOrderChambService.getById(id);
+        CareEventOrderChamb orderChamb = this.careEventOrderChambService.getChambOrderByOrderId(id);
         ChambEventOrderVO  chambEventOrderVO = new ChambEventOrderVO();
         BeanUtil.copyProperties(orderChamb,chambEventOrderVO);
         return chambEventOrderVO;
@@ -248,10 +248,10 @@ public class KeeperApiService {
     @Transactional(rollbackFor = Exception.class)
     public boolean daoDaConfirm(Long orderChambId){
         boolean flag = false;
-        CareEventOrderChamb orderChamb = this.careEventOrderChambService.getById(orderChambId);
+        CareEventOrderChamb orderChamb = this.careEventOrderChambService.getChambOrderByOrderId(orderChambId);
         Date date = DateUtil.date();
         UpdateWrapper<CareEventOrderChamb> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().eq(CareEventOrderChamb::getId,orderChambId)
+        updateWrapper.lambda().eq(CareEventOrderChamb::getId,orderChamb.getId())
                 .set(CareEventOrderChamb::getStatus,ChambOrderStatusEnum.DOING.getValue())
                 .set(CareEventOrderChamb::getDaodaTime,date)
                 .set(CareEventOrderChamb::getModifyTime,date);
@@ -283,10 +283,10 @@ public class KeeperApiService {
     @Transactional(rollbackFor = Exception.class)
     public boolean liKaiConfirm(Long orderChambId,String remark,String scenePic){
         boolean flag = false;
-        CareEventOrderChamb orderChamb = this.careEventOrderChambService.getById(orderChambId);
+        CareEventOrderChamb orderChamb = this.careEventOrderChambService.getChambOrderByOrderId(orderChambId);
         Date date = DateUtil.date();
         UpdateWrapper<CareEventOrderChamb> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().eq(CareEventOrderChamb::getId,orderChambId)
+        updateWrapper.lambda().eq(CareEventOrderChamb::getId,orderChamb.getId())
                 .set(CareEventOrderChamb::getRemark,remark)
                 .set(CareEventOrderChamb::getScenePic,scenePic)
                 .set(CareEventOrderChamb::getLikaiTime,date)

src/main/resources/application.properties

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