Explorar el Código

发起带看提示语

lyhzzz hace 1 año
padre
commit
2da015b2be

+ 2 - 1
src/main/java/com/fdkankan/fusion/httpClient/FdService.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.util.DateUtils;
 import com.fdkankan.fusion.common.util.RedisKeyUtil;
 import com.fdkankan.fusion.entity.TmCamera;
@@ -90,7 +91,7 @@ public class FdService {
         return fdKKClient.getFdTokenByNum(num,getFdToken());
     }
 
-    public FdkkResponse<FdRoomAddParam> fdCreateTakeLookRoom(String caseTitle,List<String> numList,String roomId) {
+    public ResultData<FdRoomAddParam> fdCreateTakeLookRoom(String caseTitle, List<String> numList, String roomId) {
         FdRoomAddParam param = new FdRoomAddParam();
         param.setRoomTitle(caseTitle);
         param.setNumList(numList);

+ 2 - 1
src/main/java/com/fdkankan/fusion/httpClient/client/TakeLookClient.java

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.httpClient.client;
 
 import com.dtflys.forest.annotation.*;
+import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.httpClient.address.FdkkAddressSource;
 import com.fdkankan.fusion.httpClient.address.FdkkTakeLookAddressSource;
 import com.fdkankan.fusion.httpClient.request.FdRoomAddParam;
@@ -13,7 +14,7 @@ public interface TakeLookClient {
      * 获取相机详情
      */
     @Post("/takelook/roomAddOrUpdate")
-    FdkkResponse<FdRoomAddParam> roomAddOrUpdate(@JSONBody FdRoomAddParam param, @Header("token")  String token);
+    ResultData<FdRoomAddParam> roomAddOrUpdate(@JSONBody FdRoomAddParam param, @Header("token")  String token);
 
     @Get("/takelook/openTheRoom")
     void openRoom(@Query("roomId") String takeRoomId, @Header("token") String fdToken);

+ 3 - 2
src/main/java/com/fdkankan/fusion/service/impl/CaseLiveServiceImpl.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.entity.CaseEntity;
 import com.fdkankan.fusion.entity.CaseLive;
 import com.fdkankan.fusion.entity.CaseNumEntity;
@@ -70,9 +71,9 @@ public class CaseLiveServiceImpl extends ServiceImpl<ICaseLiveMapper, CaseLive>
         }
         Boolean flag = this.getCheckCreateRoom(caseLive.getNumList(),numList);
         if(!flag){
-            FdkkResponse<FdRoomAddParam> fdkkResponse = fdService.fdCreateTakeLookRoom(caseEntity.getCaseTitle(),numList,caseLive.getTakeRoomId());
+            ResultData<FdRoomAddParam> fdkkResponse = fdService.fdCreateTakeLookRoom(caseEntity.getCaseTitle(),numList,caseLive.getTakeRoomId());
             if(fdkkResponse.getCode() != 0){
-                throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
+                throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMessage());
             }
             caseLive.setTakeRoomId(fdkkResponse.getData().getRoomId());
             List<String> numList1 = fdkkResponse.getData().getNumList();