修改bug

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.command.biz.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +18,7 @@ import com.yeejoin.amos.boot.module.command.api.dto.CarTaskDto;
 import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
 import com.yeejoin.amos.boot.module.command.biz.service.impl.RemoteSecurityService;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
 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;
@@ -39,10 +41,14 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
+import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferCompanyResourcesMapper;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
 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.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -50,7 +56,9 @@ import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.DateUtil;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -65,6 +73,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * *指挥资源Api
@@ -120,18 +129,24 @@ public class CommandController extends BaseController {
  	private String readUrl;
  	 @Autowired
      EquipFeignClient equipFeignClient;
-
+    @Autowired
+    PowerTransferMapper powerTransferMapper;
     @Autowired
     VideoFeignClient videoFeignClient;
     @Autowired
     IKeySiteService keySiteService;
     @Autowired
+    EquipFeignClient equipFeignService;
+    @Autowired
     IPowerTransferCompanyService powerTransferCompanyService;
 
     @Autowired
     IPowerTransferCompanyResourcesService powerTransferCompanyResourcesService;
 
     @Autowired
+    PowerTransferCompanyResourcesMapper powerTransferCompanyResourcesMapper;
+
+    @Autowired
     ISourceFileService sourceFileService;
 
     @Value("${video.url}")
@@ -1031,9 +1046,28 @@ public class CommandController extends BaseController {
     @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "fireCar/list")
     @ApiOperation(httpMethod = "GET", value = "车辆资源", notes = "车辆资源")
-    public ResponseModel<List<Map<String,Object>>> getTeamCarList(RequestData par) {
-    	ResponseModel<List<Map<String, Object>>> date= equipFeignClient.getTeamCarList(par.getLongitude(),par.getLatitude());
+    public ResponseModel<Object> getTeamCarList(RequestData par) {
+/*bug 2583 地图屏，消防车辆类型时，左侧车辆状态显示错误 陈召 开始 */
+      ResponseModel<List<Map<String, Object>>> date= equipFeignClient.getTeamCarList(par.getLongitude(),par.getLatitude());
+        List<Map<String, Object>> result = date.getResult();
+        QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode() );
+        List<PowerTransferCompanyResources> alertFormValue = powerTransferCompanyResourcesMapper.selectList(queryWrapper);
+        result.stream().forEach(e->{
+            if (e.get("carState").equals("在位")){
+                e.put("carState",FireCarStatusEnum.执勤.getName());
+            }
+            String sequenceNbr = e.get("sequenceNbr").toString();
+            //同步力量调派车辆任务状态
+            alertFormValue.stream().forEach(v->{
+                if (v.getResourcesId().equals(sequenceNbr)) {
+                    String carStatus = v.getCarStatus();
+                    e.put("carState",carStatus!=null?FireCarStatusEnum.getEnum(carStatus).getName():null);
+                }
+            });
+        });
         return ResponseHelper.buildResponse(date!=null?date.getResult():null);
+        /*bug 2583 地图屏，消防车辆类型时，左侧车辆状态显示错误 2021-10-26 陈召 结束 */
     }
 
     @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)