zhanghaijun пре 2 година
родитељ
комит
c3524b105c

+ 10 - 4
train-server/src/main/java/top/haijunit/train/device/entity/SituationWaterEntity.java

@@ -1,10 +1,13 @@
 package top.haijunit.train.device.entity;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.Getter;
 
 import java.io.Serializable;
 
@@ -31,9 +34,12 @@ public class SituationWaterEntity implements Serializable {
 
     private Integer status;
 
-    enum situationType{
-        WATER_CRASH(1,"水灾"),
-
-        PASSENGER(2,"客流"),
+    @Getter
+    @AllArgsConstructor
+    enum situationType {
+        WATER_CRASH(1, "水灾"), PASSENGER(2, "客流");
+        @JsonValue
+        private final Integer code;
+        private final String describe;
     }
 }

+ 1 - 1
train-server/src/main/resources/db/changelog/db-server.xml

@@ -39,7 +39,7 @@
         </sql>
     </changeSet>
 
-    <include relativeToChangelogFile="true" file="db-server-train.xml"/>
+    <include relativeToChangelogFile="true" file="train/db-server-train.xml"/>
 
     <changeSet id="db_device" author="zhanghaijun" failOnError="false" runOnChange="true">
         <createTable tableName="db_device" schemaName="${schema.name}" remarks="设备表">

train-server/src/main/resources/db/changelog/db-server-train.xml → train-server/src/main/resources/db/changelog/train/db-server-train.xml


train-server/src/main/resources/db/changelog/db_emergency_stop.txt → train-server/src/main/resources/db/changelog/train/db_emergency_stop.txt


train-server/src/main/resources/db/changelog/db_platform.txt → train-server/src/main/resources/db/changelog/train/db_platform.txt


train-server/src/main/resources/db/changelog/db_route.txt → train-server/src/main/resources/db/changelog/train/db_route.txt


train-server/src/main/resources/db/changelog/db_selection.txt → train-server/src/main/resources/db/changelog/train/db_selection.txt


train-server/src/main/resources/db/changelog/db_signal.txt → train-server/src/main/resources/db/changelog/train/db_signal.txt


train-server/src/main/resources/db/changelog/db_station.txt → train-server/src/main/resources/db/changelog/train/db_station.txt


train-server/src/main/resources/db/changelog/db_station_door.txt → train-server/src/main/resources/db/changelog/train/db_station_door.txt


train-server/src/main/resources/db/changelog/db_stop_sign.txt → train-server/src/main/resources/db/changelog/train/db_stop_sign.txt


train-server/src/main/resources/db/changelog/db_switch.txt → train-server/src/main/resources/db/changelog/train/db_switch.txt


train-server/src/main/resources/db/changelog/db_train.txt → train-server/src/main/resources/db/changelog/train/db_train.txt