Просмотр исходного кода

chore(database): 修改数据库表的schema配置

- 将alarm_warning_rel表的schema从public改为app_user
- 将equipment_base表的schema从public改为app_user
- 将case_info表的schema从public改为app_user
- 将dis_event_grade表的schema从public改为app_user
- 将dis_event_plan表的schema从public改为app_user
- 将dis_event_report表的schema从public改为app_user
- 将dis_event_track表的schema从public改为app_user
- 将dis_event_track_log表的schema从public改为app_user
- 将dis_event_transfer表的schema从public改为app_user
- 将dis_event_transfer_log表的schema从public改为app_user
- 将dis_event_urge表的schema从public改为app_user
- 将dis_event_urge_detail表的schema从public改为app_user
- 将dis_event_verify表的schema从public改为app_user
- 将dis_plan_approval表的schema从public改为app_user
- 将dis_plan_approval_step表的schema从public改为app_user
- 将dis_plan_category表的schema从public改为app_user
- 将psgw_drainage_partition表的schema从public改为app_user
- 将early_warning表的schema从public改为app_user
- 将drill_course表的schema从public改为app_user
- 将drill_plan表的schema从public改为app_user
- 将drill_practical_plan表的schema从public改为app_user
- 将drill_practical_result表的schema从public改为app_user
- 将drill_practical_template表的schema从public改为app_user
- 将drill_simulation_event表的schema从public改为app_user
- 将drill_simulation_log表的schema从public改为app_user
- 将drill_simulation_project表的schema从public改为app_user
- 将drill_simulation_result表的schema从public改为app_user
- 将drill_simulation_role表的schema从public改为app_user
- 将drill_simulation_scene表的schema从public改为app_user
- 将drill_simulation_task表的schema从public改为app_user
- 将psgw_engineering_facility表的schema从public改为app_user
- 将equipment_maintain表的schema从public改为app_user
- 将equipment_point_rel表的schema从public改为app_user
- 将equipment_status表的schema从public改为app_user
- 将equipment_test表的schema从public改为app_user
- 将equipment_type表的schema从public改为app_user
- 将e_real_time_data表的schema从public改为app_user
- 将firefighting_pressure表的schema从public改为app_user
- 将gas_monitor_data表的schema从public改为app_user
- 将gas_pipe_point表的schema从public改为app_user
- 将gas_pipe_point_device_rel表的schema从public改为app_user
- 将hazard_hidden_account表的schema从public改为app_user
- 为EquipmentStatusService添加根据设备编码查询设备状态的方法
- 实现EquipmentStatusService根据设备编码查询设备状态的具体逻辑
林仔 1 месяц назад
Родитель
Сommit
990b42a400
99 измененных файлов с 141 добавлено и 97 удалено
  1. 1 1
      audio-service/src/main/java/com/zksy/audio/domain/NoiseInfo.java
  2. 1 1
      environment-service/src/main/java/com/zksy/environment/domain/ERealTimeData.java
  3. 1 1
      firefighting-pressure-service/src/main/java/com/zksy/pressure/domain/FirefightingPressure.java
  4. 1 1
      flammable-gas-service/src/main/java/com/zksy/gas/domain/GasMonitorData.java
  5. 1 1
      manhole-service/src/main/java/com/zksy/manhole/domain/BaseDevicesManhole.java
  6. 1 1
      manhole-service/src/main/java/com/zksy/manhole/domain/EquipmentStatusManhole.java
  7. 1 1
      manhole-service/src/main/java/com/zksy/manhole/domain/ManholeData.java
  8. 7 1
      pipe-network-service/zksy-admin/pom.xml
  9. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterPipeInfo/domain/WaterPipeInfo.java
  10. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterPlantInfo/domain/WaterPlantInfo.java
  11. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterPumpStation/domain/WaterPumpStation.java
  12. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterSourceInfo/domain/WaterSourceInfo.java
  13. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterUserInfo/domain/WaterUserInfo.java
  14. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/audio/domain/NoiseInfo.java
  15. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/CaseInfo.java
  16. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillCourse.java
  17. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillPlan.java
  18. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillPracticalPlan.java
  19. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillPracticalResult.java
  20. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillPracticalTemplate.java
  21. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationEvent.java
  22. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationLog.java
  23. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationProject.java
  24. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationResult.java
  25. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationRole.java
  26. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationScene.java
  27. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationTask.java
  28. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentMaintain.java
  29. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentPointRel.java
  30. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentStatus.java
  31. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentTest.java
  32. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentType.java
  33. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/GasPipePoint.java
  34. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/GasPipePointDeviceRel.java
  35. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/HazardHiddenAccount.java
  36. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/MaintenanceDataStat.java
  37. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/MaintenanceTask.java
  38. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/MaintenanceTaskDetail.java
  39. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/ManholeBase.java
  40. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/ManholeDeviceRel.java
  41. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/MonitorPoint.java
  42. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/PipeNetworkBase.java
  43. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/PipeRepairRecord.java
  44. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/RiskAssessment.java
  45. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/StationVideoDevice.java
  46. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/TerminalFault.java
  47. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/WorkOrder.java
  48. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/WorkOrderLog.java
  49. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/environment/domain/ERealTimeData.java
  50. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/gas/domain/GasMonitorData.java
  51. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/manhole/domain/ManholeData.java
  52. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/radar/domain/RadarData.java
  53. 10 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/EquipmentStatusService.java
  54. 28 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/EquipmentStatusServiceImpl.java
  55. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/telemetry/domain/TelemetryData.java
  56. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/AlarmWarningRel.java
  57. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/WarningArchive.java
  58. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/WarningAttachment.java
  59. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/WarningDisposal.java
  60. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/WarningItem.java
  61. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/WarningReason.java
  62. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/WarningTodo.java
  63. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/water/domain/WaterMonitorData.java
  64. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventGrade.java
  65. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventPlan.java
  66. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventReport.java
  67. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventTrack.java
  68. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventTrackLog.java
  69. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventTransfer.java
  70. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventTransferLog.java
  71. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventUrge.java
  72. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventUrgeDetail.java
  73. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventVerify.java
  74. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisPlanApproval.java
  75. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisPlanApprovalStep.java
  76. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisPlanCategory.java
  77. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/drainage/domain/DrainagePartition.java
  78. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/drainage/domain/DrainageWarning.java
  79. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/drainage/domain/EngineeringFacility.java
  80. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/drainage/domain/PipeNetworkInfo.java
  81. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/drainage/domain/WarningScopeUser.java
  82. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/drainage/domain/WaterloggingPoint.java
  83. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysConfig.java
  84. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysLogininfor.java
  85. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysNotice.java
  86. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysOperLog.java
  87. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysPost.java
  88. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysRoleDept.java
  89. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysRoleMenu.java
  90. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysUserPost.java
  91. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysUserRole.java
  92. 1 1
      radar-service/src/main/java/com/zksy/radar/domain/RadarData.java
  93. 1 1
      telemetry-service/src/main/java/com/zksy/telemetry/domain/TelemetryData.java
  94. 1 1
      water-level-service/src/main/java/com/zksy/water/domain/WaterMonitorData.java
  95. 1 1
      zk-api-service/src/main/java/com/zksy/api/domain/CaseInfo.java
  96. 1 1
      zk-api-service/src/main/java/com/zksy/api/domain/EquipmentBase.java
  97. 1 1
      zk-api-service/src/main/java/com/zksy/api/domain/EquipmentStatus.java
  98. 1 1
      zk-api-service/src/main/java/com/zksy/api/domain/WorkOrder.java
  99. 1 1
      zk-api-service/src/main/java/com/zksy/api/domain/WorkOrderLog.java

