fix: 设备添加

train-server/src/main/java/top/haijunit/train/controller/DemoController.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 import top.haijunit.common.domain.ResultData;
-import top.haijunit.train.domain.entity.DeviceEntity;
+import top.haijunit.train.device.entity.DeviceEntity;
 import top.haijunit.train.domain.repository.DeviceRepository;
 import top.haijunit.train.socket.CommandEnum;
 import top.haijunit.websocket.handler.WebSocketSessionHolder;

train-server/src/main/java/top/haijunit/train/domain/entity/DeviceEntity.java

@@ -1,4 +1,4 @@
-package top.haijunit.train.domain.entity;
+package top.haijunit.train.device.entity;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

train-server/src/main/java/top/haijunit/train/device/entity/ElevatorEntity.java

@@ -0,0 +1,31 @@
+package top.haijunit.train.device.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhanghaijun
+ * @date 2023/12/8 18:44
+ * @description [一句话描述该类的功能]
+ */
+@Data
+@Entity(name = "device_elevator")
+public class ElevatorEntity implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private Integer elevatorType;
+
+    private String name;
+
+    private Long stationId;
+
+    private Integer status;
+}

train-server/src/main/java/top/haijunit/train/device/entity/PlatformDoorEntity.java

@@ -0,0 +1,31 @@
+package top.haijunit.train.device.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhanghaijun
+ * @date 2023/12/8 18:44
+ * @description [一句话描述该类的功能]
+ */
+@Data
+@Entity(name = "device_platform_door")
+public class PlatformDoorEntity implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private Integer doorType;
+
+    private String name;
+
+    private Long platformId;
+
+    private Integer status;
+}

train-server/src/main/java/top/haijunit/train/device/entity/SituationPassengerEntity.java

@@ -0,0 +1,31 @@
+package top.haijunit.train.device.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhanghaijun
+ * @date 2023/12/8 18:44
+ * @description 水灾态势
+ */
+@Data
+@Entity(name = "situation_water")
+public class SituationPassengerEntity implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private Integer areaType;
+
+    private String name;
+
+    private Long stationId;
+
+    private Integer status;
+}

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

@@ -0,0 +1,31 @@
+package top.haijunit.train.device.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhanghaijun
+ * @date 2023/12/8 18:44
+ * @description 水灾态势
+ */
+@Data
+@Entity(name = "situation_water")
+public class SituationWaterEntity implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private Integer areaType;
+
+    private String name;
+
+    private Long stationId;
+
+    private Integer status;
+}

train-server/src/main/java/top/haijunit/train/device/entity/TicketingEntity.java

@@ -0,0 +1,31 @@
+package top.haijunit.train.device.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhanghaijun
+ * @date 2023/12/8 18:44
+ * @description [一句话描述该类的功能]
+ */
+@Data
+@Entity(name = "device_ticketing")
+public class TicketingEntity implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private Integer ticketType;
+
+    private String name;
+
+    private Long stationId;
+
+    private Integer status;
+}

train-server/src/main/java/top/haijunit/train/device/entity/WaterPoolEntity.java

@@ -0,0 +1,31 @@
+package top.haijunit.train.device.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhanghaijun
+ * @date 2023/12/8 18:44
+ * @description [一句话描述该类的功能]
+ */
+@Data
+@Entity(name = "device_water_pool")
+public class WaterPoolEntity implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private Integer deviceType;
+
+    private String name;
+
+    private Long stationId;
+
+    private Integer status;
+}

train-server/src/main/java/top/haijunit/train/device/entity/WaterPumpEntity.java

@@ -0,0 +1,31 @@
+package top.haijunit.train.device.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhanghaijun
+ * @date 2023/12/8 18:44
+ * @description [一句话描述该类的功能]
+ */
+@Data
+@Entity(name = "device_water_pump")
+public class WaterPumpEntity implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private Integer poolId;
+
+    private String name;
+
+    private Long stationId;
+
+    private Integer status;
+}

train-server/src/main/java/top/haijunit/train/domain/repository/DeviceRepository.java

@@ -2,7 +2,7 @@ package top.haijunit.train.domain.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import top.haijunit.train.domain.entity.DeviceEntity;
+import top.haijunit.train.device.entity.DeviceEntity;
 
 import java.util.List;
 

train-server/src/main/java/top/haijunit/train/listener/MessageEventListener.java

@@ -8,7 +8,7 @@ import org.springframework.boot.configurationprocessor.json.JSONObject;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 import top.haijunit.common.utils.JsonUtils;
-import top.haijunit.train.domain.entity.DeviceEntity;
+import top.haijunit.train.device.entity.DeviceEntity;
 import top.haijunit.train.service.DeviceService;
 import top.haijunit.train.socket.CommandEnum;
 import top.haijunit.train.socket.SocketDevice;

train-server/src/main/java/top/haijunit/train/service/DeviceService.java

