修改bug

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

@@ -39,4 +39,7 @@ public class PowerTransferCompanyResources extends BaseEntity {
 
     @ApiModelProperty(value = "资源编号（如车牌号）")
     private String resourcesNum;
+
+    @ApiModelProperty(value = "任务状态")
+    private String status;
 }

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,16 +14,16 @@ import java.util.Map;
 @Getter
 @AllArgsConstructor
 public enum FireCarStatusEnum {
-    // 执勤状态
-    执勤("ZW", "1", "执勤"),
-    // 出动状态
-    出动("ZQ", "2", "出动"),
-    // 维修状态
-    维修("WX","3", "维修"),
-    // 退役状态
-    退役("TY","6", "退役"),
-    // 报废状态
-    报废("BF","7", "报废");
+    执勤("ZW","1", "执勤"),
+    出动("ZQ","2", "出动"),
+    途中("TZ","3", "途中"),
+	到场("DC","4", "到场"),
+	出水("CS","5", "出水"),
+	停水("TS","6", "停水"),
+	驻防("ZF","7", "驻防"),
+	返队("FD","8", "返队");
+//	完成("WC","9", "完成");
+
 
     private String key;
     private String code;

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

@@ -51,13 +51,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
@@ -1199,11 +1193,11 @@ public class CommandController extends BaseController {
         //获取用户已绑定车辆id、
         UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
         if(isNo!=null&&isNo){
-            id =userCar!=null?userCar.getAmosUserId():null;
+            id =userCar!=null?userCar.getCarId():null;
         }
         ResponseModel<Object> data=  equipFeignClient.equipmentCarList(teamId,name,code , pageNum,pageSize,id);
         Map map =new HashMap();
-        map.put("select",userCar!=null?userCar.getAmosUserId():null);
+        map.put("select",userCar!=null?userCar.getCarId():null);
         map.put("data",data!=null?data.getResult():null);
         return ResponseHelper.buildResponse(map);
     }
@@ -1222,22 +1216,30 @@ public class CommandController extends BaseController {
     @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "adduserCar/{type}", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "增加绑定", notes = "增加绑定")
-    public ResponseModel<Object> adduserCar(@PathVariable String type,UserCar userCar  ) {
+    public ResponseModel<Object> adduserCar(@PathVariable String type, @RequestBody  UserCar userCar  ) {
         AgencyUserModel agencyUserModel= getUserInfo();
         userCar.setAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
         userCar.setAmosUserName(agencyUserModel.getUserName());
-
         if("1".equals(type)){
-
             userCarService.add(userCar);
         }else{
-
             userCarService.delete(userCar);
         }
+        return ResponseHelper.buildResponse(true);
+    }
 
 
-        return ResponseHelper.buildResponse(null);
-    }
+    @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() {
+        AgencyUserModel agencyUserModel= getUserInfo();
+         Long id =null;
+        //获取用户已绑定车辆id、
+        UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
+        id =userCar!=null?userCar.getCarId():null;
 
+        return ResponseHelper.buildResponse(id);
+    }
 
 }
\ 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/controller/PowerTransferCompanyResourcesController.java

