3d url访问增加2个参数

src/main/java/com/care/common/entity/CareOrganization.java

@@ -79,5 +79,8 @@ public class CareOrganization implements Serializable {
     @TableField("MODIFY_TIME")
     private Date modifyTime;
 
-
+    @TableField("company_key")
+    private  String companyKey;
+    @TableField("company_id")
+    private String companyId;
 }

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

@@ -7,20 +7,24 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareDevice;
+import com.care.common.entity.CareOrganization;
 import com.care.common.enums.ChambOrderStatusEnum;
 import com.care.common.enums.DeviceActiveStatusEnum;
 import com.care.common.enums.DeviceStatusEnum;
 import com.care.common.mapper.CareDeviceMapper;
 import com.care.common.service.CareDeviceService;
+import com.care.common.service.CareOrganizationService;
 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.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.Map;
@@ -37,13 +41,19 @@ public class CareDeviceServiceImpl extends ServiceImpl<CareDeviceMapper, CareDev
     private String url3DUrlHost;
     @Value("${device.3d.url.path:#{null}}")
     private String url3DUrlPath;
+
+    @Resource
+    private CareOrganizationService careOrganizationService;
+
     @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())){
+        if (device!=null && StrUtil.isNotEmpty(device.getDevCode())){
+            CareOrganization org = this.careOrganizationService.getById(device.getOrgId());
             try {
                 String topic = java.net.URLEncoder.encode(device.getDevCode(),"UTF-8");
+                topic +="&companyKey="+org.getCompanyKey()+"&companyId="+org.getCompanyId();
                 String toWx =   url3DUrlHost + url3DUrlPath + topic;
                 map.put("toWX",toWx);
                 map.put("toBms", url3DUrlPath + topic);