@@ -9,7 +9,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import top.haijunit.common.exception.ServiceException;
-import top.haijunit.train.domain.entity.DeviceEntity;
+import top.haijunit.train.device.entity.DeviceEntity;
 import top.haijunit.train.domain.repository.DeviceRepository;
 import top.haijunit.train.socket.CommandEnum;
 import top.haijunit.train.socket.SocketDevice;

train-server/src/main/java/top/haijunit/train/socket/SocketBase.java

@@ -1,7 +1,7 @@
 package top.haijunit.train.socket;
 
 import cn.hutool.json.JSONObject;
-import top.haijunit.train.domain.entity.DeviceEntity;
+import top.haijunit.train.device.entity.DeviceEntity;
 
 /**
  * @author zhang

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

@@ -68,7 +68,7 @@
     </changeSet>
 
     <changeSet id="device_water_pool" author="zhanghaijun" failOnError="false" runOnChange="true">
-        <createTable tableName="device_water_pool" schemaName="${schema.name}" remarks="自动电梯">
+        <createTable tableName="device_water_pool" schemaName="${schema.name}" remarks="水池">
             <column name="id" type="${autoing.type}" autoIncrement="true" remarks="编号">
                 <constraints nullable="false" primaryKey="true"/>
             </column>
@@ -95,6 +95,7 @@
             </column>
             <column name="name" type="VARCHAR(128)" defaultValueNumeric="0" remarks="名称"/>
             <column name="pool_id" type="${autoing.type}" defaultValueNumeric="0" remarks="所属水池编号"/>
+            <column name="station_id" type="${autoing.type}" defaultValueNumeric="0" remarks="所属站台"/>
             <column name="status" type="${number.type}" defaultValueNumeric="1" remarks="状态"/>
         </createTable>
     </changeSet>
@@ -104,6 +105,7 @@
             <column name="id" type="NUMERIC"/>
             <column name="name" type="STRING"/>
             <column name="pool_id" type="NUMERIC"/>
+            <column name="station_id" type="NUMERIC"/>
         </loadUpdateData>
     </changeSet>
 

train-server/src/main/resources/db/changelog/device/device_water_pump.txt

@@ -1,37 +1,37 @@
-id,name,pool_id
-137001,PUMP-0101,136001
-137002,PUMP-0102,136001
-137003,PUMP-0103,136002
-137004,PUMP-0104,136002
-137005,PUMP-0105,136003
-137006,PUMP-0106,136003
-137007,PUMP-0107,136004
-137008,PUMP-0108,136004
-137009,PUMP-0109,136005
-137010,PUMP-0110,136005
-137011,PUMP-0111,136006
-137012,PUMP-0112,136006
-137013,PUMP-0201,136007
-137014,PUMP-0202,136007
-137015,PUMP-0203,136008
-137016,PUMP-0204,136008
-137017,PUMP-0205,136009
-137018,PUMP-0206,136009
-137019,PUMP-0207,136010
-137020,PUMP-0208,136010
-137021,PUMP-0209,136011
-137022,PUMP-0210,136011
-137023,PUMP-0211,136012
-137024,PUMP-0212,136012
-137025,PUMP-0201,136013
-137026,PUMP-0202,136013
-137027,PUMP-0203,136014
-137027,PUMP-0204,136014
-137028,PUMP-0205,136015
-137029,PUMP-0206,136015
-137030,PUMP-0207,136016
-137031,PUMP-0208,136016
-137032,PUMP-0209,136017
-137033,PUMP-0210,136017
-137034,PUMP-0211,136018
-137035,PUMP-0212,136018
+id,name,pool_id,station_id
+137001,PUMP-0101,136001,104001
+137002,PUMP-0102,136001,104001
+137003,PUMP-0103,136002,104001
+137004,PUMP-0104,136002,104001
+137005,PUMP-0105,136003,104001
+137006,PUMP-0106,136003,104001
+137007,PUMP-0107,136004,104001
+137008,PUMP-0108,136004,104001
+137009,PUMP-0109,136005,104001
+137010,PUMP-0110,136005,104001
+137011,PUMP-0111,136006,104001
+137012,PUMP-0112,136006,104001
+137013,PUMP-0201,136007,104002
+137014,PUMP-0202,136007,104002
+137015,PUMP-0203,136008,104002
+137016,PUMP-0204,136008,104002
+137017,PUMP-0205,136009,104002
+137018,PUMP-0206,136009,104002
+137019,PUMP-0207,136010,104002
+137020,PUMP-0208,136010,104002
+137021,PUMP-0209,136011,104002
+137022,PUMP-0210,136011,104002
+137023,PUMP-0211,136012,104002
+137024,PUMP-0212,136012,104002
+137025,PUMP-0201,136013,104003
+137026,PUMP-0202,136013,104003
+137027,PUMP-0203,136014,104003
+137027,PUMP-0204,136014,104003
+137028,PUMP-0205,136015,104003
+137029,PUMP-0206,136015,104003
+137030,PUMP-0207,136016,104003
+137031,PUMP-0208,136016,104003
+137032,PUMP-0209,136017,104003
+137033,PUMP-0210,136017,104003
+137034,PUMP-0211,136018,104003
+137035,PUMP-0212,136018,104003