增加参数

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RequestData.java

@@ -19,6 +19,8 @@ public class RequestData {
     @ApiModelProperty(value = "纬度")
     private Double latitude;
 
+    @ApiModelProperty(value = "车辆id")
+    private String carId;
 
     //视频匹配规则方便查询 增加第二个经纬度 用来传递 优先级2的坐标
     @ApiModelProperty(value = "经度2")

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

@@ -174,7 +174,7 @@ public interface EquipFeignClient {
      * 车辆信息
      **/
     @RequestMapping(value = "/car/getTeamCarList", method = RequestMethod.GET)
-    ResponseModel<List<Map<String, Object>>> getTeamCarList(@RequestParam("longitude") Double longitude, @RequestParam("latitude") Double latitude);
+    ResponseModel<List<Map<String, Object>>> getTeamCarList(@RequestParam("sequenceNbr") String sequenceNbr,@RequestParam("longitude") Double longitude, @RequestParam("latitude") Double latitude);
     
     
     /**

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

@@ -1199,7 +1199,7 @@ public class CommandController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "车辆资源", notes = "车辆资源")
     public ResponseModel<Object> getTeamCarList(RequestData par) {
         /*bug 2583 地图屏，消防车辆类型时，左侧车辆状态显示错误 陈召 开始 */
-        ResponseModel<List<Map<String, Object>>> date = equipFeignClient.getTeamCarList(par.getLongitude(), par.getLatitude());
+        ResponseModel<List<Map<String, Object>>> date = equipFeignClient.getTeamCarList(par.getCarId(),par.getLongitude(), par.getLatitude());
         List<Map<String, Object>> result = date.getResult();
         QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode());

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -1242,8 +1242,9 @@ public class CarController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "获取消防队伍的消防车辆", notes = "获取消防队伍的消防车辆")
     public ResponseModel getTeamCarList(@RequestParam(required = false) Long id,
+                                        @RequestParam(required = false) String sequenceNbr,
                                         @RequestParam(required = false) Double longitude, @RequestParam(required = false) Double latitude) {
-        return CommonResponseUtil.success(iCarService.getTeamCarList(id, longitude, latitude));
+        return CommonResponseUtil.success(iCarService.getTeamCarList(sequenceNbr,id, longitude, latitude));
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/CarMapper.java

@@ -52,7 +52,7 @@ public interface CarMapper extends BaseMapper<Car> {
 
     List<Map<String, Object>> getCarNumGroupByTeamId();
 
-    List<CarDto> getTeamCarList(Long id, String carState);
+    List<CarDto> getTeamCarList(String sequenceNbr ,Long id, String carState);
 
     List<CarPropertyVo> getCarPropertyList(List<Long> idList, Long teamId, String nameKeys, Integer isIot);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ICarService.java

@@ -147,7 +147,7 @@ public interface ICarService extends IService<Car> {
      */
     Boolean updateCarStatus(List<CarStatusInfoDto> cars);
 
-    List<CarDto> getTeamCarList(Long id, Double longitude, Double latitude);
+    List<CarDto> getTeamCarList(String sequenceNbr ,Long id, Double longitude, Double latitude);
 
     /**
      * 获取车辆属性集合值（参数均为非必填）

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java

@@ -1463,8 +1463,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
     }
 
     @Override
-    public List<CarDto> getTeamCarList(Long id, Double longitude, Double latitude) {
-        List<CarDto> list = carMapper.getTeamCarList(id, carState);
+    public List<CarDto> getTeamCarList(String sequenceNbr ,Long id, Double longitude, Double latitude) {
+        List<CarDto> list = carMapper.getTeamCarList(sequenceNbr,id, carState);
         if (!CollectionUtils.isEmpty(list)) {
             if (longitude != null && latitude != null) {
                 List<Long> idList = list.stream().map(CarDto::getSequenceNbr).collect(Collectors.toList());

amos-boot-system-equip/src/main/resources/mapper/CarMapper.xml

@@ -372,6 +372,9 @@
                 <if test="carState != null and carState != ''">
                     AND d.type = #{carState}
                 </if>
+                <if test="sequenceNbr != null and sequenceNbr != ''">
+                    AND c.id = #{sequenceNbr}
+                </if>
         </where>
     </select>
     <select id="getCarPropertyList" resultType="com.yeejoin.equipmanage.common.entity.vo.CarPropertyVo">