+ 1 - 1
audio-service/src/main/java/com/zksy/audio/domain/NoiseInfo.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * 噪音信息表
  * @TableName noise_info
  */
-@TableName(value = "noise_info", schema = "public")
+@TableName(value = "noise_info", schema = "app_user")
 @Data
 public class NoiseInfo implements Serializable {
     /**

+ 1 - 1
environment-service/src/main/java/com/zksy/environment/domain/ERealTimeData.java

@@ -15,7 +15,7 @@ import lombok.Data;
  * 环境实时数据
  * @TableName e_real_time_data
  */
-@TableName(value = "e_real_time_data", schema = "public")
+@TableName(value = "e_real_time_data", schema = "app_user")
 @Data
 public class ERealTimeData implements Serializable {
     /**

+ 1 - 1
firefighting-pressure-service/src/main/java/com/zksy/pressure/domain/FirefightingPressure.java

@@ -13,7 +13,7 @@ import lombok.Data;
  * 消防压力表
  * @TableName firefighting_pressure
  */
-@TableName(value = "firefighting_pressure", schema = "public")
+@TableName(value = "firefighting_pressure", schema = "app_user")
 @Data
 public class FirefightingPressure implements Serializable {
     /**

+ 1 - 1
flammable-gas-service/src/main/java/com/zksy/gas/domain/GasMonitorData.java

@@ -17,7 +17,7 @@ import lombok.Data;
  * 可燃气体监测仪数据表
  * @TableName gas_monitor_data
  */
-@TableName(value = "gas_monitor_data", schema = "public")
+@TableName(value = "gas_monitor_data", schema = "app_user")
 @Data
 public class GasMonitorData implements Serializable {
     /**

+ 1 - 1
manhole-service/src/main/java/com/zksy/manhole/domain/BaseDevicesManhole.java

@@ -18,7 +18,7 @@ import java.util.Date;
  * 设备基础信息
  * @TableName base_devices
  */
-@TableName(value = "equipment_base", schema = "public")
+@TableName(value = "equipment_base", schema = "app_user")
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "设备基础信息")

+ 1 - 1
manhole-service/src/main/java/com/zksy/manhole/domain/EquipmentStatusManhole.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "equipment_status", schema = "public")
+@TableName(value = "equipment_status", schema = "app_user")
 public class EquipmentStatusManhole {
 
     @TableId(value = "status_id", type = IdType.ASSIGN_UUID)

+ 1 - 1
manhole-service/src/main/java/com/zksy/manhole/domain/ManholeData.java

@@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 @Data
-@TableName(value = "jg_device_data", schema = "public")
+@TableName(value = "jg_device_data", schema = "app_user")
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "读取井盖数据")
 public class ManholeData {

+ 7 - 1
pipe-network-service/zksy-admin/pom.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -124,6 +124,12 @@
             <version>0.12.0</version>
         </dependency>
 
+        <!-- WebSocket -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
         <!-- 阿里云短信服务 -->
         <dependency>
             <groupId>com.aliyun</groupId>

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterPipeInfo/domain/WaterPipeInfo.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
  * 管网信息实体
  */
 @Data
-@TableName(value = "water_pipe_info", schema = "public")
+@TableName(value = "water_pipe_info", schema = "app_user")
 @ApiModel(value = "WaterPipeInfo", description = "管网信息对象")
 public class WaterPipeInfo {
 

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterPlantInfo/domain/WaterPlantInfo.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
  * 水厂信息实体
  */
 @Data
-@TableName(value = "water_plant_info", schema = "public")
+@TableName(value = "water_plant_info", schema = "app_user")
 @ApiModel(
         value = "WaterPlantInfo",
         description = "水厂信息对象,包含供水水厂的所有基础属性"

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterPumpStation/domain/WaterPumpStation.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
  * 泵站信息实体
  */
 @Data
-@TableName(value = "water_pump_station", schema = "public")
+@TableName(value = "water_pump_station", schema = "app_user")
 @ApiModel(
         value = "WaterPumpStation",
         description = "泵站信息对象,包含供水泵站的所有基础属性"

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterSourceInfo/domain/WaterSourceInfo.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
  * 水源地信息实体
  */
 @Data
-@TableName(value = "water_source_info", schema = "public")
+@TableName(value = "water_source_info", schema = "app_user")
 @ApiModel(
         value = "WaterSourceInfo",
         description = "水源地信息对象,包含水源地基础属性"

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterUserInfo/domain/WaterUserInfo.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
  * 用水户信息实体
  */
 @Data
-@TableName(value = "water_user_info", schema = "public")
+@TableName(value = "water_user_info", schema = "app_user")
 @ApiModel(
         value = "WaterUserInfo",
         description = "用水户信息对象,包含用水户基础属性"

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/audio/domain/NoiseInfo.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * 音频信息表
  * @TableName noise_info
  */
-@TableName(value = "noise_info", schema = "public")
+@TableName(value = "noise_info", schema = "app_user")
 @Data
 public class NoiseInfo implements Serializable {
     /**

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/CaseInfo.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * 案件信息表
  * @TableName case_info
  */
-@TableName(value = "case_info", schema = "public")
+@TableName(value = "case_info", schema = "app_user")
 @Data
 @ApiModel(value = "案件信息入参", description = "案件信息入参")
 public class CaseInfo implements Serializable {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillCourse.java

@@ -10,7 +10,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
-@TableName(value = "drill_course", schema = "public")
+@TableName(value = "drill_course", schema = "app_user")
 public class DrillCourse implements Serializable {
     private static final long serialVersionUID = 1L;
     @TableId(type = IdType.AUTO) private Long id;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillPlan.java

@@ -10,7 +10,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
-@TableName(value = "drill_plan", schema = "public")
+@TableName(value = "drill_plan", schema = "app_user")
 public class DrillPlan implements Serializable {
     private static final long serialVersionUID = 1L;
     @TableId(type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillPracticalPlan.java

@@ -2,7 +2,7 @@ package com.zksy.base.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import java.io.Serializable; import java.time.*;
-@Data @TableName(value = "drill_practical_plan", schema = "public")
+@Data @TableName(value = "drill_practical_plan", schema = "app_user")
 public class DrillPracticalPlan implements Serializable {
     @TableId(type=IdType.AUTO) private Long id;
     private String name; private String category; private String target; private String project;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillPracticalResult.java

@@ -2,7 +2,7 @@ package com.zksy.base.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import java.io.Serializable; import java.time.*;
-@Data @TableName(value = "drill_practical_result", schema = "public")
+@Data @TableName(value = "drill_practical_result", schema = "app_user")
 public class DrillPracticalResult implements Serializable {
     @TableId(type=IdType.AUTO) private Long id; private Long planId;
     private String taskCompletionRate; private String responseTimeScore; private String collaborationScore;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillPracticalTemplate.java

@@ -2,7 +2,7 @@ package com.zksy.base.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import java.io.Serializable; import java.time.*;
-@Data @TableName(value = "drill_practical_template", schema = "public")
+@Data @TableName(value = "drill_practical_template", schema = "app_user")
 public class DrillPracticalTemplate implements Serializable {
     @TableId(type=IdType.AUTO) private Long id;
     private String name; private String category; private String content;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationEvent.java

@@ -2,7 +2,7 @@ package com.zksy.base.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import java.io.Serializable; import java.time.*;
-@Data @TableName(value = "drill_simulation_event", schema = "public")
+@Data @TableName(value = "drill_simulation_event", schema = "app_user")
 public class DrillSimulationEvent implements Serializable {
     @TableId(type=IdType.AUTO) private Long id; private Long projectId;
     private String name; private String description; private LocalDateTime createTime;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationLog.java

@@ -2,7 +2,7 @@ package com.zksy.base.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import java.io.Serializable; import java.time.*;
-@Data @TableName(value = "drill_simulation_log", schema = "public")
+@Data @TableName(value = "drill_simulation_log", schema = "app_user")
 public class DrillSimulationLog implements Serializable {
     @TableId(type=IdType.AUTO) private Long id; private Long projectId;
     private String action; private String content; private LocalDateTime logTime;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationProject.java

@@ -2,7 +2,7 @@ package com.zksy.base.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import java.io.Serializable; import java.time.*;
-@Data @TableName(value = "drill_simulation_project", schema = "public")
+@Data @TableName(value = "drill_simulation_project", schema = "app_user")
 public class DrillSimulationProject implements Serializable {
     @TableId(type=IdType.AUTO) private Long id;
     private String name; private String category; private LocalDate createDate; private LocalDateTime createTime;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationResult.java

@@ -2,7 +2,7 @@ package com.zksy.base.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import java.io.Serializable; import java.time.*;
-@Data @TableName(value = "drill_simulation_result", schema = "public")
+@Data @TableName(value = "drill_simulation_result", schema = "app_user")
 public class DrillSimulationResult implements Serializable {
     @TableId(type=IdType.AUTO) private Long id; private Long projectId;
     private String taskCompletionRate; private String avgResponseTime; private String emergencyLevel;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationRole.java

@@ -2,7 +2,7 @@ package com.zksy.base.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import java.io.Serializable; import java.time.*;
-@Data @TableName(value = "drill_simulation_role", schema = "public")
+@Data @TableName(value = "drill_simulation_role", schema = "app_user")
 public class DrillSimulationRole implements Serializable {
     @TableId(type=IdType.AUTO) private Long id; private Long projectId;
     private String name; private String roleType; private String skills; private String equipment; private LocalDateTime createTime;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationScene.java

@@ -2,7 +2,7 @@ package com.zksy.base.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import java.io.Serializable;
-@Data @TableName(value = "drill_simulation_scene", schema = "public")
+@Data @TableName(value = "drill_simulation_scene", schema = "app_user")
 public class DrillSimulationScene implements Serializable {
     @TableId(type=IdType.AUTO) private Long id; private Long projectId;
     private String tagName; private Integer isActive;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/DrillSimulationTask.java

@@ -2,7 +2,7 @@ package com.zksy.base.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import java.io.Serializable; import java.time.*;
-@Data @TableName(value = "drill_simulation_task", schema = "public")
+@Data @TableName(value = "drill_simulation_task", schema = "app_user")
 public class DrillSimulationTask implements Serializable {
     @TableId(type=IdType.AUTO) private Long id; private Long projectId;
     private String name; private String description; private Long bindRoleId; private LocalDateTime createTime;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentMaintain.java

@@ -13,7 +13,7 @@ import java.util.Date;
 /**
  * 设备维护记录表
  */
-@TableName(value = "equipment_maintain", schema = "public")
+@TableName(value = "equipment_maintain", schema = "app_user")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentPointRel.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "equipment_point_rel", schema = "public")
+@TableName(value = "equipment_point_rel", schema = "app_user")
 public class EquipmentPointRel {
 
 

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentStatus.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "equipment_status", schema = "public")
+@TableName(value = "equipment_status", schema = "app_user")
 public class EquipmentStatus {
 
     /**

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentTest.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "equipment_test", schema = "public")
+@TableName(value = "equipment_test", schema = "app_user")
 public class EquipmentTest {
 
     @TableId(value = "test_id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentType.java

@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "equipment_type", schema = "public")
+@TableName(value = "equipment_type", schema = "app_user")
 public class EquipmentType {
 
     @TableId(value = "id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/GasPipePoint.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "gas_pipe_point", schema = "public")
+@TableName(value = "gas_pipe_point", schema = "app_user")
 public class GasPipePoint {
 
     @TableId(value = "point_id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/GasPipePointDeviceRel.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "gas_pipe_point_device_rel", schema = "public")
+@TableName(value = "gas_pipe_point_device_rel", schema = "app_user")
 public class GasPipePointDeviceRel {
 
     @TableId(value = "rel_id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/HazardHiddenAccount.java

@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "hazard_hidden_account", schema = "public")
+@TableName(value = "hazard_hidden_account", schema = "app_user")
 public class HazardHiddenAccount {
 
     @TableId(value = "hazard_id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/MaintenanceDataStat.java

@@ -17,7 +17,7 @@ import java.util.Date;
  * 运维数据统计表
  * @TableName maintenance_data_stat
  */
-@TableName(value = "maintenance_data_stat", schema = "public")
+@TableName(value = "maintenance_data_stat", schema = "app_user")
 @Data
 @ApiModel(value = "运维数据统计入参", description = "运维数据统计入参")
 public class MaintenanceDataStat implements Serializable {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/MaintenanceTask.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * 运维任务主表
  * @TableName maintenance_task
  */
-@TableName(value = "maintenance_task", schema = "public")
+@TableName(value = "maintenance_task", schema = "app_user")
 @Data
 @ApiModel(value = "运维任务入参", description = "运维任务入参")
 public class MaintenanceTask implements Serializable {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/MaintenanceTaskDetail.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * 运维任务明细表
  * @TableName maintenance_task_detail
  */
-@TableName(value = "maintenance_task_detail", schema = "public")
+@TableName(value = "maintenance_task_detail", schema = "app_user")
 @Data
 @ApiModel(value = "运维任务明细入参", description = "运维任务明细入参")
 public class MaintenanceTaskDetail implements Serializable {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/ManholeBase.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "manhole_base", schema = "public")
+@TableName(value = "manhole_base", schema = "app_user")
 public class ManholeBase {
 
     @TableId(value = "manhole_id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/ManholeDeviceRel.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "manhole_device_rel", schema = "public")
+@TableName(value = "manhole_device_rel", schema = "app_user")
 public class ManholeDeviceRel {
 
     @TableId(value = "rel_id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/MonitorPoint.java

@@ -20,7 +20,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "monitor_point", schema = "public")
+@TableName(value = "monitor_point", schema = "app_user")
 public class MonitorPoint {
 
     @TableId(value = "point_id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/PipeNetworkBase.java

@@ -20,7 +20,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "pipe_network_base", schema = "public")
+@TableName(value = "pipe_network_base", schema = "app_user")
 public class PipeNetworkBase {
 
     @TableId(value = "network_id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/PipeRepairRecord.java

@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "pipe_repair_record", schema = "public")
+@TableName(value = "pipe_repair_record", schema = "app_user")
 public class PipeRepairRecord {
 
     @TableId(value = "repair_id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/RiskAssessment.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "risk_assessment", schema = "public")
+@TableName(value = "risk_assessment", schema = "app_user")
 public class RiskAssessment {
 
     @TableId(value = "risk_id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/StationVideoDevice.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "station_video_device", schema = "public")
+@TableName(value = "station_video_device", schema = "app_user")
 public class StationVideoDevice {
 
     @TableId(value = "video_id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/TerminalFault.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * 终端故障表
  * @TableName terminal_fault
  */
-@TableName(value = "terminal_fault", schema = "public")
+@TableName(value = "terminal_fault", schema = "app_user")
 @Data
 @ApiModel(value = "终端故障入参", description = "终端故障入参")
 public class TerminalFault implements Serializable {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/WorkOrder.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * 运维工单表
  * @TableName work_order
  */
-@TableName(value = "work_order", schema = "public")
+@TableName(value = "work_order", schema = "app_user")
 @Data
 @ApiModel(value = "运维工单入参", description = "运维工单入参")
 public class WorkOrder implements Serializable {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/WorkOrderLog.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * 工单操作日志表
  * @TableName work_order_log
  */
-@TableName(value = "work_order_log", schema = "public")
+@TableName(value = "work_order_log", schema = "app_user")
 @Data
 @ApiModel(value = "工单操作日志入参", description = "工单操作日志入参")
 public class WorkOrderLog implements Serializable {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/environment/domain/ERealTimeData.java

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
  * 环境实时数据
  * @TableName e_real_time_data
  */
-@TableName(value = "e_real_time_data", schema = "public")
+@TableName(value = "e_real_time_data", schema = "app_user")
 @Data
 public class ERealTimeData implements Serializable {
     /**

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/gas/domain/GasMonitorData.java

@@ -17,7 +17,7 @@ import java.util.Map;
  * 可燃气体监测仪数据表
  * @TableName gas_monitor_data
  */
-@TableName(value = "gas_monitor_data", schema = "public")
+@TableName(value = "gas_monitor_data", schema = "app_user")
 @Data
 public class GasMonitorData implements Serializable {
     /**

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/manhole/domain/ManholeData.java

@@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 @Data
-@TableName(value = "jg_device_data", schema = "public")
+@TableName(value = "jg_device_data", schema = "app_user")
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "读取井盖数据")
 public class ManholeData {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/radar/domain/RadarData.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * 平升雷达流量计数据表
  * @TableName radar_data
  */
-@TableName(value = "radar_data", schema = "public")
+@TableName(value = "radar_data", schema = "app_user")
 @Data
 public class RadarData implements Serializable {
     /**

+ 10 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/EquipmentStatusService.java

@@ -39,4 +39,14 @@ public interface EquipmentStatusService extends IService<EquipmentStatus> {
      * @return
      */
     boolean updateDeviceStatus(EquipmentStatusInDTO inDTO);
+
+    /**
+     * 根据设备编码(deviceCode)查询设备状态
+     * <p>
+     * 先通过 equipment_base 表找到 equipmentId,再查询 equipment_status 表。
+     *
+     * @param deviceCode 设备编码
+     * @return 设备状态,未找到返回 null
+     */
+    EquipmentStatus getByDeviceCode(String deviceCode);
 }

+ 28 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/EquipmentStatusServiceImpl.java

@@ -229,4 +229,32 @@ public class EquipmentStatusServiceImpl extends ServiceImpl<EquipmentStatusMappe
                 .update();
         return update;
     }
+
+    /**
+     * 根据设备编码(deviceCode)查询设备状态
+     * <p>
+     * 先通过 equipment_base 表找到 equipmentId,再查询 equipment_status 表。
+     *
+     * @param deviceCode 设备编码
+     * @return 设备状态,未找到返回 null
+     */
+    @Override
+    public EquipmentStatus getByDeviceCode(String deviceCode) {
+        LambdaQueryWrapper<EquipmentBase> baseWrapper = new LambdaQueryWrapper<>();
+        baseWrapper.eq(EquipmentBase::getEquipmentCode, deviceCode);
+        EquipmentBase equipmentBase = equipmentBaseMapper.selectOne(baseWrapper);
+
+        if (equipmentBase == null) {
+            log.warn("未找到设备: deviceCode={}", deviceCode);
+            return null;
+        }
+
+        LambdaQueryWrapper<EquipmentStatus> statusWrapper = new LambdaQueryWrapper<>();
+        statusWrapper.eq(EquipmentStatus::getEquipmentId, equipmentBase.getEquipmentId());
+        EquipmentStatus status = this.getOne(statusWrapper);
+
+        log.info("根据设备编码查询状态: deviceCode={}, equipmentId={}, found={}",
+                deviceCode, equipmentBase.getEquipmentId(), status != null);
+        return status;
+    }
 }

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/telemetry/domain/TelemetryData.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * 平升遥测终端协议数据表
  * @TableName telemetry_data
  */
-@TableName(value = "telemetry_data", schema = "public")
+@TableName(value = "telemetry_data", schema = "app_user")
 @Data
 public class TelemetryData implements Serializable {
     /**

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/AlarmWarningRel.java

@@ -12,7 +12,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-@TableName(value = "alarm_warning_rel", schema = "public")
+@TableName(value = "alarm_warning_rel", schema = "app_user")
 @Api("报警预警关联表")
 @Data
 public class AlarmWarningRel implements Serializable {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/WarningArchive.java

@@ -12,7 +12,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-@TableName(value = "warning_archive", schema = "public")
+@TableName(value = "warning_archive", schema = "app_user")
 @Api(value = "预警归档")
 @Data
 public class WarningArchive implements Serializable {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/WarningAttachment.java

@@ -12,7 +12,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-@TableName(value = "warning_attachment", schema = "public")
+@TableName(value = "warning_attachment", schema = "app_user")
 @Api("预警附件")
 @Data
 public class WarningAttachment implements Serializable {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/WarningDisposal.java

@@ -12,7 +12,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-@TableName(value = "warning_disposal", schema = "public")
+@TableName(value = "warning_disposal", schema = "app_user")
 @Api(value = "预警处置记录")
 @Data
 public class WarningDisposal implements Serializable {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/WarningItem.java

@@ -11,7 +11,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-@TableName(value = "warning_item", schema = "public")
+@TableName(value = "warning_item", schema = "app_user")
 @Data
 public class WarningItem implements Serializable {
 

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/WarningReason.java

@@ -11,7 +11,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-@TableName(value = "warning_reason", schema = "public")
+@TableName(value = "warning_reason", schema = "app_user")
 @Data
 public class WarningReason implements Serializable {
 

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/warning/domain/WarningTodo.java

@@ -12,7 +12,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-@TableName(value = "warning_todo", schema = "public")
+@TableName(value = "warning_todo", schema = "app_user")
 @Api(tags = "预警待办")
 @Data
 public class WarningTodo implements Serializable {

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/water/domain/WaterMonitorData.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * 水位监测数据记录表
  * @TableName water_monitor_data
  */
-@TableName(value = "water_monitor_data", schema = "public")
+@TableName(value = "water_monitor_data", schema = "app_user")
 @Data
 public class WaterMonitorData implements Serializable {
     /**

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventGrade.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_event_grade", schema = "public")
+@TableName(value = "dis_event_grade", schema = "app_user")
 public class DisEventGrade {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventPlan.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_event_plan", schema = "public")
+@TableName(value = "dis_event_plan", schema = "app_user")
 public class DisEventPlan {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventReport.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_event_report", schema = "public")
+@TableName(value = "dis_event_report", schema = "app_user")
 public class DisEventReport {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventTrack.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_event_track", schema = "public")
+@TableName(value = "dis_event_track", schema = "app_user")
 public class DisEventTrack {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventTrackLog.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_event_track_log", schema = "public")
+@TableName(value = "dis_event_track_log", schema = "app_user")
 public class DisEventTrackLog {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventTransfer.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_event_transfer", schema = "public")
+@TableName(value = "dis_event_transfer", schema = "app_user")
 public class DisEventTransfer {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventTransferLog.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_event_transfer_log", schema = "public")
+@TableName(value = "dis_event_transfer_log", schema = "app_user")
 public class DisEventTransferLog {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventUrge.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_event_urge", schema = "public")
+@TableName(value = "dis_event_urge", schema = "app_user")
 public class DisEventUrge {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventUrgeDetail.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_event_urge_detail", schema = "public")
+@TableName(value = "dis_event_urge_detail", schema = "app_user")
 public class DisEventUrgeDetail {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisEventVerify.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_event_verify", schema = "public")
+@TableName(value = "dis_event_verify", schema = "app_user")
 public class DisEventVerify {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisPlanApproval.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_plan_approval", schema = "public")
+@TableName(value = "dis_plan_approval", schema = "app_user")
 public class DisPlanApproval {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisPlanApprovalStep.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_plan_approval_step", schema = "public")
+@TableName(value = "dis_plan_approval_step", schema = "app_user")
 public class DisPlanApprovalStep {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/dispatch/domain/DisPlanCategory.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "dis_plan_category", schema = "public")
+@TableName(value = "dis_plan_category", schema = "app_user")
 public class DisPlanCategory {
 
     @TableId(value = "id", type = IdType.AUTO)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/drainage/domain/DrainagePartition.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "psgw_drainage_partition", schema = "public")
+@TableName(value = "psgw_drainage_partition", schema = "app_user")
 public class DrainagePartition {
 
     @TableId(value = "id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/drainage/domain/DrainageWarning.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "early_warning", schema = "public")
+@TableName(value = "early_warning", schema = "app_user")
 public class DrainageWarning {
 
     @TableId(value = "warning_id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/drainage/domain/EngineeringFacility.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "psgw_engineering_facility", schema = "public")
+@TableName(value = "psgw_engineering_facility", schema = "app_user")
 public class EngineeringFacility {
 
     @TableId(value = "id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/drainage/domain/PipeNetworkInfo.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "psgw_pipe_network_info", schema = "public")
+@TableName(value = "psgw_pipe_network_info", schema = "app_user")
 public class PipeNetworkInfo {
 
     @TableId(value = "id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/drainage/domain/WarningScopeUser.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "psgw_warning_scope_user", schema = "public")
+@TableName(value = "psgw_warning_scope_user", schema = "app_user")
 @ApiModel("预警接收人员")
 public class WarningScopeUser {
 

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/drainage/domain/WaterloggingPoint.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "psgw_waterlogging_point", schema = "public")
+@TableName(value = "psgw_waterlogging_point", schema = "app_user")
 public class WaterloggingPoint {
 
     @TableId(value = "id", type = IdType.ASSIGN_UUID)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysConfig.java

@@ -17,7 +17,7 @@ import com.zksy.common.core.domain.BaseEntity;
  * 
  * @author zksy
  */
-@TableName(value = "sys_config", schema = "public")
+@TableName(value = "sys_config", schema = "app_user")
 public class SysConfig extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysLogininfor.java

@@ -15,7 +15,7 @@ import com.zksy.common.core.domain.BaseEntity;
  * 
  * @author zksy
  */
-@TableName(value = "sys_logininfor", schema = "public")
+@TableName(value = "sys_logininfor", schema = "app_user")
 public class SysLogininfor extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysNotice.java

@@ -16,7 +16,7 @@ import com.zksy.common.xss.Xss;
  * 
  * @author zksy
  */
-@TableName(value = "sys_notice", schema = "public")
+@TableName(value = "sys_notice", schema = "app_user")
 public class SysNotice extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysOperLog.java

@@ -15,7 +15,7 @@ import com.zksy.common.core.domain.BaseEntity;
  * 
  * @author zksy
  */
-@TableName(value = "sys_oper_log", schema = "public")
+@TableName(value = "sys_oper_log", schema = "app_user")
 public class SysOperLog extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysPost.java

@@ -16,7 +16,7 @@ import com.zksy.common.core.domain.BaseEntity;
  * 
  * @author zksy
  */
-@TableName(value = "sys_post", schema = "public")
+@TableName(value = "sys_post", schema = "app_user")
 public class SysPost extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysRoleDept.java

@@ -9,7 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 
  * @author zksy
  */
-@TableName(value = "sys_role_dept", schema = "public")
+@TableName(value = "sys_role_dept", schema = "app_user")
 public class SysRoleDept
 {
     /** 角色ID */

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysRoleMenu.java

@@ -9,7 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 
  * @author zksy
  */
-@TableName(value = "sys_role_menu", schema = "public")
+@TableName(value = "sys_role_menu", schema = "app_user")
 public class SysRoleMenu
 {
     /** 角色ID */

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysUserPost.java

@@ -9,7 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 
  * @author zksy
  */
-@TableName(value = "sys_user_post", schema = "public")
+@TableName(value = "sys_user_post", schema = "app_user")
 public class SysUserPost
 {
     /** 用户ID */

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/system/domain/SysUserRole.java

@@ -9,7 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 
  * @author zksy
  */
-@TableName(value = "sys_user_role", schema = "public")
+@TableName(value = "sys_user_role", schema = "app_user")
 public class SysUserRole
 {
     /** 用户ID */

+ 1 - 1
radar-service/src/main/java/com/zksy/radar/domain/RadarData.java

@@ -14,7 +14,7 @@ import lombok.Data;
  * 平升雷达流量计数据表
  * @TableName radar_data
  */
-@TableName(value = "radar_data", schema = "public")
+@TableName(value = "radar_data", schema = "app_user")
 @Data
 public class RadarData implements Serializable {
     /**

+ 1 - 1
telemetry-service/src/main/java/com/zksy/telemetry/domain/TelemetryData.java

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
  * 平升遥测终端协议表
  * @TableName telemetry_data
  */
-@TableName(value = "telemetry_data", schema = "public")
+@TableName(value = "telemetry_data", schema = "app_user")
 @Data
 public class TelemetryData implements Serializable {
     /**

+ 1 - 1
water-level-service/src/main/java/com/zksy/water/domain/WaterMonitorData.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * 水位监测数据记录表
  * @TableName water_monitor_data
  */
-@TableName(value = "water_monitor_data", schema = "public")
+@TableName(value = "water_monitor_data", schema = "app_user")
 @Data
 public class WaterMonitorData implements Serializable {
     /**

+ 1 - 1
zk-api-service/src/main/java/com/zksy/api/domain/CaseInfo.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * 案件信息表
  * @TableName case_info
  */
-@TableName(value = "case_info", schema = "public")
+@TableName(value = "case_info", schema = "app_user")
 @Data
 @ApiModel(value = "案件信息入参", description = "案件信息入参")
 public class CaseInfo implements Serializable {

+ 1 - 1
zk-api-service/src/main/java/com/zksy/api/domain/EquipmentBase.java

@@ -19,7 +19,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "equipment_base", schema = "public")
+@TableName(value = "equipment_base", schema = "app_user")
 public class EquipmentBase {
 
     @TableId(value = "equipment_id", type = IdType.ASSIGN_UUID)

+ 1 - 1
zk-api-service/src/main/java/com/zksy/api/domain/EquipmentStatus.java

@@ -14,7 +14,7 @@ import java.util.Date;
  * 设备状态表(zk-api-service 轻量版)
  */
 @Data
-@TableName(value = "equipment_status", schema = "public")
+@TableName(value = "equipment_status", schema = "app_user")
 public class EquipmentStatus {
 
     @TableId(value = "status_id", type = IdType.AUTO)

+ 1 - 1
zk-api-service/src/main/java/com/zksy/api/domain/WorkOrder.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * 运维工单表
  * @TableName work_order
  */
-@TableName(value = "work_order", schema = "public")
+@TableName(value = "work_order", schema = "app_user")
 @Data
 @ApiModel(value = "运维工单入参", description = "运维工单入参")
 public class WorkOrder implements Serializable {

+ 1 - 1
zk-api-service/src/main/java/com/zksy/api/domain/WorkOrderLog.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * 工单操作日志表
  * @TableName work_order_log
  */
-@TableName(value = "work_order_log", schema = "public")
+@TableName(value = "work_order_log", schema = "app_user")
 @Data
 @ApiModel(value = "工单操作日志入参", description = "工单操作日志入参")
 public class WorkOrderLog implements Serializable {