增加车辆附加信息

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

@@ -1737,17 +1737,43 @@ public class CommandController extends BaseController {
     public ResponseModel<Object> addESCar( @RequestBody ESCar esCar) {
 
         try {
-            Date date=  new Date();
-            esCar.setTime(date.getTime());
+            Date date1=  new Date();
+            esCar.setTime(date1.getTime());
             esCarService.saveESCar(esCar);
             //给App端发送
             // TODO
 
             //给WEB端发送  前端传递的为高德经纬度 需转换为WGS84
             Gps gps = PositionUtil.gcj02_To_Gps84(Double.valueOf(esCar.getLatitude()), Double.valueOf(esCar.getLongitude()));
-            esCar.setLatitude(String.valueOf(gps.getWgLat()));
-            esCar.setLongitude(String.valueOf(gps.getWgLon()));
-            emqKeeper.getMqttClient().publish(topic, esCar.toString().getBytes(), RuleConfig.DEFAULT_QOS, false);
+//            esCar.setLatitude(String.valueOf(gps.getWgLat()));
+//            esCar.setLongitude(String.valueOf(gps.getWgLon()));
+
+            ResponseModel<List<Map<String, Object>>> date = equipFeignClient.getTeamCarList(esCar.getSequenceNbr().toString(),null,null);
+            List<Map<String, Object>> result = date.getResult();
+            QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode());
+            List<PowerTransferCompanyResources> alertFormValue = powerTransferCompanyResourcesMapper.selectList(queryWrapper);
+            if(result!=null){
+                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);
+                        }
+                    });
+
+                    e.put("latitude", String.valueOf(gps.getWgLat()));
+                    e.put("longitude", String.valueOf(gps.getWgLon()));
+                });
+
+                emqKeeper.getMqttClient().publish(topic, result.toString().getBytes(), RuleConfig.DEFAULT_QOS, false);
+            }
 
 
         } catch (Exception e) {