修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferCompanyResourcesMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 
+import java.util.List;
+
 /**
 * 调派单位资源 Mapper 接口
 *
@@ -15,4 +18,5 @@ public interface PowerTransferCompanyResourcesMapper extends BaseMapper<PowerTra
     AlertCalled getByPowerTransferCompanyResourId(Long id);
 
     PowerTransferCompanyResources getByAlertCalledIdCarId(Long alertCalledId,Long carId);
+    void updateByAlertCalledId(Long alertCalledId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferCompanyResourcesService.java

@@ -18,6 +18,9 @@ public interface IPowerTransferCompanyResourcesService {
 
 
     PowerTransferCompanyResources getByAlertCalledIdCarId(Long alertCalledId,Long carId);
+
+   void  updateByAlertCalledId(Long alertCalledId);
+
     void updatePowerTransferCompanyResourcesService(Long alertCalledId,Long carId,String code,int type,String remarks);
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferCompanyResourcesMapper.xml

@@ -56,6 +56,14 @@
 
     </select>
 
+    <select id="updateByAlertCalledId" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources">
+       	update  jc_power_transfer_company_resources set `status`='finished'   where jc_power_transfer_company_resources.power_transfer_company_id in (
+			  select   c.sequence_nbr from   jc_power_transfer_company c
+        LEFT JOIN  jc_power_transfer b  on  c.power_transfer_id= b.sequence_nbr  where b.alert_called_id=   #{alertCalledId}
+
+			);
+
+    </select>
 
 
 

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

@@ -37,6 +37,7 @@ import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferCompanyMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourcesService;
 import com.yeejoin.amos.boot.module.jcs.biz.rule.action.AlertCalledAction;
 import com.yeejoin.amos.component.rule.config.RuleConfig;
 import org.apache.commons.lang3.ObjectUtils;
@@ -88,7 +89,6 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
 
     @Autowired
     private EmqKeeper emqKeeper;
-
     @Value("${mqtt.topic.alert.reporting}")
     private String topic;
 
@@ -357,6 +357,11 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                     carStatusInfoDtoList.add(carStatusInfo);
                 });
             }
+
+
+            //修改调派车辆任务
+
+            powerTransferCompanyResourcesService.updateByAlertCalledId(alertSubmittedDto.getAlertCalledId());
             // 更新所有车辆状态为执勤
             equipFeignClient.updateCarStatus(carStatusInfoDtoList);
 //            //跟车辆状态

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

@@ -51,6 +51,11 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
         return powerTransferCompanyResourcesMapper.getByAlertCalledIdCarId(alertCalledId,carId);
     }
 
+    @Override
+    public void updateByAlertCalledId(Long alertCalledId) {
+        powerTransferCompanyResourcesMapper.updateByAlertCalledId(alertCalledId);
+    }
+
 
     @Override
     @Transactional

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

@@ -280,7 +280,16 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     private List<PowerTransferCompanyResources> DtoEntityBatchConvert(List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList, Long powerTransferCompanySequenceNbr) {
         ArrayList<PowerTransferCompanyResources> powerTransferCompanyResourcesList = new ArrayList<>();
         PowerTransferCompanyResources powerTransferCompanyResources;
+       List idList=powerTransferCompanyResourcesDtoList.stream().map(PowerTransferCompanyResourcesDto::getResourcesId).collect(Collectors.toList());
+        QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status",FireCarStatusEnum.执行中.getCode() );
+        queryWrapper.in("resources_id", idList);
+        List<PowerTransferCompanyResources> alertFormValue = powerTransferCompanyResourcesService.list(queryWrapper);
+        if(alertFormValue!=null&&alertFormValue.size()>0){
+            throw new RuntimeException("已选车辆有已调派车辆！");
+        }else{
             for (PowerTransferCompanyResourcesDto powerTransferCompanyResourcesDto : powerTransferCompanyResourcesDtoList) {
+
                 powerTransferCompanyResources = new PowerTransferCompanyResources();
                 BeanUtils.copyProperties(powerTransferCompanyResourcesDto, powerTransferCompanyResources);
                 powerTransferCompanyResources.setPowerTransferCompanyId(powerTransferCompanySequenceNbr);
@@ -293,6 +302,9 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             return powerTransferCompanyResourcesList;
         }
 
+
+    }
+
     private void initDefinitions(Map<String, String> definitions,
                                  AlertCalled alertCalled, PowerTransferDto powerTransferDto) {
         List<AlertFormValue> alertFormValue = alertFormValueService.list(new QueryWrapper<AlertFormValue>().eq(