添加调派任务反馈表 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledFeedbackDto.java

@@ -22,8 +22,7 @@ import java.util.Map;
 @ApiModel(value="AlertCalledFeedbackDto", description="")
 public class AlertCalledFeedbackDto  extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
-
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "警情id")
     private Long alertCalledId;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/AlertFeedbackStatusEnum.java

@@ -71,8 +71,8 @@ public enum AlertFeedbackStatusEnum {
 	    List<Map<String, String>> enumList = Lists.newArrayList();
 	    for (AlertFeedbackStatusEnum item : AlertFeedbackStatusEnum.values()) {
 	        Map<String, String> map = Maps.newHashMap();
-	        map.put("code", item.getCode());
-	        map.put("name", item.getName());
+	        map.put("key", item.getCode());
+	        map.put("label", item.getName());
 	        enumList.add(map);
         }
         return enumList;

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

@@ -47,9 +47,8 @@ public enum FireCarStatusEnum {
         List<Map<String, String>> enumList = Lists.newArrayList();
         for (FireCarStatusEnum item : FireCarStatusEnum.values()) {
             Map<String, String> map = Maps.newHashMap();
-            map.put("key", item.getKey());
-            map.put("code", item.getCode());
-            map.put("name", item.getName());
+            map.put("key", item.getCode());
+            map.put("label", item.getName());
             enumList.add(map);
         }
         return enumList;

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

@@ -1128,7 +1128,7 @@ public class CommandController extends BaseController {
     @GetMapping(value = "/app/dispatchTaskStatus/list")
     @ApiOperation(httpMethod = "GET", value = "app-调派任务状态列表", notes = "app-调派任务状态列表")
     public ResponseModel<Object> powerTransferResourceStatusList() {
-        return ResponseHelper.buildResponse(powerTransferService.getFireCarStatusList());
+        return ResponseHelper.buildResponse(powerTransferService.getDispatchTaskStatusList());
     }
 
     /**

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

@@ -282,22 +282,22 @@
     <changeSet author="tb" id="2021-09-08-tb-1">
         <preConditions onFail="MARK_RAN">
             <not>
-                <tableExists tableName="jc_alert_called_feedback"/>
+                <tableExists tableName="jc_transfer_resource_feedback"/>
             </not>
         </preConditions>
-        <comment>create table jc_alert_called_feedback</comment>
+        <comment>create table jc_transfer_resource_feedback</comment>
         <sql>
-            CREATE TABLE `jc_alert_called_feedback` (
-            `sequence_nbr` bigint(30) NOT NULL COMMENT '主键',
-            `alert_called_id` bigint(30) NOT NULL COMMENT '警情id',
-            `status` varchar(255) NOT NULL COMMENT '反馈警情任务状态（执行中：executing，已完成：finished）',
-            `remark` varchar(255) DEFAULT NULL COMMENT '备注',
-            `rec_user_id` bigint(30) NOT NULL COMMENT '更新人id',
-            `rec_user_name` varchar(50) NOT NULL COMMENT '更新人名称',
-            `rec_date` datetime NOT NULL COMMENT '更新时间',
-            `is_delete` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除（1：删除，0：未删除）',
-            PRIMARY KEY (`sequence_nbr`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='警情反馈';
+			CREATE TABLE `jc_transfer_resource_feedback` (
+			`sequence_nbr` bigint(30) NOT NULL COMMENT '主键',
+			`transfer_company_resource_id` bigint(30) NOT NULL COMMENT '调派任务id',
+			`status` varchar(255) NOT NULL COMMENT '反馈调派任务状态（执行中：executing，已完成：finished）',
+			`remark` varchar(255) DEFAULT NULL COMMENT '备注',
+			`rec_user_id` bigint(30) NOT NULL COMMENT '更新人id',
+			`rec_user_name` varchar(50) NOT NULL COMMENT '更新人名称',
+			`rec_date` datetime NOT NULL COMMENT '更新时间',
+			`is_delete` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除（1：删除，0：未删除）',
+			PRIMARY KEY (`sequence_nbr`)
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='警情调派任务反馈';
         </sql>
     </changeSet>
     <changeSet author="tb" id="2021-09-08-tb-2">