@@ -2,6 +2,11 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 import java.util.Arrays;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
+import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
+import com.yeejoin.amos.boot.module.jcs.api.service.IUserCarService;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -37,7 +42,8 @@ public class PowerTransferCompanyResourcesController extends BaseController {
 
     @Autowired
     PowerTransferCompanyResourcesServiceImpl powerTransferCompanyResourcesService;
-
+    @Autowired
+    IUserCarService userCarService;
     /**
      * 新增调派单位资源
      *
@@ -77,6 +83,31 @@ public class PowerTransferCompanyResourcesController extends BaseController {
     }
 
 
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/updateById/{code}", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "修改调派单位资源", notes = "修改调派单位资源")
+    public boolean updateByResourcesIdPowerTransferCompanyResources(@PathVariable String code) {
+        //获取用户所属单位id
+        AgencyUserModel agencyUserModel= getUserInfo();
+        Long id =null;
+        //获取用户已绑定车辆id、
+        UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
+        id =userCar!=null?userCar.getCarId():null;
+        UpdateWrapper<PowerTransferCompanyResources>   up=new UpdateWrapper<>();
+        return  powerTransferCompanyResourcesService.update(new UpdateWrapper<PowerTransferCompanyResources>().eq("resources_id", id).set("status", code));
+
+    }
+
+
+
+
+
+
+
+
+
     /**
      * 根据id查询
      *

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

@@ -20,12 +20,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ResourceStatisticsDto;
-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.PowerTransfer;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
+import com.yeejoin.amos.boot.module.jcs.api.entity.*;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertFeedbackStatusEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
@@ -170,32 +165,61 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         // 1.调用装备服务接口查询车辆列表
         List<FireBrigadeResourceDto> fireCarDtoList = Lists.newArrayList();
         ResponseModel<Object> result = equipFeignService.getFireCarListAll();
+//        if (!ObjectUtils.isEmpty(result)) {
+//            List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
+//            if (!ValidationUtil.isEmpty(fireCarListMapList)) {
+//                fireCarListMapList.stream().filter(car -> ObjectUtils.isNotEmpty(car.get("teamId"))).filter(car ->
+//                        FireCarStatusEnum.执勤.getCode().equals(car.get("carState")) //TODO 后续如果需要多个状态需要删掉这个过滤条件
+//                                || FireCarStatusEnum.出动.getCode().equals(car.get("carState"))).forEach(car -> {
+//
+//                    FireBrigadeResourceDto fireCarDto = (FireBrigadeResourceDto) Bean.mapToBean(car, FireBrigadeResourceDto.class);
+//                    // TODO 后期根据车物联状态来返回，现在为"(装备)在位=执勤","(装备)执勤=出动"
+//                    if (FireCarStatusEnum.执勤.getCode().equals(fireCarDto.getCarState())) {
+//                        fireCarDto.setCarStateDesc(FireCarStatusEnum.执勤.getName());
+//                    } else {
+//                        fireCarDto.setCarState(FireCarStatusEnum.出动.getCode());
+//                        fireCarDto.setCarStateDesc(FireCarStatusEnum.出动.getName());
+//                    }
+//                    fireCarDtoList.add(fireCarDto);
+//                });
+//            }
+//        }
+
+
+        //查询车辆当前任务状态
+        QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ne("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::getStatus)):null;
         if (!ObjectUtils.isEmpty(result)) {
             List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
             if (!ValidationUtil.isEmpty(fireCarListMapList)) {
-                fireCarListMapList.stream().filter(car -> ObjectUtils.isNotEmpty(car.get("teamId"))).filter(car ->
-                        FireCarStatusEnum.执勤.getCode().equals(car.get("carState")) //TODO 后续如果需要多个状态需要删掉这个过滤条件
-                                || FireCarStatusEnum.出动.getCode().equals(car.get("carState"))).forEach(car -> {
-                    FireBrigadeResourceDto fireCarDto = (FireBrigadeResourceDto) Bean.mapToBean(car,
-                            FireBrigadeResourceDto.class);
+                fireCarListMapList.stream().filter(car -> ObjectUtils.isNotEmpty(car.get("teamId"))).forEach(car -> {
+
+                    FireBrigadeResourceDto fireCarDto = (FireBrigadeResourceDto) Bean.mapToBean(car, FireBrigadeResourceDto.class);
                     // TODO 后期根据车物联状态来返回，现在为"(装备)在位=执勤","(装备)执勤=出动"
                     if (FireCarStatusEnum.执勤.getCode().equals(fireCarDto.getCarState())) {
                         fireCarDto.setCarStateDesc(FireCarStatusEnum.执勤.getName());
                     } else {
-                        fireCarDto.setCarState(FireCarStatusEnum.出动.getCode());
-                        fireCarDto.setCarStateDesc(FireCarStatusEnum.出动.getName());
-                    }
+                       if(appleMap!=null){
+                          String state= appleMap.containsKey(car.get("id"))?appleMap.get(car.get("id")):null;
+                           fireCarDto.setCarState(state);
+                           fireCarDto.setCarStateDesc(state!=null?FireCarStatusEnum.getEnum(state).getName():null);
+                       }else{
+                           fireCarDto.setCarState(null);
+                           fireCarDto.setCarStateDesc(null);
+                       }
+                 }
                     fireCarDtoList.add(fireCarDto);
                 });
             }
         }
 
+
         // 2.查询消防队伍列表
-        List<FireTeam> fullTimeFireBrigadeList = fireTeamService.list(new QueryWrapper<FireTeam>().eq("type_code",
-                FireBrigadeTypeEnum.专职消防队.getCode()).eq("is_delete", 0));
+        List<FireTeam> fullTimeFireBrigadeList = fireTeamService.list(new QueryWrapper<FireTeam>().eq("type_code", FireBrigadeTypeEnum.专职消防队.getCode()).eq("is_delete", 0));
         if (!CollectionUtils.isEmpty(fullTimeFireBrigadeList)) {
-            Map<String, List<FireBrigadeResourceDto>> resultMap =
-                    fireCarDtoList.stream().collect(Collectors.groupingBy(FireBrigadeResourceDto::getTeamId));
+            Map<String, List<FireBrigadeResourceDto>> resultMap = fireCarDtoList.stream().collect(Collectors.groupingBy(FireBrigadeResourceDto::getTeamId));
             if (!ValidationUtil.isEmpty(fullTimeFireBrigadeList)) {
                 fullTimeFireBrigadeList.forEach(brigade -> {
                     if (!CollectionUtils.isEmpty(resultMap.get(brigade.getSequenceNbr().toString()))) {
@@ -221,18 +245,18 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.监控大队.getCode());
        // List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade();
         /*bug 2403 队伍未显示图片 2021-09-23 陈召开始 */
-        for (FireBrigadeResourceDto fireBrigadeResourceDto : monitorFireBrigadeList) {
-            if (fireBrigadeResourceDto.getPic() != null) {
-                String[] split = fireBrigadeResourceDto.getPic().split(",");
-                if (split.length > 1) {
-                    fireBrigadeResourceDto.setImage(Arrays.asList(split));
-                } else {
-                    List<String> objects = new ArrayList<>();
-                    objects.add(fireBrigadeResourceDto.getPic());
-                    fireBrigadeResourceDto.setImage(objects);
-                }
-            }
-        }
+//        for (FireBrigadeResourceDto fireBrigadeResourceDto : monitorFireBrigadeList) {
+//            if (fireBrigadeResourceDto.getPic() != null) {
+//                String[] split = fireBrigadeResourceDto.getPic().split(",");
+//                if (split.length > 1) {
+//                    fireBrigadeResourceDto.setImage(Arrays.asList(split));
+//                } else {
+//                    List<String> objects = new ArrayList<>();
+//                    objects.add(fireBrigadeResourceDto.getPic());
+//                    fireBrigadeResourceDto.setImage(objects);
+//                }
+//            }
+//        }
         /*bug 2403 队伍未显示图片 2021-09-23 陈召结束 */
         FireBrigadeResourceDto monitorResourceDto = new FireBrigadeResourceDto();
         monitorResourceDto.setId("0");
@@ -258,6 +282,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             powerTransferCompanyResources = new PowerTransferCompanyResources();
             BeanUtils.copyProperties(powerTransferCompanyResourcesDto, powerTransferCompanyResources);
             powerTransferCompanyResources.setPowerTransferCompanyId(powerTransferCompanySequenceNbr);
+            //资源状态
+            powerTransferCompanyResources.setStatus(FireCarStatusEnum.出动.getCode());
             powerTransferCompanyResourcesList.add(powerTransferCompanyResources);
         }
         return powerTransferCompanyResourcesList;

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -1758,9 +1758,26 @@
 
 
 
+    <changeSet author="tw" id="2021-10-15-1">
+        <preConditions onFail="MARK_RAN">
 
+            <tableExists tableName="cb_data_dictionary" />
+            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
+        </preConditions>
+        <comment>add data cb_data_dictionary</comment>
+        <sql>
+
+            INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1330, '2', '出动', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 2);
+            INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1331, '3', '途中', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 3);
+            INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1332, '4', '到场', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 4);
+            INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1333, '5', '出水', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 5);
+            INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1334, '6', '停水', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 6);
+            INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1335, '7', '驻防', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 7);
+            INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1336, '8', '返队', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 8);
 
+        </sql>
+    </changeSet>
 
 
 
-        </databaseChangeLog>
+   </databaseChangeLog>