任务 4457

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

@@ -320,6 +320,11 @@ public interface EquipFeignClient {
     @RequestMapping(value = "/car/{id}", method = RequestMethod.GET)
     ResponseModel<Map<String, Object>> selectOneById( @PathVariable Long id);
 
+
+    @RequestMapping(value = "/car/getCarDetailByCarNum/{carNum}", method = RequestMethod.GET)
+    ResponseModel<Map<String, Object>> getCarDetailByCarNum( @PathVariable String carNum);
+
+
     @RequestMapping(value = "/car/all/fusion", method = RequestMethod.GET)
     ResponseModel<List> getCarFusionList();
 }

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

@@ -1391,7 +1391,7 @@ public class CommandController extends BaseController {
     public ResponseModel<Object> getPowerTransferCompanyResourcesNewService(@RequestParam String id
                                                                          ) {
 
-        PowerTransferCompanyResources powerTransferCompanyResources;
+        PowerTransferCompanyResources powerTransferCompanyResources = new PowerTransferCompanyResources();
         // 根据车牌查询车辆调派信息级警情id
 
         List<PowerData> pw = powerTransferMapper.getPowerDataCar(id);
@@ -1420,12 +1420,21 @@ public class CommandController extends BaseController {
                 powerTransferCompanyResources.setTaskInformation(powerData.getTaskInformation());
             }
         } else {
-            LambdaQueryWrapper<PowerTransferCompanyResources> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(PowerTransferCompanyResources::getResourcesNum,id);
-            powerTransferCompanyResources = powerTransferCompanyResourcesMapper.selectOne(queryWrapper);
-            if(!ValidationUtil.isEmpty(powerTransferCompanyResources)) {
+            ResponseModel<Map<String, Object>> equipmentIndexDto = equipFeignClient.getCarDetailByCarNum(id);
+            if(equipmentIndexDto.getResult().size() == 0) {
+                return ResponseHelper.buildResponse(null);
+            }
+
+//            LambdaQueryWrapper<PowerTransferCompanyResources> queryWrapper = new LambdaQueryWrapper<>();
+//            queryWrapper.eq(PowerTransferCompanyResources::getResourcesNum,id);
+//            powerTransferCompanyResources = powerTransferCompanyResourcesMapper.selectOne(queryWrapper);
+            if(!ValidationUtil.isEmpty(equipmentIndexDto.getResult())) {
+                Map<String,Object> map = equipmentIndexDto.getResult();
                 // 随车人员
-                List<PowerData> powerDataOne = powerTransferMapper.getPowerDataOne(Long.valueOf(powerTransferCompanyResources.getResourcesId()));
+                List<PowerData> powerDataOne = powerTransferMapper.getPowerDataOne(Long.valueOf(map.get("id").toString()));
+                powerTransferCompanyResources.setResourcesName(map.get("name").toString());
+                powerTransferCompanyResources.setResourcesNum(map.get("carNum").toString());
+
                 if(!ValidationUtil.isEmpty(powerDataOne)) {
                     String str = "";
                     String newStr = "";
@@ -1437,7 +1446,7 @@ public class CommandController extends BaseController {
                     powerTransferCompanyResources.setPw("无");
                 }
                 powerTransferCompanyResources.setStatusName("无任务");
-                powerTransferCompanyResources.setCarStatusName(FireCarStatusEnum.getEnum(powerTransferCompanyResources.getCarStatus()).getName());
+                powerTransferCompanyResources.setCarStatusName(FireCarStatusEnum.getEnum(map.get("carState").toString()).getName());
                 powerTransferCompanyResources.setTaskInformation("无");
             }
         }