增加确定接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

 package com.yeejoin.amos.boot.module.common.api.feign;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.EquipmentIndexDto;
 import com.yeejoin.amos.boot.module.common.api.dto.PerfQuotaIotDTO;
 import com.yeejoin.amos.boot.module.common.api.dto.VideoDto;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 装备服务feign
@@ -211,7 +206,7 @@ public interface EquipFeignClient {
 
 
     @RequestMapping(value = "/confirmAlarm/getDetailsById", method = RequestMethod.GET)
-    public Map<String, Object> getDetailsById(@RequestParam Long alamId, @RequestParam(required = false) Long equipId, @RequestParam(required = false) String type, @RequestParam String area) ;
+    public ResponseModel<Map<String, Object>>  getDetailsById(@RequestParam Long alamId, @RequestParam(required = false) Long equipId, @RequestParam(required = false) String type, @RequestParam String area) ;
 
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -23,18 +23,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.VideoFeignClient;
-import com.yeejoin.amos.boot.module.common.api.service.IDutyCarService;
-import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonService;
-import com.yeejoin.amos.boot.module.common.api.service.IFireChemicalService;
-import com.yeejoin.amos.boot.module.common.api.service.IFireExpertsService;
-import com.yeejoin.amos.boot.module.common.api.service.IFireStationService;
-import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService;
-import com.yeejoin.amos.boot.module.common.api.service.IFirefightersService;
-import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
-import com.yeejoin.amos.boot.module.common.api.service.ILinkageUnitService;
-import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
-import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
-import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService;
+import com.yeejoin.amos.boot.module.common.api.service.*;
 import com.yeejoin.amos.boot.module.jcs.api.dto.*;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
@@ -48,7 +37,6 @@ import com.yeejoin.amos.boot.module.jcs.api.service.*;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -67,13 +55,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.lang.reflect.Method;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * *指挥资源Api
@@ -369,10 +351,9 @@ public class CommandController extends BaseController {
     @GetMapping(value = "confirmAlarm/getDetailsById")
     @ApiOperation(value = "根据id，type查询确警页面相关数据")
     public ResponseModel<Map<String, Object>> getDetailsById(@RequestParam Long alamId, @RequestParam Long equipId, @RequestParam String type, @RequestParam String area) {
-
-        Map<String, Object> data = equipFeignClient.getDetailsById( alamId,  equipId,   type,   area);
+        ResponseModel<Map<String, Object>> response = equipFeignClient.getDetailsById( alamId,  equipId,   type,   area);
+        Map<String, Object> data = response.getResult();
         List<Map<String, Object>> records = data != null ? (List<Map<String, Object>>)data.get("video") : null;
-
         if (records != null && records.size() > 0) {
             for (Map<String, Object> record : records) {
                 ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(record.get("code") + "");