修改app接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompanyResources.java

@@ -45,4 +45,11 @@ public class PowerTransferCompanyResources extends BaseEntity {
 
     @ApiModelProperty(value = "车辆任务状态")
     private String carStatus;
+
+    @ApiModelProperty(value = "任务状态")
+    @TableField(exist = false)
+    private String statusName;
+    @ApiModelProperty(value = "车辆任务")
+    @TableField(exist = false)
+    private String carStatusName;
 }

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

@@ -4,20 +4,48 @@
 
 
 
-    <select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled">
+    <select id="getByPowerTransferCompanyResourId" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled">
         SELECT
-         *
+         a.*
         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}
+         LEFT JOIN   jc_power_transfer_company_resources d on  d.power_transfer_company_id=c.sequence_nbr where c.sequence_nbr=  #{id}
 
 
     </select>
 
     <select id="getByAlertCalledIdCarId" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources">
-        SELECT
-        d.*
+        SELECT d.sequence_nbr,
+   d.power_transfer_company_id,
+   d.status,
+   d.type,
+   d.resources_id,
+   d.resources_name,
+   d.resources_num,
+   d.rec_user_name,
+   d.rec_user_id,
+   d.rec_date,
+   d.car_status,
+   d.is_delete,
+	CASE  d.status
+	WHEN 'executing' THEN '未完成'
+	WHEN 'finished' THEN '已完成'
+	ELSE '' END statusName,
+
+	CASE  d.car_status
+    WHEN "2" THEN  "出动"
+    WHEN "3" THEN  "途中"
+    WHEN "4" THEN  "到场"
+    WHEN "5" THEN  "出水"
+    WHEN "6" THEN  "停水"
+    WHEN "7" THEN  "驻防"
+    WHEN "8" THEN  "返队"
+    WHEN "9" THEN  "训练"
+    WHEN "10" THEN  "演练"
+    WHEN "11" THEN  "加油"
+    WHEN "12" THEN  "试车"
+    ELSE '' END carStatusName
         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

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

@@ -1236,25 +1236,30 @@ 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 = "获取绑定车辆装")
-    public ResponseModel<Object> getAlertCalledId() {
+    public ResponseModel<UserCar> getAlertCalledId() {
         AgencyUserModel agencyUserModel= getUserInfo();
          Long id =null;
         //获取用户已绑定车辆id、
         UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
         return ResponseHelper.buildResponse(userCar);
+
+
     }
 
     @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "getAlertCalled", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    @RequestMapping(value = "getAlertCalledData", 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);
+        //获取正在进行的灾情null
+        if(userCar!=null){
+            AlertCalled alertCalled= powerTransferCompanyResourcesService.getByPowerTransferCompanyResourId(userCar.getCarId());
+            return ResponseHelper.buildResponse(alertCalled);
+        }
+        return ResponseHelper.buildResponse(null);
     }
 
 
@@ -1265,6 +1270,7 @@ public class CommandController extends BaseController {
                                                                             @PathVariable Long alertCalledId) {
         //获取正在进行的灾情
         PowerTransferCompanyResources powerTransferCompanyResources= powerTransferCompanyResourcesService.getByAlertCalledIdCarId(alertCalledId,carid);
+
         return ResponseHelper.buildResponse(powerTransferCompanyResources);
     }
     @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)

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

@@ -38,10 +38,12 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
 
         QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode() );
-        queryWrapper.eq("resources_id", id );
+        queryWrapper.eq("resources_id", id.toString() );
         PowerTransferCompanyResources alertFormValue = this.getOne(queryWrapper);
-
-        return powerTransferCompanyResourcesMapper.getByPowerTransferCompanyResourId(alertFormValue.getPowerTransferCompanyId());
+        if(alertFormValue!=null){
+            return powerTransferCompanyResourcesMapper.getByPowerTransferCompanyResourId(alertFormValue.getPowerTransferCompanyId());
+        }
+        return null;
     }
 
     @Override