增加app 接口

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.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 
 /**
@@ -11,4 +12,7 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources
 */
 public interface PowerTransferCompanyResourcesMapper extends BaseMapper<PowerTransferCompanyResources> {
 
+    AlertCalled getByPowerTransferCompanyResourId(Long id);
+
+    PowerTransferCompanyResources getByAlertCalledIdCarId(Long alertCalledId,Long carId);
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
+
+import java.util.List;
+
 /**
 * 调派单位资源 服务类
 *
@@ -8,4 +13,11 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
 */
 public interface IPowerTransferCompanyResourcesService {
 
+
+    AlertCalled getByPowerTransferCompanyResourId(Long id );
+
+
+    PowerTransferCompanyResources getByAlertCalledIdCarId(Long alertCalledId,Long carId);
+    void updatePowerTransferCompanyResourcesService(Long alertCalledId,Long carId,String code,int type);
+
 }

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

@@ -2,4 +2,32 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferCompanyResourcesMapper">
 
+
+
+    <select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled">
+        SELECT
+         *
+        FROM
+        jc_alert_called a LEFT JOIN jc_power_transfer b on a.sequence_nbr=b.alert_called_id
+        LEFT JOIN jc_power_transfer_company c on c.power_transfer_id=b.sequence_nbr
+         LEFT JOIN   jc_power_transfer_company_resources d on  d.power_transfer_company_id=c.sequence_nbr where d.sequence_nbr=  #{id}
+
+
+    </select>
+
+    <select id="getByAlertCalledIdCarId" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources">
+        SELECT
+        d.*
+        FROM
+        jc_alert_called a LEFT JOIN jc_power_transfer b on a.sequence_nbr=b.alert_called_id
+        LEFT JOIN jc_power_transfer_company c on c.power_transfer_id=b.sequence_nbr
+        LEFT JOIN   jc_power_transfer_company_resources d on  d.power_transfer_company_id=c.sequence_nbr where a.sequence_nbr=  #{alertCalledId}
+        and d.resources_id=#{carId}
+
+
+    </select>
+
+
+
+
 </mapper>

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

@@ -34,16 +34,13 @@ import com.yeejoin.amos.boot.module.common.api.service.ILinkageUnitService;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
 import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.InstructionsZHDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
-import com.yeejoin.amos.boot.module.jcs.api.dto.StateDot;
+import com.yeejoin.amos.boot.module.jcs.api.dto.*;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 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.service.*;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.PermissionModel;
@@ -129,6 +126,10 @@ public class CommandController extends BaseController {
     IKeySiteService keySiteService;
     @Autowired
     IPowerTransferCompanyService powerTransferCompanyService;
+
+    @Autowired
+    IPowerTransferCompanyResourcesService powerTransferCompanyResourcesService;
+
     @Autowired
     ISourceFileService sourceFileService;
 
@@ -1234,15 +1235,49 @@ public class CommandController extends BaseController {
 
     @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "getAlertCalledId", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "增加绑定", notes = "增加绑定")
+    @ApiOperation(httpMethod = "GET", value = "获取绑定车辆装", notes = "获取绑定车辆装")
     public ResponseModel<Object> getAlertCalledId() {
         AgencyUserModel agencyUserModel= getUserInfo();
          Long id =null;
         //获取用户已绑定车辆id、
         UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
-        id =userCar!=null?userCar.getCarId():null;
+        return ResponseHelper.buildResponse(userCar);
+    }
+
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "getAlertCalled", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取当前执行灾情", notes = "获取当前执行灾情")
+    public ResponseModel<Object> getAlertCalled() {
+        AgencyUserModel agencyUserModel= getUserInfo();
+        Long id =null;
+        //获取用户已绑定车辆id、
+        UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
+        //获取正在进行的灾情
+        AlertCalled alertCalled= powerTransferCompanyResourcesService.getByPowerTransferCompanyResourId(userCar.getCarId());
+        return ResponseHelper.buildResponse(alertCalled);
+    }
 
-        return ResponseHelper.buildResponse(id);
+
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "getPowerTransferCompanyResourcesService/{carid}/{alertCalledId}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取当前任务，车辆状态", notes = "获取当前任务，车辆状态")
+    public ResponseModel<Object> getPowerTransferCompanyResourcesService(@PathVariable Long carid,
+                                                                            @PathVariable Long alertCalledId) {
+        //获取正在进行的灾情
+        PowerTransferCompanyResources powerTransferCompanyResources= powerTransferCompanyResourcesService.getByAlertCalledIdCarId(alertCalledId,carid);
+        return ResponseHelper.buildResponse(powerTransferCompanyResources);
     }
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "updatePowerTransferCompanyResourcesService/{carid}/{alertCalledId}/{code}/{type}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "修改任务，车辆状态", notes = "修改任务，车辆状态")
+    public ResponseModel<Object> updatePowerTransferCompanyResourcesService(@PathVariable Long carid,
+                                                                            @PathVariable Long alertCalledId,
+                                                                            @PathVariable String code,
+                                                                            @PathVariable int type) {
+        //获取正在进行的灾情
+        powerTransferCompanyResourcesService.updatePowerTransferCompanyResourcesService(alertCalledId,carid,code,type);
+        return ResponseHelper.buildResponse(null);
+    }
+
 
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
+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.service.IPowerTransferCompanyResourcesService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
 * 调派单位资源 服务实现类
 *
@@ -16,5 +28,53 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 */
 @Service
 public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerTransferCompanyResourcesDto,PowerTransferCompanyResources,PowerTransferCompanyResourcesMapper> implements IPowerTransferCompanyResourcesService {
+    @Resource
+    PowerTransferCompanyResourcesMapper powerTransferCompanyResourcesMapper;
+    @Autowired
+    EquipFeignClient equipFeignClient;
+    @Override
+    public AlertCalled getByPowerTransferCompanyResourId(Long id) {
+
+
+        QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode() );
+        queryWrapper.eq("resources_id", id );
+        PowerTransferCompanyResources alertFormValue = this.getOne(queryWrapper);
+
+        return powerTransferCompanyResourcesMapper.getByPowerTransferCompanyResourId(alertFormValue.getPowerTransferCompanyId());
+    }
+
+    @Override
+    public PowerTransferCompanyResources getByAlertCalledIdCarId(Long alertCalledId, Long carId) {
+        return powerTransferCompanyResourcesMapper.getByAlertCalledIdCarId(alertCalledId,carId);
+    }
+
+    @Override
+    @Transactional
+    public void updatePowerTransferCompanyResourcesService(Long alertCalledId, Long carId, String code,int type) {
+
+    PowerTransferCompanyResources powerTransferCompanyResources= powerTransferCompanyResourcesMapper.getByAlertCalledIdCarId(alertCalledId,carId);
+        try {
+            if(1==type){
+                powerTransferCompanyResources.setCarStatus(code);
+                powerTransferCompanyResourcesMapper.updateById(powerTransferCompanyResources);
+            }else{
+
+                powerTransferCompanyResources.setStatus(code);
+                powerTransferCompanyResourcesMapper.updateById(powerTransferCompanyResources);
+                List<Object> carStatusInfoDtoList = new ArrayList();
+                //修改装备信息
+                CarStatusInfoDto carStatusInfo = new CarStatusInfoDto();
+                carStatusInfo.setSequenceNbr(carId.toString());
+                carStatusInfo.setStatus(FireCarStatusEnum.执勤.getCode());
+                carStatusInfoDtoList.add(carStatusInfo);
+                // 更新所有车辆状态为执勤
+                equipFeignClient.updateCarStatus(carStatusInfoDtoList);
+            }
+        } catch (Exception e) {
+            throw  new RuntimeException("修改失败！");
+        }
+
 
+    }
 }

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

@@ -188,7 +188,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 
         //查询车辆当前任务状态
         QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
-        queryWrapper.notIn("car_status", FireCarStatusEnum.返队.getCode(),FireCarStatusEnum.加油.getCode(),FireCarStatusEnum.演练.getCode(),FireCarStatusEnum.训练.getCode(),FireCarStatusEnum.试车.getCode());
+       // queryWrapper.notIn("car_status", FireCarStatusEnum.返队.getCode(),FireCarStatusEnum.加油.getCode(),FireCarStatusEnum.演练.getCode(),FireCarStatusEnum.训练.getCode(),FireCarStatusEnum.试车.getCode());
+        queryWrapper.eq("status",FireCarStatusEnum.执行中.getCode() );
         List<PowerTransferCompanyResources> alertFormValue = powerTransferCompanyResourcesService.list(queryWrapper);
 
         Map<String, String> appleMap = alertFormValue!=null&&alertFormValue.size()>0?alertFormValue.stream().collect(Collectors.toMap(PowerTransferCompanyResources::getResourcesId, PowerTransferCompanyResources::getCarStatus)):null;