Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -42,4 +42,7 @@ public class PowerTransferCompanyResources extends BaseEntity {
 
     @ApiModelProperty(value = "任务状态")
     private String status;
+
+    @ApiModelProperty(value = "车辆任务状态")
+    private String carStatus;
 }

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

@@ -21,7 +21,17 @@ public enum FireCarStatusEnum {
 	出水("CS","5", "出水"),
 	停水("TS","6", "停水"),
 	驻防("ZF","7", "驻防"),
-	返队("FD","8", "返队");
+	返队("FD","8", "返队"),
+	训练("XL","9", "训练"),
+	演练("YL","10", "演练"),
+	加油("JY","11", "加油"),
+	试车("SC","12", "试车"),
+
+
+    执行中("ZXZ","executing", "执行中"),
+    已完成("YWC","finished", "已完成");
+
+
 //	完成("WC","9", "完成");
 
 

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

@@ -359,8 +359,8 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             }
             // 更新所有车辆状态为执勤
             equipFeignClient.updateCarStatus(carStatusInfoDtoList);
-            //跟车辆状态
-            powerTransferCompanyResourcesService.update(new UpdateWrapper<PowerTransferCompanyResources>().eq("resources_id", transferCarIdList).set("status", FireCarStatusEnum.返队.getCode()));
+//            //跟车辆状态
+//            powerTransferCompanyResourcesService.update(new UpdateWrapper<PowerTransferCompanyResources>().eq("resources_id", transferCarIdList).set("status", FireCarStatusEnum.返队.getCode()));
         }
 
         // 4.发送任务消息

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,8 +188,9 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 
         //查询车辆当前任务状态
         QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
-        queryWrapper.ne("status", FireCarStatusEnum.返队.getCode());
+        queryWrapper.in("car_status", FireCarStatusEnum.返队.getCode(),FireCarStatusEnum.加油.getCode(),FireCarStatusEnum.演练.getCode(),FireCarStatusEnum.训练.getCode(),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();
@@ -283,7 +284,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             BeanUtils.copyProperties(powerTransferCompanyResourcesDto, powerTransferCompanyResources);
             powerTransferCompanyResources.setPowerTransferCompanyId(powerTransferCompanySequenceNbr);
             //资源状态
-            powerTransferCompanyResources.setStatus(FireCarStatusEnum.出动.getCode());
+            powerTransferCompanyResources.setStatus(FireCarStatusEnum.执行中.getCode());
             powerTransferCompanyResourcesList.add(powerTransferCompanyResources);
         }
         return powerTransferCompanyResourcesList;

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

@@ -1824,6 +1824,34 @@
 
         </sql>
     </changeSet>
+    <changeSet author="tw" id="2021-10-18-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 (1339, '9', '训练', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 9);
+            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 (1340, '10', '演练', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 10);
+            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 (1341, '11', '加油', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 11);
+            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 (1342, '12', '试车', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 12);
+
+        </sql>
+    </changeSet>
+
+
+    <changeSet author="tw" id="2021-10-18-2">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_power_transfer_company_resources"/>
+        </preConditions>
+        <comment>增加车辆状态</comment>
+        <sql>
+            ALTER TABLE jc_power_transfer_company_resources MODIFY COLUMN  car_status varchar(255) DEFAULT NULL COMMENT '车辆任务状态'
+        </sql>
+    </changeSet>
+