修改车辆初始化状态

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DutyPersonShiftMapper.java

@@ -164,5 +164,7 @@ public interface DutyPersonShiftMapper extends BaseMapper<DutyPersonShift> {
          */
     List<DutyPersonShiftDto> queryDutyByPersonAndData(Long instanceId, Date minDate, Date maxDate);
 
+    List<Map<String, String>>  getDutyCar();
+
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDutyCarService.java

@@ -36,4 +36,7 @@ public interface IDutyCarService extends IDutyCommonService {
     List<Map<String, Object>> getDutyCaruser(Long carId);
 
     List<Map<String, Object>> theCarDutyPerson(Long carId);
+
+    //查询今日值班车辆
+    List<Map<String, String>>getDutyCar();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DutyPersonShiftMapper.xml

@@ -575,4 +575,15 @@
         AND
               instance_id = #{instanceId}
     </select>
+
+
+    <select id='getDutyCar'  resultType="map">
+       select
+        cb_dynamic_form_instance.field_value as carId
+        from  cb_duty_person_shift  LEFT JOIN cb_dynamic_form_instance
+        on cb_duty_person_shift.instance_id =cb_dynamic_form_instance.instance_id
+        where cb_dynamic_form_instance.group_code='dutyCar' and cb_dynamic_form_instance.field_code='carId'
+        and to_days(cb_duty_person_shift.duty_date) = to_days(now())
+
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/FireCarStatusEnum.java

@@ -14,6 +14,7 @@ import java.util.Map;
 @Getter
 @AllArgsConstructor
 public enum FireCarStatusEnum {
+    备勤("BW","0", "备勤"),
     执勤("ZW","1", "执勤"),
     出动("ZQ","2", "出动"),
     途中("TZ","3", "途中"),

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

@@ -1344,11 +1344,18 @@ public class CommandController extends BaseController {
         QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode());
         List<PowerTransferCompanyResources> alertFormValue = powerTransferCompanyResourcesMapper.selectList(queryWrapper);
+        //今日值班车辆
+        List<Map<String, String>> ListCar= iDutyCarService.getDutyCar();
+        Map<String, String> mapcar= ListCar!=null? ListCar.stream().collect(Collectors.toMap(ma->ma.get("carId"),ma->ma.get("carId"))):null;
         result.stream().forEach(e -> {
             if (e.get("carState").equals("在位")) {
+                // 新加需求，今日没有值班的车辆显示状态：备战 ，有排班的显示：执勤
+                 if(mapcar!=null&&mapcar.containsKey(e.get("sequenceNbr").toString())){
                      e.put("carState", FireCarStatusEnum.执勤.getName());
+                 }else{
+                     e.put("carState", FireCarStatusEnum.备勤.getName());
+                 }
             }
-
             String sequenceNbr = e.get("sequenceNbr").toString();
 
             //查询最新的经纬度

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCarServiceImpl.java

@@ -251,5 +251,11 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 			}	
 		return specifyDateList;
 	}
+	@Override
+	public List<Map<String, String>> getDutyCar() {
+
+		List<Map<String, String>> instanceMap = dutyPersonShiftMapper.getDutyCar();
 
+		return instanceMap;
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -271,6 +271,10 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                 : null;
         if (!ObjectUtils.isEmpty(result)) {
             List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
+            //今日值班车辆
+            List<Map<String, String>> ListCar= iDutyCarService.getDutyCar();
+            Map<String, String> mapcar= ListCar!=null? ListCar.stream().collect(Collectors.toMap(ma->ma.get("carId"),ma->ma.get("carId"))):null;
+
             if (!ValidationUtil.isEmpty(fireCarListMapList)) {
                 fireCarListMapList.stream().filter(car -> ObjectUtils.isNotEmpty(car.get("teamId"))).forEach(car -> {
 
@@ -278,7 +282,13 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                             FireBrigadeResourceDto.class);
                     // TODO 后期根据车物联状态来返回，现在为"(装备)在位=执勤","(装备)执勤=出动"
                     if (FireCarStatusEnum.执勤.getCode().equals(fireCarDto.getCarState())) {
+
+                        // 新加需求，今日没有值班的车辆显示状态：备战 ，有排班的显示：执勤
+                        if(mapcar!=null&&mapcar.containsKey(car.get("id").toString())){
                             fireCarDto.setCarStateDesc(FireCarStatusEnum.执勤.getName());
+                        }else{
+                            fireCarDto.setCarStateDesc(FireCarStatusEnum.备勤.getName());
+                        }
                     } else {
                         if (appleMap != null) {
                             //bug: 6268
@@ -287,8 +297,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                             fireCarDto.setCarStateDesc(state != null ? FireCarStatusEnum.getEnum(state).getName() : null);
                         } else {
                             //bug: 6268
-                            fireCarDto.setCarState(FireCarStatusEnum.执勤.getCode());
-                            fireCarDto.setCarStateDesc(FireCarStatusEnum.执勤.getName());
+                            fireCarDto.setCarState(FireCarStatusEnum.备勤.getName());
+                            fireCarDto.setCarStateDesc(FireCarStatusEnum.备勤.getName());
                         }
                     }
                     List<Map<String, String>> maps = dutyPersonShiftMapper.nowDutyCarPersonNum();