Browse Source

refactor: 全面规范化项目命名

变量名:
- weather → faultData(消除误导性命名)
- jingdu/weidu → longitude/latitude(消除中文拼音)
- jingduValue/weiduValue → longitudeValue/latitudeValue
- tdEngineshuju → tdEngineData(消除中文拼音)
- companyid → companyId
- controllername → controllerName
- tablename → tableNames

方法名(camelCase 规范化):
- selectall → selectAll
- insertfault → insertFault, updatefault → updateFault
- insertalarm → insertAlarm
- createmessage → createMessage
- selecttables → selectTables, inserttables → insertTables
- selectjingweidu → selectCoordinates(消除中文拼音)
- triggermethod → triggerMethod
- 等 40+ 个 mapper/service 方法名

类名:
- Sysrealtime → SysRealtime
- SysrealtimeMapper → SysRealtimeMapper
- SysrealtimeService → SysRealtimeService
- 所有引用同步更新
mqy20260511
humanleft 3 weeks ago
parent
commit
9ef8ad942c
41 changed files with 280 additions and 280 deletions
  1. 1
    1
      iot-platform/src/main/java/com/iot/platform/domain/SysRealtime.java
  2. 7
    7
      iot-platform/src/main/java/com/iot/platform/mapper/DynamicSqlProvider.java
  3. 1
    1
      iot-platform/src/main/java/com/iot/platform/mapper/SysAlarmMapper.java
  4. 3
    3
      iot-platform/src/main/java/com/iot/platform/mapper/SysCarMapper.java
  5. 10
    10
      iot-platform/src/main/java/com/iot/platform/mapper/SysControllerMapper.java
  6. 1
    1
      iot-platform/src/main/java/com/iot/platform/mapper/SysDeviceControlMapper.java
  7. 1
    1
      iot-platform/src/main/java/com/iot/platform/mapper/SysDeviceMapper.java
  8. 6
    6
      iot-platform/src/main/java/com/iot/platform/mapper/SysDeviceVoMapper.java
  9. 4
    4
      iot-platform/src/main/java/com/iot/platform/mapper/SysFaultMapper.java
  10. 3
    3
      iot-platform/src/main/java/com/iot/platform/mapper/SysIndicatorsMapper.java
  11. 6
    6
      iot-platform/src/main/java/com/iot/platform/mapper/SysRealtimeMapper.java
  12. 3
    3
      iot-platform/src/main/java/com/iot/platform/mapper/SysStatusMapper.java
  13. 3
    3
      iot-platform/src/main/java/com/iot/platform/mapper/SysWorkorderMapper.java
  14. 2
    2
      iot-platform/src/main/java/com/iot/platform/mqtt/MqttDynamicConsumer.java
  15. 26
    26
      iot-platform/src/main/java/com/iot/platform/mqtt/MqttFaultConsumer.java
  16. 9
    9
      iot-platform/src/main/java/com/iot/platform/mqtt/MqttGenericConsumer.java
  17. 2
    2
      iot-platform/src/main/java/com/iot/platform/service/SysAlarmService.java
  18. 6
    6
      iot-platform/src/main/java/com/iot/platform/service/SysCarService.java
  19. 20
    20
      iot-platform/src/main/java/com/iot/platform/service/SysControllerService.java
  20. 2
    2
      iot-platform/src/main/java/com/iot/platform/service/SysDeviceControlService.java
  21. 2
    2
      iot-platform/src/main/java/com/iot/platform/service/SysDeviceService.java
  22. 8
    8
      iot-platform/src/main/java/com/iot/platform/service/SysDeviceVoService.java
  23. 8
    8
      iot-platform/src/main/java/com/iot/platform/service/SysFaultService.java
  24. 6
    6
      iot-platform/src/main/java/com/iot/platform/service/SysIndicatorsService.java
  25. 15
    15
      iot-platform/src/main/java/com/iot/platform/service/SysRealtimeService.java
  26. 6
    6
      iot-platform/src/main/java/com/iot/platform/service/SysStatusService.java
  27. 4
    4
      iot-platform/src/main/java/com/iot/platform/service/SysWorkorderService.java
  28. 1
    1
      iot-platform/src/main/resources/mapper/SysAlarmMapper.xml
  29. 3
    3
      iot-platform/src/main/resources/mapper/SysCarMapper.xml
  30. 9
    9
      iot-platform/src/main/resources/mapper/SysControllerMapper.xml
  31. 1
    1
      iot-platform/src/main/resources/mapper/SysDeviceControlMapper.xml
  32. 1
    1
      iot-platform/src/main/resources/mapper/SysDeviceMapper.xml
  33. 2
    2
      iot-platform/src/main/resources/mapper/SysDeviceVoMapper.xml
  34. 4
    4
      iot-platform/src/main/resources/mapper/SysFaultMapper.xml
  35. 3
    3
      iot-platform/src/main/resources/mapper/SysIndicatorsMapper.xml
  36. 7
    7
      iot-platform/src/main/resources/mapper/SysRealtimeMapper.xml
  37. 3
    3
      iot-platform/src/main/resources/mapper/SysStatusMapper.xml
  38. 3
    3
      iot-platform/src/main/resources/mapper/SysWorkorderMapper.xml
  39. 4
    4
      iot-platform/src/test/java/com/iot/platform/mqtt/MqttDynamicConsumerTest.java
  40. 52
    52
      iot-platform/src/test/java/com/iot/platform/mqtt/MqttFaultConsumerTest.java
  41. 22
    22
      iot-platform/src/test/java/com/iot/platform/service/SysRealtimeServiceTest.java

iot-platform/src/main/java/com/iot/platform/domain/Sysrealtime.java → iot-platform/src/main/java/com/iot/platform/domain/SysRealtime.java View File

1
 package com.iot.platform.domain;
1
 package com.iot.platform.domain;
2
 
2
 
3
-public class Sysrealtime {
3
+public class SysRealtime {
4
     private String createTime;
4
     private String createTime;
5
     private String deviceId;
5
     private String deviceId;
6
     private String timestamp;
6
     private String timestamp;

+ 7
- 7
iot-platform/src/main/java/com/iot/platform/mapper/DynamicSqlProvider.java View File

30
         return value.replace("'", "''");
30
         return value.replace("'", "''");
31
     }
31
     }
32
 
32
 
33
-    public String insertdevice(Map<String, String> parameters) {
33
+    public String insertDevice(Map<String, String> parameters) {
34
         String columnName = parameters.get("columnName");
34
         String columnName = parameters.get("columnName");
35
-        String tdEngineshuju = parameters.get("value");
35
+        String tdEngineData = parameters.get("value");
36
 
36
 
37
         validateFieldName(columnName);
37
         validateFieldName(columnName);
38
 
38
 
40
         sql.append("INSERT INTO sys_device(");
40
         sql.append("INSERT INTO sys_device(");
41
         sql.append(columnName);
41
         sql.append(columnName);
42
         sql.append(") VALUES('");
42
         sql.append(") VALUES('");
43
-        sql.append(escapeValue(tdEngineshuju));
43
+        sql.append(escapeValue(tdEngineData));
44
         sql.append("')");
44
         sql.append("')");
45
         return sql.toString();
45
         return sql.toString();
46
     }
46
     }
47
 
47
 
48
-    public String updatesysdevice(Map<String, String> parameters) {
48
+    public String updateSysDevice(Map<String, String> parameters) {
49
         String columnName = parameters.get("columnName");
49
         String columnName = parameters.get("columnName");
50
-        String tdEngineshuju = parameters.get("value");
50
+        String tdEngineData = parameters.get("value");
51
 
51
 
52
         validateFieldName(columnName);
52
         validateFieldName(columnName);
53
 
53
 
55
         sql.append("UPDATE sys_device SET ");
55
         sql.append("UPDATE sys_device SET ");
56
         sql.append(columnName);
56
         sql.append(columnName);
57
         sql.append(" = '");
57
         sql.append(" = '");
58
-        sql.append(escapeValue(tdEngineshuju));
58
+        sql.append(escapeValue(tdEngineData));
59
         sql.append("' WHERE ");
59
         sql.append("' WHERE ");
60
         sql.append(columnName);
60
         sql.append(columnName);
61
         sql.append(" = '");
61
         sql.append(" = '");
62
-        sql.append(escapeValue(tdEngineshuju));
62
+        sql.append(escapeValue(tdEngineData));
63
         sql.append("'");
63
         sql.append("'");
64
         return sql.toString();
64
         return sql.toString();
65
     }
65
     }

+ 1
- 1
iot-platform/src/main/java/com/iot/platform/mapper/SysAlarmMapper.java View File

5
 
5
 
6
 @Mapper
6
 @Mapper
7
 public interface SysAlarmMapper {
7
 public interface SysAlarmMapper {
8
-    void insertalarm(@Param("tableName")String tableName,@Param("faultId")String faultId,
8
+    void insertAlarm(@Param("tableName")String tableName,@Param("faultId")String faultId,
9
                      @Param("faultdescs")String faultdescs,
9
                      @Param("faultdescs")String faultdescs,
10
                      @Param("faultstatus")String faultstatus,
10
                      @Param("faultstatus")String faultstatus,
11
                      @Param("createtime")String createtime,
11
                      @Param("createtime")String createtime,

+ 3
- 3
iot-platform/src/main/java/com/iot/platform/mapper/SysCarMapper.java View File

10
 @Mapper
10
 @Mapper
11
 public interface SysCarMapper {
11
 public interface SysCarMapper {
12
 
12
 
13
-    List<SysCar> selectcontrollerId();
13
+    List<SysCar> selectControllerId();
14
 
14
 
15
-    void updatecarposition(@Param("carPosition")String carPosition,@Param("carId")String carId);
15
+    void updateCarPosition(@Param("carPosition")String carPosition,@Param("carId")String carId);
16
 
16
 
17
 
17
 
18
-    List<SysCar> selectcarall();
18
+    List<SysCar> selectCarAll();
19
 }
19
 }

+ 10
- 10
iot-platform/src/main/java/com/iot/platform/mapper/SysControllerMapper.java View File

10
 @Mapper
10
 @Mapper
11
 public interface SysControllerMapper {
11
 public interface SysControllerMapper {
12
 
12
 
13
-    void insertsyscontroller(@Param("controllerId") String controllerId,
13
+    void insertSysController(@Param("controllerId") String controllerId,
14
                              @Param("timestamp") String timestamp,
14
                              @Param("timestamp") String timestamp,
15
                              @Param("fleetId") String fleetId,
15
                              @Param("fleetId") String fleetId,
16
                              @Param("name") String name,
16
                              @Param("name") String name,
17
                              @Param("path") String path,
17
                              @Param("path") String path,
18
                              @Param("deviceId") String deviceId);
18
                              @Param("deviceId") String deviceId);
19
 
19
 
20
-    void insertsyscontrollercmd(@Param("controllerId") String controllerId,
20
+    void insertSysControllerCmd(@Param("controllerId") String controllerId,
21
                                 @Param("timestamp") String timestamp,
21
                                 @Param("timestamp") String timestamp,
22
                                 @Param("fleetId") String fleetId,
22
                                 @Param("fleetId") String fleetId,
23
                                 @Param("name") String name,
23
                                 @Param("name") String name,
24
                                 @Param("path") String path);
24
                                 @Param("path") String path);
25
 
25
 
26
-    void insertsyscontrollerfault(@Param("controllerId") String controllerId,
26
+    void insertSysControllerFault(@Param("controllerId") String controllerId,
27
                                   @Param("timestamp") String timestamp,
27
                                   @Param("timestamp") String timestamp,
28
                                   @Param("fleetId") String fleetId,
28
                                   @Param("fleetId") String fleetId,
29
                                   @Param("name") String name,
29
                                   @Param("name") String name,
30
                                   @Param("path") String path);
30
                                   @Param("path") String path);
31
 
31
 
32
-    Integer selectsyscontrollercount(@Param("path") String path);
32
+    Integer selectSysControllerCount(@Param("path") String path);
33
 
33
 
34
-    Integer selectsyscontrollercountcmd(@Param("path") String path);
34
+    Integer selectSysControllerCmdCount(@Param("path") String path);
35
 
35
 
36
-    Integer selectsyscontrollercountfault(@Param("path") String path);
36
+    Integer selectSysControllerFaultCount(@Param("path") String path);
37
 
37
 
38
-    void updatecontrollerAccept(@Param("controllerId") String controllerId,
38
+    void updateControllerAccept(@Param("controllerId") String controllerId,
39
                                 @Param("timestamp") String timestamp,
39
                                 @Param("timestamp") String timestamp,
40
                                 @Param("fleetId") String fleetId,
40
                                 @Param("fleetId") String fleetId,
41
                                 @Param("name") String name,
41
                                 @Param("name") String name,
43
                                 @Param("deviceId") String deviceId,
43
                                 @Param("deviceId") String deviceId,
44
                                 @Param("updateTime") String updateTime);
44
                                 @Param("updateTime") String updateTime);
45
 
45
 
46
-    SysController selectcontrollerpath(@Param("path") String path);
46
+    SysController selectControllerPath(@Param("path") String path);
47
 
47
 
48
-    List<String> selectall();
48
+    List<String> selectAll();
49
 
49
 
50
-    SysDevice selectjingweidu(@Param("tableName") String tableName, @Param("Name") String Name);
50
+    SysDevice selectCoordinates(@Param("tableName") String tableName, @Param("Name") String Name);
51
 
51
 
52
 }
52
 }

+ 1
- 1
iot-platform/src/main/java/com/iot/platform/mapper/SysDeviceControlMapper.java View File

9
 @Mapper
9
 @Mapper
10
 public interface SysDeviceControlMapper {
10
 public interface SysDeviceControlMapper {
11
 
11
 
12
-    List<SysDeviceControl> selectdevice(@Param("tableType")String tableType);
12
+    List<SysDeviceControl> selectDevice(@Param("tableType")String tableType);
13
 
13
 
14
 }
14
 }

+ 1
- 1
iot-platform/src/main/java/com/iot/platform/mapper/SysDeviceMapper.java View File

7
 
7
 
8
 @Mapper
8
 @Mapper
9
 public interface SysDeviceMapper {
9
 public interface SysDeviceMapper {
10
-    SysDevice selectsysdevice(@Param("tableName")String tableName,@Param("k")String k);
10
+    SysDevice selectSysDevice(@Param("tableName")String tableName,@Param("k")String k);
11
 }
11
 }

+ 6
- 6
iot-platform/src/main/java/com/iot/platform/mapper/SysDeviceVoMapper.java View File

8
 
8
 
9
 @Mapper
9
 @Mapper
10
 public interface SysDeviceVoMapper {
10
 public interface SysDeviceVoMapper {
11
-    @SelectProvider(type = DynamicSqlProvider.class, method = "insertdevice")
12
-    boolean insertdevice(@Param("columnName")String columnName, @Param("value")String value);
11
+    @SelectProvider(type = DynamicSqlProvider.class, method = "insertDevice")
12
+    boolean insertDevice(@Param("columnName")String columnName, @Param("value")String value);
13
 
13
 
14
-    @SelectProvider(type = DynamicSqlProvider.class, method = "updatesysdevice")
15
-    boolean updatesysdevice(@Param("columnName")String columnName, @Param("value")String value);
14
+    @SelectProvider(type = DynamicSqlProvider.class, method = "updateSysDevice")
15
+    boolean updateSysDevice(@Param("columnName")String columnName, @Param("value")String value);
16
 //
16
 //
17
-//    boolean insertdevice(@Param("deviceId")String deviceId,
17
+//    boolean insertDevice(@Param("deviceId")String deviceId,
18
 //                         @Param("deviceName")String deviceName,
18
 //                         @Param("deviceName")String deviceName,
19
 //                         @Param("soc")String soc,
19
 //                         @Param("soc")String soc,
20
 //                         @Param("chargingcapacity")String chargingcapacity,
20
 //                         @Param("chargingcapacity")String chargingcapacity,
25
 //                         @Param("capacitance")String capacitance,
25
 //                         @Param("capacitance")String capacitance,
26
 //                         @Param("power")String power);
26
 //                         @Param("power")String power);
27
 //
27
 //
28
-//    boolean updatesysdevice(@Param("deviceId")String deviceId,
28
+//    boolean updateSysDevice(@Param("deviceId")String deviceId,
29
 //                            @Param("deviceName")String deviceName,
29
 //                            @Param("deviceName")String deviceName,
30
 //                            @Param("soc")String soc,
30
 //                            @Param("soc")String soc,
31
 //                            @Param("chargingcapacity")String chargingcapacity,
31
 //                            @Param("chargingcapacity")String chargingcapacity,

+ 4
- 4
iot-platform/src/main/java/com/iot/platform/mapper/SysFaultMapper.java View File

6
 @Mapper
6
 @Mapper
7
 public interface SysFaultMapper {
7
 public interface SysFaultMapper {
8
 
8
 
9
-    void insertfault(@Param("faultId") String faultId,
9
+    void insertFault(@Param("faultId") String faultId,
10
                      @Param("faultdescs") String faultdescs,
10
                      @Param("faultdescs") String faultdescs,
11
                      @Param("faultstatus") String faultstatus,
11
                      @Param("faultstatus") String faultstatus,
12
                      @Param("createtime") String createtime,
12
                      @Param("createtime") String createtime,
17
                      @Param("latitude") String latitude,
17
                      @Param("latitude") String latitude,
18
                      @Param("readpeople") String readpeople);
18
                      @Param("readpeople") String readpeople);
19
 
19
 
20
-    void updatefault(@Param("faultstatus")String faultstatus,
20
+    void updateFault(@Param("faultstatus")String faultstatus,
21
                      @Param("messageType")String messageType,
21
                      @Param("messageType")String messageType,
22
                      @Param("longitude")String longitude,
22
                      @Param("longitude")String longitude,
23
                      @Param("latitude")String latitude,
23
                      @Param("latitude")String latitude,
27
                      @Param("createtime")String createtime);
27
                      @Param("createtime")String createtime);
28
 
28
 
29
 
29
 
30
-    Integer selectfaultcount(@Param("fleetId")String fleetId);
30
+    Integer selectFaultCount(@Param("fleetId")String fleetId);
31
 
31
 
32
-    void createmessage(@Param("tableName")String tableName);
32
+    void createMessage(@Param("tableName")String tableName);
33
 
33
 
34
 }
34
 }

+ 3
- 3
iot-platform/src/main/java/com/iot/platform/mapper/SysIndicatorsMapper.java View File

5
 @Mapper
5
 @Mapper
6
 public interface SysIndicatorsMapper {
6
 public interface SysIndicatorsMapper {
7
 
7
 
8
-    void insertindicators(@Param("workordercount")Integer workordercount,@Param("profit")Double profit,@Param("carId")String carId,@Param("createdata")String createdata);
8
+    void insertIndicators(@Param("workordercount")Integer workordercount,@Param("profit")Double profit,@Param("carId")String carId,@Param("createdata")String createdata);
9
 
9
 
10
-    void updateindicators(@Param("workordercount")Integer workordercount,@Param("profit")Double profit,@Param("carId")String carId,@Param("createdata")String createdata);
10
+    void updateIndicators(@Param("workordercount")Integer workordercount,@Param("profit")Double profit,@Param("carId")String carId,@Param("createdata")String createdata);
11
 
11
 
12
-    Integer selectcarcount(@Param("carId")String carId,@Param("createtime")String createtime);
12
+    Integer selectCarCount(@Param("carId")String carId,@Param("createtime")String createtime);
13
 }
13
 }

iot-platform/src/main/java/com/iot/platform/mapper/SysrealtimeMapper.java → iot-platform/src/main/java/com/iot/platform/mapper/SysRealtimeMapper.java View File

6
 import java.util.List;
6
 import java.util.List;
7
 
7
 
8
 @Mapper
8
 @Mapper
9
-public interface SysrealtimeMapper {
10
-    void createrealtime(@Param("tableName")String tableName);
11
-    List<String> selecttables();
12
-    void inserttables(@Param("tableName")String tableName,@Param("createTime")String createTime,@Param("deviceId")String deviceId,@Param("timestamp")String timestamp,@Param("k")String k,@Param("v")Object v);
13
-    void updatetables(@Param("tableName")String tableName,@Param("createTime")String createTime,@Param("v")Object v,@Param("timestamp")String timestamp,@Param("k")String k,@Param("deviceId")String deviceId);
14
-    Integer selectkey(@Param("tableName")String tableName,@Param("k")String k);
9
+public interface SysRealtimeMapper {
10
+    void createRealtime(@Param("tableName")String tableName);
11
+    List<String> selectTables();
12
+    void insertTables(@Param("tableName")String tableName,@Param("createTime")String createTime,@Param("deviceId")String deviceId,@Param("timestamp")String timestamp,@Param("k")String k,@Param("v")Object v);
13
+    void updateTables(@Param("tableName")String tableName,@Param("createTime")String createTime,@Param("v")Object v,@Param("timestamp")String timestamp,@Param("k")String k,@Param("deviceId")String deviceId);
14
+    Integer selectKey(@Param("tableName")String tableName,@Param("k")String k);
15
     List<String> selectAllKeys(@Param("tableName")String tableName);
15
     List<String> selectAllKeys(@Param("tableName")String tableName);
16
 }
16
 }

+ 3
- 3
iot-platform/src/main/java/com/iot/platform/mapper/SysStatusMapper.java View File

6
 @Mapper
6
 @Mapper
7
 public interface SysStatusMapper {
7
 public interface SysStatusMapper {
8
 
8
 
9
-    void insertsysstatus(@Param("controllerId")String controllerId,@Param("fleetId")String fleetId,@Param("status")String status,@Param("createTime")String createTime);
10
-    void updatestatus(@Param("controllerId")String controllerId,@Param("fleetId")String fleetId,@Param("status")String status,@Param("createTime")String createTime);
9
+    void insertSysStatus(@Param("controllerId")String controllerId,@Param("fleetId")String fleetId,@Param("status")String status,@Param("createTime")String createTime);
10
+    void updateStatus(@Param("controllerId")String controllerId,@Param("fleetId")String fleetId,@Param("status")String status,@Param("createTime")String createTime);
11
 
11
 
12
-    Integer selectstatuscount(@Param("controllerId")String controllerId);
12
+    Integer selectStatusCount(@Param("controllerId")String controllerId);
13
 }
13
 }

+ 3
- 3
iot-platform/src/main/java/com/iot/platform/mapper/SysWorkorderMapper.java View File

7
 @Mapper
7
 @Mapper
8
 public interface SysWorkorderMapper {
8
 public interface SysWorkorderMapper {
9
 
9
 
10
-    SysWorkorder selectdeviceId(@Param("controllerId")String controllerId);
11
-    Integer selectworkordercount(@Param("companyId")String companyId,@Param("data")String data);
12
-    Double selectwokroderprofit(@Param("companyId")String companyId,@Param("data")String data);
10
+    SysWorkorder selectDeviceId(@Param("controllerId")String controllerId);
11
+    Integer selectWorkorderCount(@Param("companyId")String companyId,@Param("data")String data);
12
+    Double selectWorkorderProfit(@Param("companyId")String companyId,@Param("data")String data);
13
 }
13
 }

+ 2
- 2
iot-platform/src/main/java/com/iot/platform/mqtt/MqttDynamicConsumer.java View File

47
 
47
 
48
     @Override
48
     @Override
49
     protected List<String> fetchTopics() {
49
     protected List<String> fetchTopics() {
50
-        return sysControllerService.selectall();
50
+        return sysControllerService.selectAll();
51
     }
51
     }
52
 
52
 
53
     @Override
53
     @Override
75
             return null;
75
             return null;
76
         }
76
         }
77
 
77
 
78
-        SysController sysController = sysControllerService.selectcontrollerpath(topic);
78
+        SysController sysController = sysControllerService.selectControllerPath(topic);
79
         if (sysController == null || sysController.getName() == null) {
79
         if (sysController == null || sysController.getName() == null) {
80
             log.info("未找到 Topic 对应的 Controller: {}", topic);
80
             log.info("未找到 Topic 对应的 Controller: {}", topic);
81
             return null;
81
             return null;

+ 26
- 26
iot-platform/src/main/java/com/iot/platform/mqtt/MqttFaultConsumer.java View File

29
 
29
 
30
     private final SysControllerService sysControllerService;
30
     private final SysControllerService sysControllerService;
31
     private final SysFaultService sysFaultService;
31
     private final SysFaultService sysFaultService;
32
-    private final SysrealtimeService sysrealtimeService;
32
+    private final SysRealtimeService sysRealtimeService;
33
     private final SysAlarmService sysAlarmService;
33
     private final SysAlarmService sysAlarmService;
34
     private final NumericIdGenerator numericIdGenerator;
34
     private final NumericIdGenerator numericIdGenerator;
35
     private final TdEngineAlarm tdEngineAlarm;
35
     private final TdEngineAlarm tdEngineAlarm;
49
                              IotProperties iotProperties,
49
                              IotProperties iotProperties,
50
                              SysControllerService sysControllerService,
50
                              SysControllerService sysControllerService,
51
                              SysFaultService sysFaultService,
51
                              SysFaultService sysFaultService,
52
-                             SysrealtimeService sysrealtimeService,
52
+                             SysRealtimeService sysRealtimeService,
53
                              SysAlarmService sysAlarmService,
53
                              SysAlarmService sysAlarmService,
54
                              NumericIdGenerator numericIdGenerator,
54
                              NumericIdGenerator numericIdGenerator,
55
                              TdEngineAlarm tdEngineAlarm,
55
                              TdEngineAlarm tdEngineAlarm,
58
         this.mqttFaultExecutor = mqttFaultExecutor;
58
         this.mqttFaultExecutor = mqttFaultExecutor;
59
         this.sysControllerService = sysControllerService;
59
         this.sysControllerService = sysControllerService;
60
         this.sysFaultService = sysFaultService;
60
         this.sysFaultService = sysFaultService;
61
-        this.sysrealtimeService = sysrealtimeService;
61
+        this.sysRealtimeService = sysRealtimeService;
62
         this.sysAlarmService = sysAlarmService;
62
         this.sysAlarmService = sysAlarmService;
63
         this.numericIdGenerator = numericIdGenerator;
63
         this.numericIdGenerator = numericIdGenerator;
64
         this.tdEngineAlarm = tdEngineAlarm;
64
         this.tdEngineAlarm = tdEngineAlarm;
95
         SysFault sysFault = JSON.parseObject(messageContent, SysFault.class);
95
         SysFault sysFault = JSON.parseObject(messageContent, SysFault.class);
96
         mqttFaultExecutor.submit(() -> {
96
         mqttFaultExecutor.submit(() -> {
97
             try {
97
             try {
98
-                triggermethod(topic, sysFault);
98
+                triggerMethod(topic, sysFault);
99
             } catch (Exception e) {
99
             } catch (Exception e) {
100
                 log.error("告警业务处理失败, topic={}, controllerId={}, error={}",
100
                 log.error("告警业务处理失败, topic={}, controllerId={}, error={}",
101
                         topic, sysFault.getController_id(), e.getMessage(), e);
101
                         topic, sysFault.getController_id(), e.getMessage(), e);
127
         tdEngineAlarm.recordFailure(newMap, controllerName, table);
127
         tdEngineAlarm.recordFailure(newMap, controllerName, table);
128
     }
128
     }
129
 
129
 
130
-    void triggermethod(String topic, SysFault weather) {
130
+    void triggerMethod(String topic, SysFault faultData) {
131
 
131
 
132
-        String deviceId = weather.getDevice_id();
133
-        String type = weather.getType();
134
-        String desc = weather.getDesc();
135
-        String controllerId = weather.getController_id();
132
+        String deviceId = faultData.getDevice_id();
133
+        String type = faultData.getType();
134
+        String desc = faultData.getDesc();
135
+        String controllerId = faultData.getController_id();
136
 
136
 
137
         if (controllerId == null || controllerId.isEmpty()) {
137
         if (controllerId == null || controllerId.isEmpty()) {
138
             log.info("SysFault 缺少 controller_id,跳过处理");
138
             log.info("SysFault 缺少 controller_id,跳过处理");
157
             return;
157
             return;
158
         }
158
         }
159
 
159
 
160
-        List<String> tablename = sysrealtimeService.selecttables();
161
-        if (tablename == null) {
162
-            tablename = Collections.emptyList();
160
+        List<String> tableNames = sysRealtimeService.selectTables();
161
+        if (tableNames == null) {
162
+            tableNames = Collections.emptyList();
163
         }
163
         }
164
-        String controllername = controllerId + year + formattedMonth + "_fault";
164
+        String controllerName = controllerId + year + formattedMonth + "_fault";
165
 
165
 
166
         boolean tableExists = false;
166
         boolean tableExists = false;
167
-        for (String name : tablename) {
168
-            if (controllername.equals(name)) {
167
+        for (String name : tableNames) {
168
+            if (controllerName.equals(name)) {
169
                 tableExists = true;
169
                 tableExists = true;
170
                 break;
170
                 break;
171
             }
171
             }
172
         }
172
         }
173
         if (!tableExists) {
173
         if (!tableExists) {
174
-            sysFaultService.createmessage(controllername);
174
+            sysFaultService.createMessage(controllerName);
175
         }
175
         }
176
 
176
 
177
-        SysDevice jingdu = sysControllerService.selectjingweidu(topics[0], "经度");
178
-        SysDevice weidu = sysControllerService.selectjingweidu(topics[0], "纬度");
179
-        if (jingdu == null || weidu == null) {
177
+        SysDevice longitude = sysControllerService.selectCoordinates(topics[0], "经度");
178
+        SysDevice latitude = sysControllerService.selectCoordinates(topics[0], "纬度");
179
+        if (longitude == null || latitude == null) {
180
             log.info("未查询到控制器经纬度信息: {}", topics[0]);
180
             log.info("未查询到控制器经纬度信息: {}", topics[0]);
181
             return;
181
             return;
182
         }
182
         }
183
-        String jingduValue = jingdu.getV();
184
-        String weiduValue = weidu.getV();
185
-        String companyid = COMPANY_ID_PREFIX + numericIdGenerator.nextId();
183
+        String longitudeValue = longitude.getV();
184
+        String latitudeValue = latitude.getV();
185
+        String companyId = COMPANY_ID_PREFIX + numericIdGenerator.nextId();
186
         LocalDateTime currentTime = LocalDateTime.now();
186
         LocalDateTime currentTime = LocalDateTime.now();
187
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATE_TIME_PATTERN);
187
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATE_TIME_PATTERN);
188
         String currentTimeStr = currentTime.format(formatter);
188
         String currentTimeStr = currentTime.format(formatter);
189
 
189
 
190
         if ("触发".equals(type)) {
190
         if ("触发".equals(type)) {
191
-            sysAlarmService.insertalarm(controllername, companyid, desc, ALARM_STATUS_TRIGGER, currentTimeStr, ALARM_STATUS_TRIGGER, controllerId, deviceId, jingduValue, weiduValue);
192
-            sysFaultService.insertfault(companyid, desc, ALARM_STATUS_TRIGGER, currentTimeStr, ALARM_STATUS_TRIGGER, controllerId, deviceId, jingduValue, weiduValue, "");
191
+            sysAlarmService.insertAlarm(controllerName, companyId, desc, ALARM_STATUS_TRIGGER, currentTimeStr, ALARM_STATUS_TRIGGER, controllerId, deviceId, longitudeValue, latitudeValue);
192
+            sysFaultService.insertFault(companyId, desc, ALARM_STATUS_TRIGGER, currentTimeStr, ALARM_STATUS_TRIGGER, controllerId, deviceId, longitudeValue, latitudeValue, "");
193
         } else if ("恢复".equals(type)) {
193
         } else if ("恢复".equals(type)) {
194
-            sysAlarmService.insertalarm(controllername, companyid, desc, ALARM_STATUS_RECOVERED, currentTimeStr, ALARM_STATUS_TRIGGER, controllerId, deviceId, jingduValue, weiduValue);
195
-            sysFaultService.updatefault(ALARM_STATUS_RECOVERED, ALARM_STATUS_TRIGGER, jingduValue, weiduValue, desc, controllerId, deviceId, currentTimeStr);
194
+            sysAlarmService.insertAlarm(controllerName, companyId, desc, ALARM_STATUS_RECOVERED, currentTimeStr, ALARM_STATUS_TRIGGER, controllerId, deviceId, longitudeValue, latitudeValue);
195
+            sysFaultService.updateFault(ALARM_STATUS_RECOVERED, ALARM_STATUS_TRIGGER, longitudeValue, latitudeValue, desc, controllerId, deviceId, currentTimeStr);
196
         }
196
         }
197
 
197
 
198
         // controllerId 白名单校验,防止 SSRF
198
         // controllerId 白名单校验,防止 SSRF

+ 9
- 9
iot-platform/src/main/java/com/iot/platform/mqtt/MqttGenericConsumer.java View File

58
     @Override
58
     @Override
59
     protected void handleMessage(String topic, String messageContent) throws Exception {
59
     protected void handleMessage(String topic, String messageContent) throws Exception {
60
         ControllerData controllerData = JSON.parseObject(messageContent, ControllerData.class);
60
         ControllerData controllerData = JSON.parseObject(messageContent, ControllerData.class);
61
-        triggermethod(controllerData);
61
+        triggerMethod(controllerData);
62
     }
62
     }
63
 
63
 
64
-    private void triggermethod(ControllerData controllerData) throws Exception {
64
+    private void triggerMethod(ControllerData controllerData) throws Exception {
65
         String timestamp = controllerData.getTimestamp();
65
         String timestamp = controllerData.getTimestamp();
66
         String fleetId = controllerData.getFleet_id();
66
         String fleetId = controllerData.getFleet_id();
67
         String controllerId = controllerData.getController_id();
67
         String controllerId = controllerData.getController_id();
108
                 log.info("path 中缺少 deviceId,跳过: path={}", path);
108
                 log.info("path 中缺少 deviceId,跳过: path={}", path);
109
                 continue;
109
                 continue;
110
             }
110
             }
111
-            Integer count = sysControllerService.selectsyscontrollercount(path);
111
+            Integer count = sysControllerService.selectSysControllerCount(path);
112
             if (count <= 0) {
112
             if (count <= 0) {
113
                 stringRedisTemplate.opsForHash().put(controllerId + ":" + name, "path", path);
113
                 stringRedisTemplate.opsForHash().put(controllerId + ":" + name, "path", path);
114
-                sysControllerService.insertsyscontroller(controllerId, timestamp, fleetId, name, path, deviceId);
114
+                sysControllerService.insertSysController(controllerId, timestamp, fleetId, name, path, deviceId);
115
                 newControllerCount++;
115
                 newControllerCount++;
116
             } else {
116
             } else {
117
                 long ts;
117
                 long ts;
122
                     ts = System.currentTimeMillis();
122
                     ts = System.currentTimeMillis();
123
                 }
123
                 }
124
                 String date = DATE_TIME_FORMATTER.format(Instant.ofEpochMilli(ts));
124
                 String date = DATE_TIME_FORMATTER.format(Instant.ofEpochMilli(ts));
125
-                sysControllerService.updatecontrollerAccept(controllerId, timestamp, fleetId, name, path, deviceId, date);
125
+                sysControllerService.updateControllerAccept(controllerId, timestamp, fleetId, name, path, deviceId, date);
126
             }
126
             }
127
         }
127
         }
128
         return newControllerCount;
128
         return newControllerCount;
136
                 log.info("CmdTopic 数据不完整,跳过: path={}, name={}", path, name);
136
                 log.info("CmdTopic 数据不完整,跳过: path={}, name={}", path, name);
137
                 continue;
137
                 continue;
138
             }
138
             }
139
-            Integer count = sysControllerService.selectsyscontrollercountcmd(path);
139
+            Integer count = sysControllerService.selectSysControllerCmdCount(path);
140
             if (count <= 0) {
140
             if (count <= 0) {
141
                 stringRedisTemplate.opsForHash().put(controllerId + "_cmd:" + name, "path", path);
141
                 stringRedisTemplate.opsForHash().put(controllerId + "_cmd:" + name, "path", path);
142
-                sysControllerService.insertsyscontrollercmd(controllerId, timestamp, fleetId, name, path);
142
+                sysControllerService.insertSysControllerCmd(controllerId, timestamp, fleetId, name, path);
143
             }
143
             }
144
         }
144
         }
145
     }
145
     }
154
             log.info("FaultProt 数据不完整,跳过: path={}, name={}", path, name);
154
             log.info("FaultProt 数据不完整,跳过: path={}, name={}", path, name);
155
             return;
155
             return;
156
         }
156
         }
157
-        Integer count = sysControllerService.selectsyscontrollercountfault(path);
157
+        Integer count = sysControllerService.selectSysControllerFaultCount(path);
158
         if (count <= 0) {
158
         if (count <= 0) {
159
             stringRedisTemplate.opsForHash().put(controllerId + "_fault:" + name, "path", path);
159
             stringRedisTemplate.opsForHash().put(controllerId + "_fault:" + name, "path", path);
160
-            sysControllerService.insertsyscontrollerfault(controllerId, timestamp, fleetId, name, path);
160
+            sysControllerService.insertSysControllerFault(controllerId, timestamp, fleetId, name, path);
161
         }
161
         }
162
     }
162
     }
163
 }
163
 }

+ 2
- 2
iot-platform/src/main/java/com/iot/platform/service/SysAlarmService.java View File

16
     @Resource
16
     @Resource
17
     public SysAlarmMapper sysAlarmMapper;
17
     public SysAlarmMapper sysAlarmMapper;
18
 
18
 
19
-    public void insertalarm(String tableName,String faultId,String faultdescs,String faultstatus,String createtime,String messageType,String controllerId,String deviceId,String longitude,String latitude){
19
+    public void insertAlarm(String tableName,String faultId,String faultdescs,String faultstatus,String createtime,String messageType,String controllerId,String deviceId,String longitude,String latitude){
20
         if (tableName == null || !TABLE_NAME_PATTERN.matcher(tableName).matches()) {
20
         if (tableName == null || !TABLE_NAME_PATTERN.matcher(tableName).matches()) {
21
             throw new IllegalArgumentException("非法表名: " + tableName);
21
             throw new IllegalArgumentException("非法表名: " + tableName);
22
         }
22
         }
23
-        sysAlarmMapper.insertalarm(tableName,faultId, faultdescs, faultstatus, createtime, messageType,controllerId,deviceId,longitude,latitude);
23
+        sysAlarmMapper.insertAlarm(tableName,faultId, faultdescs, faultstatus, createtime, messageType,controllerId,deviceId,longitude,latitude);
24
     }
24
     }
25
 
25
 
26
 }
26
 }

+ 6
- 6
iot-platform/src/main/java/com/iot/platform/service/SysCarService.java View File

17
     @Resource
17
     @Resource
18
     public SysCarMapper sysCarMapper;
18
     public SysCarMapper sysCarMapper;
19
 
19
 
20
-    public List<SysCar> selectcontrollerId(){
21
-        return sysCarMapper.selectcontrollerId();
20
+    public List<SysCar> selectControllerId(){
21
+        return sysCarMapper.selectControllerId();
22
     }
22
     }
23
-    public void updatecarposition(String carPosition,String carId){
24
-        sysCarMapper.updatecarposition(carPosition, carId);
23
+    public void updateCarPosition(String carPosition,String carId){
24
+        sysCarMapper.updateCarPosition(carPosition, carId);
25
     }
25
     }
26
-    public List<SysCar> selectcarall(){
27
-        return sysCarMapper.selectcarall();
26
+    public List<SysCar> selectCarAll(){
27
+        return sysCarMapper.selectCarAll();
28
     }
28
     }
29
 }
29
 }

+ 20
- 20
iot-platform/src/main/java/com/iot/platform/service/SysControllerService.java View File

17
     @Resource
17
     @Resource
18
     public SysControllerMapper sysControllerMapper;
18
     public SysControllerMapper sysControllerMapper;
19
 
19
 
20
-    public void insertsyscontroller(String controllerId, String timestamp, String fleetId,
20
+    public void insertSysController(String controllerId, String timestamp, String fleetId,
21
                                     String name, String path, String deviceId) {
21
                                     String name, String path, String deviceId) {
22
-        sysControllerMapper.insertsyscontroller(controllerId, timestamp, fleetId, name, path, deviceId);
22
+        sysControllerMapper.insertSysController(controllerId, timestamp, fleetId, name, path, deviceId);
23
     }
23
     }
24
 
24
 
25
-    public void insertsyscontrollercmd(String controllerId, String timestamp, String fleetId,
25
+    public void insertSysControllerCmd(String controllerId, String timestamp, String fleetId,
26
                                        String name, String path) {
26
                                        String name, String path) {
27
-        sysControllerMapper.insertsyscontrollercmd(controllerId, timestamp, fleetId, name, path);
27
+        sysControllerMapper.insertSysControllerCmd(controllerId, timestamp, fleetId, name, path);
28
     }
28
     }
29
 
29
 
30
-    public void insertsyscontrollerfault(String controllerId, String timestamp, String fleetId,
30
+    public void insertSysControllerFault(String controllerId, String timestamp, String fleetId,
31
                                          String name, String path) {
31
                                          String name, String path) {
32
-        sysControllerMapper.insertsyscontrollerfault(controllerId, timestamp, fleetId, name, path);
32
+        sysControllerMapper.insertSysControllerFault(controllerId, timestamp, fleetId, name, path);
33
     }
33
     }
34
 
34
 
35
-    public Integer selectsyscontrollercount(String path) {
36
-        return sysControllerMapper.selectsyscontrollercount(path);
35
+    public Integer selectSysControllerCount(String path) {
36
+        return sysControllerMapper.selectSysControllerCount(path);
37
     }
37
     }
38
 
38
 
39
-    public Integer selectsyscontrollercountcmd(String path) {
40
-        return sysControllerMapper.selectsyscontrollercountcmd(path);
39
+    public Integer selectSysControllerCmdCount(String path) {
40
+        return sysControllerMapper.selectSysControllerCmdCount(path);
41
     }
41
     }
42
 
42
 
43
-    public Integer selectsyscontrollercountfault(String path) {
44
-        return sysControllerMapper.selectsyscontrollercountfault(path);
43
+    public Integer selectSysControllerFaultCount(String path) {
44
+        return sysControllerMapper.selectSysControllerFaultCount(path);
45
     }
45
     }
46
 
46
 
47
-    public void updatecontrollerAccept(String controllerId, String timestamp, String fleetId,
47
+    public void updateControllerAccept(String controllerId, String timestamp, String fleetId,
48
                                        String name, String path, String deviceId, String updateTime) {
48
                                        String name, String path, String deviceId, String updateTime) {
49
-        sysControllerMapper.updatecontrollerAccept(controllerId, timestamp, fleetId, name, path, deviceId, updateTime);
49
+        sysControllerMapper.updateControllerAccept(controllerId, timestamp, fleetId, name, path, deviceId, updateTime);
50
     }
50
     }
51
 
51
 
52
-    public SysController selectcontrollerpath(String path) {
53
-        return sysControllerMapper.selectcontrollerpath(path);
52
+    public SysController selectControllerPath(String path) {
53
+        return sysControllerMapper.selectControllerPath(path);
54
     }
54
     }
55
 
55
 
56
-    public List<String> selectall() {
57
-        return sysControllerMapper.selectall();
56
+    public List<String> selectAll() {
57
+        return sysControllerMapper.selectAll();
58
     }
58
     }
59
 
59
 
60
-    public SysDevice selectjingweidu(String tableName, String Name) {
60
+    public SysDevice selectCoordinates(String tableName, String Name) {
61
         if (tableName == null || !TABLE_NAME_PATTERN.matcher(tableName).matches()) {
61
         if (tableName == null || !TABLE_NAME_PATTERN.matcher(tableName).matches()) {
62
             throw new IllegalArgumentException("非法表名: " + tableName);
62
             throw new IllegalArgumentException("非法表名: " + tableName);
63
         }
63
         }
64
-        return sysControllerMapper.selectjingweidu(tableName, Name);
64
+        return sysControllerMapper.selectCoordinates(tableName, Name);
65
     }
65
     }
66
 }
66
 }

+ 2
- 2
iot-platform/src/main/java/com/iot/platform/service/SysDeviceControlService.java View File

13
     @Resource
13
     @Resource
14
     public SysDeviceControlMapper sysDeviceControlMapper;
14
     public SysDeviceControlMapper sysDeviceControlMapper;
15
 
15
 
16
-    public List<SysDeviceControl> selectdevice(@Param("tableType")String tableType){
17
-        return sysDeviceControlMapper.selectdevice(tableType);
16
+    public List<SysDeviceControl> selectDevice(@Param("tableType")String tableType){
17
+        return sysDeviceControlMapper.selectDevice(tableType);
18
     }
18
     }
19
 }
19
 }

+ 2
- 2
iot-platform/src/main/java/com/iot/platform/service/SysDeviceService.java View File

15
     @Resource
15
     @Resource
16
     public SysDeviceMapper sysDeviceMapper;
16
     public SysDeviceMapper sysDeviceMapper;
17
 
17
 
18
-    public SysDevice selectsysdevice(String tableName, String k) {
18
+    public SysDevice selectSysDevice(String tableName, String k) {
19
         if (tableName == null || !TABLE_NAME_PATTERN.matcher(tableName).matches()) {
19
         if (tableName == null || !TABLE_NAME_PATTERN.matcher(tableName).matches()) {
20
             throw new IllegalArgumentException("非法表名: " + tableName);
20
             throw new IllegalArgumentException("非法表名: " + tableName);
21
         }
21
         }
22
-        return sysDeviceMapper.selectsysdevice(tableName, k);
22
+        return sysDeviceMapper.selectSysDevice(tableName, k);
23
     }
23
     }
24
 }
24
 }

+ 8
- 8
iot-platform/src/main/java/com/iot/platform/service/SysDeviceVoService.java View File

11
 public class SysDeviceVoService {
11
 public class SysDeviceVoService {
12
     @Resource
12
     @Resource
13
     public SysDeviceVoMapper sysDeviceVoMapper;
13
     public SysDeviceVoMapper sysDeviceVoMapper;
14
-    public boolean insertdevice(String columnName,String value){
15
-        return sysDeviceVoMapper.insertdevice(columnName, value);
14
+    public boolean insertDevice(String columnName,String value){
15
+        return sysDeviceVoMapper.insertDevice(columnName, value);
16
     }
16
     }
17
 
17
 
18
-    public boolean updatesysdevice(String columnName,String value){
19
-        return sysDeviceVoMapper.updatesysdevice(columnName, value);
18
+    public boolean updateSysDevice(String columnName,String value){
19
+        return sysDeviceVoMapper.updateSysDevice(columnName, value);
20
     }
20
     }
21
-//    public boolean insertdevice(String deviceId,String deviceName,String soc,String chargingcapacity,String dischargecapacity,String dateTime,String greenelectricity,String statecharge,String capacitance,String power){
22
-//        return sysDeviceVoMapper.insertdevice(deviceId, deviceName, soc, chargingcapacity, dischargecapacity, dateTime, greenelectricity, statecharge, capacitance, power);
21
+//    public boolean insertDevice(String deviceId,String deviceName,String soc,String chargingcapacity,String dischargecapacity,String dateTime,String greenelectricity,String statecharge,String capacitance,String power){
22
+//        return sysDeviceVoMapper.insertDevice(deviceId, deviceName, soc, chargingcapacity, dischargecapacity, dateTime, greenelectricity, statecharge, capacitance, power);
23
 //    }
23
 //    }
24
 //
24
 //
25
-//    public boolean updatesysdevice(String deviceId,String deviceName,String soc,String chargingcapacity,String dischargecapacity,String dateTime,String greenelectricity,String statecharge, String capacitance,String power){
26
-//        return sysDeviceVoMapper.updatesysdevice(deviceId, deviceName, soc, chargingcapacity, dischargecapacity, dateTime, greenelectricity, statecharge, capacitance, power);
25
+//    public boolean updateSysDevice(String deviceId,String deviceName,String soc,String chargingcapacity,String dischargecapacity,String dateTime,String greenelectricity,String statecharge, String capacitance,String power){
26
+//        return sysDeviceVoMapper.updateSysDevice(deviceId, deviceName, soc, chargingcapacity, dischargecapacity, dateTime, greenelectricity, statecharge, capacitance, power);
27
 //    }
27
 //    }
28
     public Integer selectcount(String deviceId){
28
     public Integer selectcount(String deviceId){
29
         return sysDeviceVoMapper.selectcount(deviceId);
29
         return sysDeviceVoMapper.selectcount(deviceId);

+ 8
- 8
iot-platform/src/main/java/com/iot/platform/service/SysFaultService.java View File

15
     @Resource
15
     @Resource
16
     public SysFaultMapper sysFaultMapper;
16
     public SysFaultMapper sysFaultMapper;
17
 
17
 
18
-    public void insertfault(String faultId,
18
+    public void insertFault(String faultId,
19
                             String faultdescs,
19
                             String faultdescs,
20
                             String faultstatus,
20
                             String faultstatus,
21
                             String createtime,
21
                             String createtime,
25
                             String longitude,
25
                             String longitude,
26
                             String latitude,
26
                             String latitude,
27
                             String readpeople){
27
                             String readpeople){
28
-        sysFaultMapper.insertfault(faultId,faultdescs,faultstatus,createtime,messageType,controllerId,deviceId,longitude,latitude,readpeople);
28
+        sysFaultMapper.insertFault(faultId,faultdescs,faultstatus,createtime,messageType,controllerId,deviceId,longitude,latitude,readpeople);
29
     }
29
     }
30
 
30
 
31
-    public void updatefault(
31
+    public void updateFault(
32
                      String faultstatus,
32
                      String faultstatus,
33
                      String messageType,
33
                      String messageType,
34
                      String longitude,
34
                      String longitude,
37
                      String controllerId,
37
                      String controllerId,
38
                      String deviceId,
38
                      String deviceId,
39
                      String createtime){
39
                      String createtime){
40
-        sysFaultMapper.updatefault(faultstatus, messageType, longitude, latitude, faultdescs, controllerId, deviceId, createtime);
40
+        sysFaultMapper.updateFault(faultstatus, messageType, longitude, latitude, faultdescs, controllerId, deviceId, createtime);
41
     }
41
     }
42
 
42
 
43
-    public Integer selectfaultcount(@Param("fleetId")String fleetId){
44
-        return sysFaultMapper.selectfaultcount(fleetId);
43
+    public Integer selectFaultCount(@Param("fleetId")String fleetId){
44
+        return sysFaultMapper.selectFaultCount(fleetId);
45
     }
45
     }
46
-    public void createmessage(@Param("tableName")String tableName){
46
+    public void createMessage(@Param("tableName")String tableName){
47
         if (tableName == null || !TABLE_NAME_PATTERN.matcher(tableName).matches()) {
47
         if (tableName == null || !TABLE_NAME_PATTERN.matcher(tableName).matches()) {
48
             throw new IllegalArgumentException("非法表名: " + tableName);
48
             throw new IllegalArgumentException("非法表名: " + tableName);
49
         }
49
         }
50
-        sysFaultMapper.createmessage(tableName);
50
+        sysFaultMapper.createMessage(tableName);
51
     }
51
     }
52
 
52
 
53
 
53
 

+ 6
- 6
iot-platform/src/main/java/com/iot/platform/service/SysIndicatorsService.java View File

19
     }
19
     }
20
 
20
 
21
 
21
 
22
-    public void insertindicators(Integer workordercount, Double profit, String carId,String createdata){
23
-        sysIndicatorsMapper.insertindicators(workordercount, profit, carId,createdata);
22
+    public void insertIndicators(Integer workordercount, Double profit, String carId,String createdata){
23
+        sysIndicatorsMapper.insertIndicators(workordercount, profit, carId,createdata);
24
     }
24
     }
25
 
25
 
26
-    public void updateindicators(Integer workordercount,Double profit,String carId,String createdata){
27
-        sysIndicatorsMapper.updateindicators(workordercount, profit, carId,createdata);
26
+    public void updateIndicators(Integer workordercount,Double profit,String carId,String createdata){
27
+        sysIndicatorsMapper.updateIndicators(workordercount, profit, carId,createdata);
28
     }
28
     }
29
 
29
 
30
-    public Integer selectcarcount(String carId,String createtime){
31
-        return sysIndicatorsMapper.selectcarcount(carId, createtime);
30
+    public Integer selectCarCount(String carId,String createtime){
31
+        return sysIndicatorsMapper.selectCarCount(carId, createtime);
32
     }
32
     }
33
 
33
 
34
 }
34
 }

iot-platform/src/main/java/com/iot/platform/service/SysrealtimeService.java → iot-platform/src/main/java/com/iot/platform/service/SysRealtimeService.java View File

1
 package com.iot.platform.service;
1
 package com.iot.platform.service;
2
 
2
 
3
-import com.iot.platform.mapper.SysrealtimeMapper;
3
+import com.iot.platform.mapper.SysRealtimeMapper;
4
 import org.apache.commons.lang3.StringUtils;
4
 import org.apache.commons.lang3.StringUtils;
5
 import org.slf4j.Logger;
5
 import org.slf4j.Logger;
6
 import org.slf4j.LoggerFactory;
6
 import org.slf4j.LoggerFactory;
11
 import java.util.regex.Pattern;
11
 import java.util.regex.Pattern;
12
 
12
 
13
 @Service
13
 @Service
14
-public class SysrealtimeService {
15
-    private static final Logger log = LoggerFactory.getLogger(SysrealtimeService.class);
14
+public class SysRealtimeService {
15
+    private static final Logger log = LoggerFactory.getLogger(SysRealtimeService.class);
16
     private static final Pattern TABLE_NAME_PATTERN = Pattern.compile("^[a-zA-Z0-9_]+$");
16
     private static final Pattern TABLE_NAME_PATTERN = Pattern.compile("^[a-zA-Z0-9_]+$");
17
     private static final int MAX_TABLE_NAME_LENGTH = 64;
17
     private static final int MAX_TABLE_NAME_LENGTH = 64;
18
 
18
 
19
     @Resource
19
     @Resource
20
-    public SysrealtimeMapper sysrealtimeMapper;
20
+    public SysRealtimeMapper sysRealtimeMapper;
21
 
21
 
22
-    public void createrealtime(String tableName) {
22
+    public void createRealtime(String tableName) {
23
         validateTableName(tableName);
23
         validateTableName(tableName);
24
         log.info("准备创建表: [{}]", tableName);
24
         log.info("准备创建表: [{}]", tableName);
25
-        sysrealtimeMapper.createrealtime(tableName);
25
+        sysRealtimeMapper.createRealtime(tableName);
26
         log.info("表[{}]创建成功", tableName);
26
         log.info("表[{}]创建成功", tableName);
27
     }
27
     }
28
 
28
 
29
-    public List<String> selecttables() {
30
-        return sysrealtimeMapper.selecttables();
29
+    public List<String> selectTables() {
30
+        return sysRealtimeMapper.selectTables();
31
     }
31
     }
32
 
32
 
33
-    public void inserttables(String tableName, String createTime, String deviceId, String timestamp, String k, Object v) {
33
+    public void insertTables(String tableName, String createTime, String deviceId, String timestamp, String k, Object v) {
34
         validateTableName(tableName);
34
         validateTableName(tableName);
35
-        sysrealtimeMapper.inserttables(tableName, createTime, deviceId, timestamp, k, v);
35
+        sysRealtimeMapper.insertTables(tableName, createTime, deviceId, timestamp, k, v);
36
     }
36
     }
37
 
37
 
38
-    public void updatetables(String tableName, String createTime, Object v, String timestamp, String k, String deviceId) {
38
+    public void updateTables(String tableName, String createTime, Object v, String timestamp, String k, String deviceId) {
39
         validateTableName(tableName);
39
         validateTableName(tableName);
40
-        sysrealtimeMapper.updatetables(tableName, createTime, v, timestamp, k, deviceId);
40
+        sysRealtimeMapper.updateTables(tableName, createTime, v, timestamp, k, deviceId);
41
     }
41
     }
42
 
42
 
43
-    public Integer selectkey(String tableName, String k) {
43
+    public Integer selectKey(String tableName, String k) {
44
         validateTableName(tableName);
44
         validateTableName(tableName);
45
-        return sysrealtimeMapper.selectkey(tableName, k);
45
+        return sysRealtimeMapper.selectKey(tableName, k);
46
     }
46
     }
47
 
47
 
48
     public List<String> selectAllKeys(String tableName) {
48
     public List<String> selectAllKeys(String tableName) {
49
         validateTableName(tableName);
49
         validateTableName(tableName);
50
-        return sysrealtimeMapper.selectAllKeys(tableName);
50
+        return sysRealtimeMapper.selectAllKeys(tableName);
51
     }
51
     }
52
 
52
 
53
     private void validateTableName(String tableName) {
53
     private void validateTableName(String tableName) {

+ 6
- 6
iot-platform/src/main/java/com/iot/platform/service/SysStatusService.java View File

10
     @Resource
10
     @Resource
11
     public SysStatusMapper sysStatusMapper;
11
     public SysStatusMapper sysStatusMapper;
12
 
12
 
13
-    public void insertsysstatus(String controllerId, String fleetId, String status,String createTime){
14
-        sysStatusMapper.insertsysstatus(controllerId, fleetId, status,createTime);
13
+    public void insertSysStatus(String controllerId, String fleetId, String status,String createTime){
14
+        sysStatusMapper.insertSysStatus(controllerId, fleetId, status,createTime);
15
     }
15
     }
16
-    public void updatestatus(String controllerId,String fleetId, String status, String createTime){
17
-        sysStatusMapper.updatestatus(controllerId,fleetId, status, createTime);
16
+    public void updateStatus(String controllerId,String fleetId, String status, String createTime){
17
+        sysStatusMapper.updateStatus(controllerId,fleetId, status, createTime);
18
     }
18
     }
19
-    public Integer selectstatuscount(String controllerId){
20
-        return sysStatusMapper.selectstatuscount(controllerId);
19
+    public Integer selectStatusCount(String controllerId){
20
+        return sysStatusMapper.selectStatusCount(controllerId);
21
     }
21
     }
22
 }
22
 }

+ 4
- 4
iot-platform/src/main/java/com/iot/platform/service/SysWorkorderService.java View File

19
 
19
 
20
 
20
 
21
 
21
 
22
-    public Integer selectworkordercount(String companyId,String data){
23
-        return sysWorkorderMapper.selectworkordercount(companyId,data);
22
+    public Integer selectWorkorderCount(String companyId,String data){
23
+        return sysWorkorderMapper.selectWorkorderCount(companyId,data);
24
     }
24
     }
25
-    public Double selectwokroderprofit(String companyId,String data){
26
-        return sysWorkorderMapper.selectwokroderprofit(companyId,data);
25
+    public Double selectWorkorderProfit(String companyId,String data){
26
+        return sysWorkorderMapper.selectWorkorderProfit(companyId,data);
27
     }
27
     }
28
 }
28
 }

+ 1
- 1
iot-platform/src/main/resources/mapper/SysAlarmMapper.xml View File

13
         <result column="messageType" property="messageType"/>
13
         <result column="messageType" property="messageType"/>
14
     </resultMap>
14
     </resultMap>
15
 
15
 
16
-    <insert id="insertalarm">
16
+    <insert id="insertAlarm">
17
         insert into `${tableName}`(faultId,faultdescs,faultstatus,createtime,messageType,controller_id,device_id,longitude,latitude)
17
         insert into `${tableName}`(faultId,faultdescs,faultstatus,createtime,messageType,controller_id,device_id,longitude,latitude)
18
         values(#{faultId},#{faultdescs},#{faultstatus},#{createtime},#{messageType},#{controllerId},#{deviceId},#{longitude},#{latitude})
18
         values(#{faultId},#{faultdescs},#{faultstatus},#{createtime},#{messageType},#{controllerId},#{deviceId},#{longitude},#{latitude})
19
     </insert>
19
     </insert>

+ 3
- 3
iot-platform/src/main/resources/mapper/SysCarMapper.xml View File

18
         <result column="controllerId" property="controllerId"/>
18
         <result column="controllerId" property="controllerId"/>
19
     </resultMap>
19
     </resultMap>
20
 
20
 
21
-    <select id="selectcontrollerId" resultMap="BaseResultMap">
21
+    <select id="selectControllerId" resultMap="BaseResultMap">
22
         select
22
         select
23
             c.car_id carId,
23
             c.car_id carId,
24
             cc.controller_id controllerId
24
             cc.controller_id controllerId
25
         from sys_car c
25
         from sys_car c
26
         RIGHT join sys_car_controller cc on c.car_id=cc.car_id
26
         RIGHT join sys_car_controller cc on c.car_id=cc.car_id
27
     </select>
27
     </select>
28
-    <update id="updatecarposition">
28
+    <update id="updateCarPosition">
29
         update sys_car set car_position=#{carPosition} where car_id=#{carId}
29
         update sys_car set car_position=#{carPosition} where car_id=#{carId}
30
     </update>
30
     </update>
31
 
31
 
32
-    <select id="selectcarall" resultMap="BaseResultMap">
32
+    <select id="selectCarAll" resultMap="BaseResultMap">
33
         select car_id carId
33
         select car_id carId
34
         from sys_car
34
         from sys_car
35
     </select>
35
     </select>

+ 9
- 9
iot-platform/src/main/resources/mapper/SysControllerMapper.xml View File

12
         <result column="path" property="path"/>
12
         <result column="path" property="path"/>
13
     </resultMap>
13
     </resultMap>
14
 
14
 
15
-    <insert id="insertsyscontroller">
15
+    <insert id="insertSysController">
16
         insert into controller_accept(controller_id, timestamp, fleet_id, name, path, device_id)
16
         insert into controller_accept(controller_id, timestamp, fleet_id, name, path, device_id)
17
         values (#{controllerId}, #{timestamp}, #{fleetId}, #{name}, #{path}, #{deviceId})
17
         values (#{controllerId}, #{timestamp}, #{fleetId}, #{name}, #{path}, #{deviceId})
18
     </insert>
18
     </insert>
19
-    <insert id="insertsyscontrollercmd">
19
+    <insert id="insertSysControllerCmd">
20
         insert into controller_issue(controller_id, timestamp, fleet_id, name, path)
20
         insert into controller_issue(controller_id, timestamp, fleet_id, name, path)
21
         values (#{controllerId}, #{timestamp}, #{fleetId}, #{name}, #{path})
21
         values (#{controllerId}, #{timestamp}, #{fleetId}, #{name}, #{path})
22
     </insert>
22
     </insert>
23
-    <insert id="insertsyscontrollerfault">
23
+    <insert id="insertSysControllerFault">
24
         insert into controller_fault(controller_id, timestamp, fleet_id, name, path)
24
         insert into controller_fault(controller_id, timestamp, fleet_id, name, path)
25
         values (#{controllerId}, #{timestamp}, #{fleetId}, #{name}, #{path})
25
         values (#{controllerId}, #{timestamp}, #{fleetId}, #{name}, #{path})
26
     </insert>
26
     </insert>
27
 
27
 
28
 
28
 
29
-    <select id="selectsyscontrollercount" resultType="Integer">
29
+    <select id="selectSysControllerCount" resultType="Integer">
30
         select COUNT(*) count
30
         select COUNT(*) count
31
         from controller_accept
31
         from controller_accept
32
         where path =#{path}
32
         where path =#{path}
33
     </select>
33
     </select>
34
 
34
 
35
-    <select id="selectsyscontrollercountcmd" resultType="Integer">
35
+    <select id="selectSysControllerCmdCount" resultType="Integer">
36
         select COUNT(*) count
36
         select COUNT(*) count
37
         from controller_issue
37
         from controller_issue
38
         where path =#{path}
38
         where path =#{path}
39
     </select>
39
     </select>
40
-    <select id="selectsyscontrollercountfault" resultType="Integer">
40
+    <select id="selectSysControllerFaultCount" resultType="Integer">
41
         select COUNT(*)
41
         select COUNT(*)
42
         from controller_fault
42
         from controller_fault
43
         where path = #{path}
43
         where path = #{path}
44
     </select>
44
     </select>
45
-    <update id="updatecontrollerAccept">
45
+    <update id="updateControllerAccept">
46
         update controller_accept
46
         update controller_accept
47
         set controller_id=#{controllerId},
47
         set controller_id=#{controllerId},
48
             timestamp=#{timestamp},
48
             timestamp=#{timestamp},
54
     </update>
54
     </update>
55
 
55
 
56
 
56
 
57
-    <select id="selectcontrollerpath" resultMap="BaseResultMap">
57
+    <select id="selectControllerPath" resultMap="BaseResultMap">
58
         select controller_id controllerId, timestamp timestamp, fleet_id fleetId, name name, path path
58
         select controller_id controllerId, timestamp timestamp, fleet_id fleetId, name name, path path
59
         FROM controller_accept
59
         FROM controller_accept
60
         where path =#{path}
60
         where path =#{path}
61
     </select>
61
     </select>
62
-    <select id="selectall" resultType="String">
62
+    <select id="selectAll" resultType="String">
63
         select path path
63
         select path path
64
         from controller_accept
64
         from controller_accept
65
     </select>
65
     </select>

+ 1
- 1
iot-platform/src/main/resources/mapper/SysDeviceControlMapper.xml View File

12
         <result column="createOperationId" property="createOperationId"/>
12
         <result column="createOperationId" property="createOperationId"/>
13
         <result column="tableType" property="tableType"/>
13
         <result column="tableType" property="tableType"/>
14
     </resultMap>
14
     </resultMap>
15
-    <select id="selectdevice" resultMap="BaseResultMap">
15
+    <select id="selectDevice" resultMap="BaseResultMap">
16
         select
16
         select
17
             id id,
17
             id id,
18
             device_name deviceName,
18
             device_name deviceName,

+ 1
- 1
iot-platform/src/main/resources/mapper/SysDeviceMapper.xml View File

12
         <result column="v" property="v"/>
12
         <result column="v" property="v"/>
13
     </resultMap>
13
     </resultMap>
14
 
14
 
15
-    <select id="selectsysdevice" resultMap="BaseResultMap">
15
+    <select id="selectSysDevice" resultMap="BaseResultMap">
16
         select v from `${tableName}` where k=#{k}
16
         select v from `${tableName}` where k=#{k}
17
     </select>
17
     </select>
18
 </mapper>
18
 </mapper>

+ 2
- 2
iot-platform/src/main/resources/mapper/SysDeviceVoMapper.xml View File

17
         <result column="power" property="power"/>
17
         <result column="power" property="power"/>
18
     </resultMap>
18
     </resultMap>
19
 
19
 
20
-<!--    <insert id="insertdevice">-->
20
+<!--    <insert id="insertDevice">-->
21
 <!--        insert into sys_device(device_id,-->
21
 <!--        insert into sys_device(device_id,-->
22
 <!--                               device_name,-->
22
 <!--                               device_name,-->
23
 <!--                               soc,-->
23
 <!--                               soc,-->
40
 <!--            #{power})-->
40
 <!--            #{power})-->
41
 <!--    </insert>-->
41
 <!--    </insert>-->
42
 
42
 
43
-<!--    <update id="updatesysdevice">-->
43
+<!--    <update id="updateSysDevice">-->
44
 <!--        update sys_device set device_name=#{deviceName},-->
44
 <!--        update sys_device set device_name=#{deviceName},-->
45
 <!--                              soc=#{soc},-->
45
 <!--                              soc=#{soc},-->
46
 <!--                              chargingcapacity=#{chargingcapacity},-->
46
 <!--                              chargingcapacity=#{chargingcapacity},-->

+ 4
- 4
iot-platform/src/main/resources/mapper/SysFaultMapper.xml View File

12
         <result column="desc" property="desc"/>
12
         <result column="desc" property="desc"/>
13
     </resultMap>
13
     </resultMap>
14
 
14
 
15
-    <insert id="insertfault">
15
+    <insert id="insertFault">
16
         insert into alert_data(faultId,faultdescs,faultstatus,createtime,messageType,controller_id,device_id,longitude,latitude,readpeople)
16
         insert into alert_data(faultId,faultdescs,faultstatus,createtime,messageType,controller_id,device_id,longitude,latitude,readpeople)
17
         VALUES(#{faultId},#{faultdescs},#{faultstatus},#{createtime},#{messageType},#{controllerId},#{deviceId},#{longitude},#{latitude},#{readpeople})
17
         VALUES(#{faultId},#{faultdescs},#{faultstatus},#{createtime},#{messageType},#{controllerId},#{deviceId},#{longitude},#{latitude},#{readpeople})
18
     </insert>
18
     </insert>
19
-    <insert id="updatefault">
19
+    <insert id="updateFault">
20
         update alert_data set faultstatus=#{faultstatus},
20
         update alert_data set faultstatus=#{faultstatus},
21
                              messageType=#{messageType},
21
                              messageType=#{messageType},
22
                              longitude=#{longitude},
22
                              longitude=#{longitude},
29
         LIMIT 1;
29
         LIMIT 1;
30
     </insert>
30
     </insert>
31
 
31
 
32
-    <select id="selectfaultcount" resultType="Integer">
32
+    <select id="selectFaultCount" resultType="Integer">
33
         select count(*) from alert_data where device_id=#{deviceId}
33
         select count(*) from alert_data where device_id=#{deviceId}
34
     </select>
34
     </select>
35
-    <update id="createmessage">
35
+    <update id="createMessage">
36
         CREATE TABLE `${tableName}` (
36
         CREATE TABLE `${tableName}` (
37
         `faultId` varchar(255) DEFAULT NULL COMMENT '消息id',
37
         `faultId` varchar(255) DEFAULT NULL COMMENT '消息id',
38
         `faultdescs` varchar(255) DEFAULT NULL COMMENT '故障描述',
38
         `faultdescs` varchar(255) DEFAULT NULL COMMENT '故障描述',

+ 3
- 3
iot-platform/src/main/resources/mapper/SysIndicatorsMapper.xml View File

10
         <result column="profit" property="profit"/>
10
         <result column="profit" property="profit"/>
11
         <result column="carId" property="carId"/>
11
         <result column="carId" property="carId"/>
12
     </resultMap>
12
     </resultMap>
13
-    <insert id="insertindicators">
13
+    <insert id="insertIndicators">
14
         insert into sys_indicators(workordercount,profit,car_id,createdata)
14
         insert into sys_indicators(workordercount,profit,car_id,createdata)
15
         value(#{workordercount},#{profit},#{carId},#{createdata})
15
         value(#{workordercount},#{profit},#{carId},#{createdata})
16
     </insert>
16
     </insert>
17
 
17
 
18
-    <update id="updateindicators">
18
+    <update id="updateIndicators">
19
         update sys_indicators set workordercount=#{workordercount},profit=#{profit}
19
         update sys_indicators set workordercount=#{workordercount},profit=#{profit}
20
         where car_id=#{carId} and createdata=#{createdata}
20
         where car_id=#{carId} and createdata=#{createdata}
21
     </update>
21
     </update>
22
 
22
 
23
-    <select id="selectcarcount" resultType="integer">
23
+    <select id="selectCarCount" resultType="integer">
24
         select count(*)
24
         select count(*)
25
         from sys_indicators
25
         from sys_indicators
26
         where car_id=#{carId}
26
         where car_id=#{carId}

iot-platform/src/main/resources/mapper/SysrealtimeMapper.xml → iot-platform/src/main/resources/mapper/SysRealtimeMapper.xml View File

2
 <!DOCTYPE mapper
2
 <!DOCTYPE mapper
3
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
3
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
4
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5
-<mapper namespace="com.iot.platform.mapper.SysrealtimeMapper">
5
+<mapper namespace="com.iot.platform.mapper.SysRealtimeMapper">
6
     <!-- 通用查询映射结果 -->
6
     <!-- 通用查询映射结果 -->
7
-    <resultMap id="BaseResultMap" type="com.iot.platform.domain.Sysrealtime">
7
+    <resultMap id="BaseResultMap" type="com.iot.platform.domain.SysRealtime">
8
         <result column="createTime" property="createTime"/>
8
         <result column="createTime" property="createTime"/>
9
         <result column="deviceId" property="deviceId"/>
9
         <result column="deviceId" property="deviceId"/>
10
         <result column="timestamp" property="timestamp"/>
10
         <result column="timestamp" property="timestamp"/>
11
         <result column="k" property="k"/>
11
         <result column="k" property="k"/>
12
         <result column="v" property="v"/>
12
         <result column="v" property="v"/>
13
     </resultMap>
13
     </resultMap>
14
-    <update id="createrealtime">
14
+    <update id="createRealtime">
15
         CREATE TABLE IF NOT EXISTS `${tableName}` (
15
         CREATE TABLE IF NOT EXISTS `${tableName}` (
16
             create_time VARCHAR(255) NOT NULL COMMENT '时间戳',
16
             create_time VARCHAR(255) NOT NULL COMMENT '时间戳',
17
             device_id VARCHAR(255) NOT NULL COMMENT '设备id',
17
             device_id VARCHAR(255) NOT NULL COMMENT '设备id',
24
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='实时数据信息';
24
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='实时数据信息';
25
     </update>
25
     </update>
26
 
26
 
27
-    <select id="selecttables" resultType="String">
27
+    <select id="selectTables" resultType="String">
28
         SHOW TABLES;
28
         SHOW TABLES;
29
     </select>
29
     </select>
30
-    <insert id="inserttables">
30
+    <insert id="insertTables">
31
         insert into `${tableName}`(create_time,device_id,timestamp,k,v) values(#{createTime},#{deviceId},#{timestamp},#{k},#{v})
31
         insert into `${tableName}`(create_time,device_id,timestamp,k,v) values(#{createTime},#{deviceId},#{timestamp},#{k},#{v})
32
     </insert>
32
     </insert>
33
-    <update id="updatetables">
33
+    <update id="updateTables">
34
         update `${tableName}` set create_time=#{createTime},v=#{v},timestamp=#{timestamp} where k=#{k} and device_id=#{deviceId}
34
         update `${tableName}` set create_time=#{createTime},v=#{v},timestamp=#{timestamp} where k=#{k} and device_id=#{deviceId}
35
     </update>
35
     </update>
36
 
36
 
37
-    <select id="selectkey" resultType="Integer">
37
+    <select id="selectKey" resultType="Integer">
38
         select COUNT(*) from `${tableName}` where k=#{k}
38
         select COUNT(*) from `${tableName}` where k=#{k}
39
     </select>
39
     </select>
40
 
40
 

+ 3
- 3
iot-platform/src/main/resources/mapper/SysStatusMapper.xml View File

9
         <result column="fleetId" property="fleetId"/>
9
         <result column="fleetId" property="fleetId"/>
10
         <result column="status" property="status"/>
10
         <result column="status" property="status"/>
11
     </resultMap>
11
     </resultMap>
12
-    <insert id="insertsysstatus">
12
+    <insert id="insertSysStatus">
13
         Insert into controller_status(controller_id,fleet_id,status,create_time) values(#{controllerId},#{fleetId},#{status},#{createTime})
13
         Insert into controller_status(controller_id,fleet_id,status,create_time) values(#{controllerId},#{fleetId},#{status},#{createTime})
14
     </insert>
14
     </insert>
15
-    <update id="updatestatus">
15
+    <update id="updateStatus">
16
         update controller_status set fleet_id=#{fleetId},status=#{status},create_time=#{createTime} where controller_id=#{controllerId}
16
         update controller_status set fleet_id=#{fleetId},status=#{status},create_time=#{createTime} where controller_id=#{controllerId}
17
     </update>
17
     </update>
18
-    <select id="selectstatuscount" resultType="Integer">
18
+    <select id="selectStatusCount" resultType="Integer">
19
         select COUNT(*) from controller_status where controller_id=#{controllerId}
19
         select COUNT(*) from controller_status where controller_id=#{controllerId}
20
     </select>
20
     </select>
21
 </mapper>
21
 </mapper>

+ 3
- 3
iot-platform/src/main/resources/mapper/SysWorkorderMapper.xml View File

7
     <resultMap id="BaseResultMap" type="com.iot.platform.domain.SysWorkorder">
7
     <resultMap id="BaseResultMap" type="com.iot.platform.domain.SysWorkorder">
8
         <result column="driverId" property="driverId"/>
8
         <result column="driverId" property="driverId"/>
9
     </resultMap>
9
     </resultMap>
10
-    <select id="selectdeviceId" resultMap="BaseResultMap">
10
+    <select id="selectDeviceId" resultMap="BaseResultMap">
11
         select w.driver_id deviceId from sys_car_controller cc
11
         select w.driver_id deviceId from sys_car_controller cc
12
         LEFT JOIN sys_car c on cc.car_id=c.car_id
12
         LEFT JOIN sys_car c on cc.car_id=c.car_id
13
         LEFT JOIN sys_workorder w on w.car_id=c.car_id
13
         LEFT JOIN sys_workorder w on w.car_id=c.car_id
19
     </select>
19
     </select>
20
 
20
 
21
 
21
 
22
-    <select id="selectworkordercount" resultType="integer">
22
+    <select id="selectWorkorderCount" resultType="integer">
23
         select
23
         select
24
         count(*)
24
         count(*)
25
         from sys_workorder
25
         from sys_workorder
27
         and workorder_createtime=#{data}
27
         and workorder_createtime=#{data}
28
     </select>
28
     </select>
29
 
29
 
30
-    <select id="selectwokroderprofit" resultType="double">
30
+    <select id="selectWorkorderProfit" resultType="double">
31
         select
31
         select
32
         sum(mondel)
32
         sum(mondel)
33
         from sys_workorder
33
         from sys_workorder

+ 4
- 4
iot-platform/src/test/java/com/iot/platform/mqtt/MqttDynamicConsumerTest.java View File

56
     }
56
     }
57
 
57
 
58
     @Test
58
     @Test
59
-    @DisplayName("fetchTopics 应返回 sysControllerService.selectall() 的结果")
59
+    @DisplayName("fetchTopics 应返回 sysControllerService.selectAll() 的结果")
60
     void fetchTopics_delegatesToService() {
60
     void fetchTopics_delegatesToService() {
61
         List<String> expected = Arrays.asList("topic/1", "topic/2");
61
         List<String> expected = Arrays.asList("topic/1", "topic/2");
62
-        when(sysControllerService.selectall()).thenReturn(expected);
62
+        when(sysControllerService.selectAll()).thenReturn(expected);
63
 
63
 
64
         List<String> result = consumer.fetchTopics();
64
         List<String> result = consumer.fetchTopics();
65
 
65
 
66
         assertThat(result).isEqualTo(expected);
66
         assertThat(result).isEqualTo(expected);
67
-        verify(sysControllerService).selectall();
67
+        verify(sysControllerService).selectAll();
68
     }
68
     }
69
 
69
 
70
     @Test
70
     @Test
71
     @DisplayName("fetchTopics 应处理 null 返回值")
71
     @DisplayName("fetchTopics 应处理 null 返回值")
72
     void fetchTopics_nullReturn_returnsNull() {
72
     void fetchTopics_nullReturn_returnsNull() {
73
-        when(sysControllerService.selectall()).thenReturn(null);
73
+        when(sysControllerService.selectAll()).thenReturn(null);
74
 
74
 
75
         List<String> result = consumer.fetchTopics();
75
         List<String> result = consumer.fetchTopics();
76
 
76
 

+ 52
- 52
iot-platform/src/test/java/com/iot/platform/mqtt/MqttFaultConsumerTest.java View File

37
     private SysFaultService sysFaultService;
37
     private SysFaultService sysFaultService;
38
 
38
 
39
     @Mock
39
     @Mock
40
-    private SysrealtimeService sysrealtimeService;
40
+    private SysRealtimeService sysRealtimeService;
41
 
41
 
42
     @Mock
42
     @Mock
43
     private SysWorkorderService sysWorkorderService;
43
     private SysWorkorderService sysWorkorderService;
69
     void setUp() {
69
     void setUp() {
70
         mqttFaultConsumer = new MqttFaultConsumer(
70
         mqttFaultConsumer = new MqttFaultConsumer(
71
                 mqttFaultExecutor, abstractConsumerExecutor, iotProperties,
71
                 mqttFaultExecutor, abstractConsumerExecutor, iotProperties,
72
-                sysControllerService, sysFaultService, sysrealtimeService,
72
+                sysControllerService, sysFaultService, sysRealtimeService,
73
                 sysAlarmService, numericIdGenerator,
73
                 sysAlarmService, numericIdGenerator,
74
                 tdEngineAlarm, restTemplate);
74
                 tdEngineAlarm, restTemplate);
75
 
75
 
105
     @Test
105
     @Test
106
     @DisplayName("insertTDegine maps keys correctly via KEY_MAPPING")
106
     @DisplayName("insertTDegine maps keys correctly via KEY_MAPPING")
107
     void insertTDegine_mapsKeysCorrectly() throws SQLException {
107
     void insertTDegine_mapsKeysCorrectly() throws SQLException {
108
-        Map<String, Object> weather = new HashMap<>();
109
-        weather.put("timestamp", "2024-01-01T00:00:00Z");
110
-        weather.put("type", "触发");
111
-        weather.put("desc", "overtemperature");
112
-        weather.put("other", "value");
108
+        Map<String, Object> faultData = new HashMap<>();
109
+        faultData.put("timestamp", "2024-01-01T00:00:00Z");
110
+        faultData.put("type", "触发");
111
+        faultData.put("desc", "overtemperature");
112
+        faultData.put("other", "value");
113
 
113
 
114
         String topic = "controller1/fault_prot";
114
         String topic = "controller1/fault_prot";
115
 
115
 
116
-        mqttFaultConsumer.insertTdEngine(weather, topic);
116
+        mqttFaultConsumer.insertTdEngine(faultData, topic);
117
 
117
 
118
         verify(tdEngineAlarm).recordFailure(argThat(map ->
118
         verify(tdEngineAlarm).recordFailure(argThat(map ->
119
                 "2024-01-01T00:00:00Z".equals(map.get("devicetimestamp"))
119
                 "2024-01-01T00:00:00Z".equals(map.get("devicetimestamp"))
129
     @Test
129
     @Test
130
     @DisplayName("insertTDegine splits topic correctly")
130
     @DisplayName("insertTDegine splits topic correctly")
131
     void insertTDegine_splitsTopicCorrectly() throws SQLException {
131
     void insertTDegine_splitsTopicCorrectly() throws SQLException {
132
-        Map<String, Object> weather = new HashMap<>();
133
-        weather.put("timestamp", "2024-01-01T00:00:00Z");
132
+        Map<String, Object> faultData = new HashMap<>();
133
+        faultData.put("timestamp", "2024-01-01T00:00:00Z");
134
 
134
 
135
         String topic = "myController/fault_prot";
135
         String topic = "myController/fault_prot";
136
         LocalDate now = LocalDate.now();
136
         LocalDate now = LocalDate.now();
138
         int month = now.getMonthValue();
138
         int month = now.getMonthValue();
139
         String expectedTable = "myController_" + year + String.format("%02d", month);
139
         String expectedTable = "myController_" + year + String.format("%02d", month);
140
 
140
 
141
-        mqttFaultConsumer.insertTdEngine(weather, topic);
141
+        mqttFaultConsumer.insertTdEngine(faultData, topic);
142
 
142
 
143
         verify(tdEngineAlarm).recordFailure(anyMap(), eq("myController"), eq(expectedTable));
143
         verify(tdEngineAlarm).recordFailure(anyMap(), eq("myController"), eq(expectedTable));
144
     }
144
     }
149
         String topic = "ctrl1/fault_prot";
149
         String topic = "ctrl1/fault_prot";
150
         String messageContent = "{\"device_id\":\"dev1\",\"controller_id\":\"ctrl1\",\"timestamp\":\"2024-01-01T00:00:00Z\",\"type\":\"触发\",\"code\":1,\"desc\":\"overtemperature\"}";
150
         String messageContent = "{\"device_id\":\"dev1\",\"controller_id\":\"ctrl1\",\"timestamp\":\"2024-01-01T00:00:00Z\",\"type\":\"触发\",\"code\":1,\"desc\":\"overtemperature\"}";
151
 
151
 
152
-        SysDevice jingdu = new SysDevice();
153
-        jingdu.setV("116.3974");
154
-        SysDevice weidu = new SysDevice();
155
-        weidu.setV("39.9093");
152
+        SysDevice longitude = new SysDevice();
153
+        longitude.setV("116.3974");
154
+        SysDevice latitude = new SysDevice();
155
+        latitude.setV("39.9093");
156
 
156
 
157
-        lenient().when(sysrealtimeService.selecttables()).thenReturn(Collections.singletonList("ctrl1" + LocalDate.now().getYear() + String.format("%02d", LocalDate.now().getMonthValue()) + "_fault"));
158
-        lenient().when(sysControllerService.selectjingweidu("ctrl1", "经度")).thenReturn(jingdu);
159
-        lenient().when(sysControllerService.selectjingweidu("ctrl1", "纬度")).thenReturn(weidu);
157
+        lenient().when(sysRealtimeService.selectTables()).thenReturn(Collections.singletonList("ctrl1" + LocalDate.now().getYear() + String.format("%02d", LocalDate.now().getMonthValue()) + "_fault"));
158
+        lenient().when(sysControllerService.selectCoordinates("ctrl1", "经度")).thenReturn(longitude);
159
+        lenient().when(sysControllerService.selectCoordinates("ctrl1", "纬度")).thenReturn(latitude);
160
         lenient().when(numericIdGenerator.nextId()).thenReturn("123456789");
160
         lenient().when(numericIdGenerator.nextId()).thenReturn("123456789");
161
 
161
 
162
         mqttFaultConsumer.handleMessage(topic, messageContent);
162
         mqttFaultConsumer.handleMessage(topic, messageContent);
165
     }
165
     }
166
 
166
 
167
     @Test
167
     @Test
168
-    @DisplayName("triggermethod with 触发 type calls insertalarm and insertfault")
168
+    @DisplayName("triggerMethod with 触发 type calls insertAlarm and insertFault")
169
     void triggermethod_triggerType_callsInsertAlarmAndInsertFault() {
169
     void triggermethod_triggerType_callsInsertAlarmAndInsertFault() {
170
-        SysFault weather = new SysFault();
171
-        weather.setDevice_id("dev1");
172
-        weather.setController_id("ctrl1");
173
-        weather.setTimestamp("2024-01-01T00:00:00Z");
174
-        weather.setType("触发");
175
-        weather.setDesc("overtemperature");
170
+        SysFault faultData = new SysFault();
171
+        faultData.setDevice_id("dev1");
172
+        faultData.setController_id("ctrl1");
173
+        faultData.setTimestamp("2024-01-01T00:00:00Z");
174
+        faultData.setType("触发");
175
+        faultData.setDesc("overtemperature");
176
 
176
 
177
         String topic = "ctrl1/fault_prot";
177
         String topic = "ctrl1/fault_prot";
178
 
178
 
179
-        SysDevice jingdu = new SysDevice();
180
-        jingdu.setV("116.3974");
181
-        SysDevice weidu = new SysDevice();
182
-        weidu.setV("39.9093");
179
+        SysDevice longitude = new SysDevice();
180
+        longitude.setV("116.3974");
181
+        SysDevice latitude = new SysDevice();
182
+        latitude.setV("39.9093");
183
 
183
 
184
-        when(sysrealtimeService.selecttables()).thenReturn(Collections.singletonList("ctrl1" + LocalDate.now().getYear() + String.format("%02d", LocalDate.now().getMonthValue()) + "_fault"));
185
-        when(sysControllerService.selectjingweidu("ctrl1", "经度")).thenReturn(jingdu);
186
-        when(sysControllerService.selectjingweidu("ctrl1", "纬度")).thenReturn(weidu);
184
+        when(sysRealtimeService.selectTables()).thenReturn(Collections.singletonList("ctrl1" + LocalDate.now().getYear() + String.format("%02d", LocalDate.now().getMonthValue()) + "_fault"));
185
+        when(sysControllerService.selectCoordinates("ctrl1", "经度")).thenReturn(longitude);
186
+        when(sysControllerService.selectCoordinates("ctrl1", "纬度")).thenReturn(latitude);
187
         when(numericIdGenerator.nextId()).thenReturn("123456789");
187
         when(numericIdGenerator.nextId()).thenReturn("123456789");
188
 
188
 
189
-        mqttFaultConsumer.triggermethod(topic, weather);
189
+        mqttFaultConsumer.triggerMethod(topic, faultData);
190
 
190
 
191
-        verify(sysAlarmService).insertalarm(anyString(), eq("GJ123456789"), eq("overtemperature"), eq("0"), anyString(), eq("0"), eq("ctrl1"), eq("dev1"), eq("116.3974"), eq("39.9093"));
192
-        verify(sysFaultService).insertfault(eq("GJ123456789"), eq("overtemperature"), eq("0"), anyString(), eq("0"), eq("ctrl1"), eq("dev1"), eq("116.3974"), eq("39.9093"), eq(""));
191
+        verify(sysAlarmService).insertAlarm(anyString(), eq("GJ123456789"), eq("overtemperature"), eq("0"), anyString(), eq("0"), eq("ctrl1"), eq("dev1"), eq("116.3974"), eq("39.9093"));
192
+        verify(sysFaultService).insertFault(eq("GJ123456789"), eq("overtemperature"), eq("0"), anyString(), eq("0"), eq("ctrl1"), eq("dev1"), eq("116.3974"), eq("39.9093"), eq(""));
193
     }
193
     }
194
 
194
 
195
     @Test
195
     @Test
196
-    @DisplayName("triggermethod with 恢复 type calls insertalarm and updatefault")
196
+    @DisplayName("triggerMethod with 恢复 type calls insertAlarm and updateFault")
197
     void triggermethod_recoverType_callsInsertAlarmAndUpdateFault() {
197
     void triggermethod_recoverType_callsInsertAlarmAndUpdateFault() {
198
-        SysFault weather = new SysFault();
199
-        weather.setDevice_id("dev1");
200
-        weather.setController_id("ctrl1");
201
-        weather.setTimestamp("2024-01-01T00:00:00Z");
202
-        weather.setType("恢复");
203
-        weather.setDesc("overtemperature recovered");
198
+        SysFault faultData = new SysFault();
199
+        faultData.setDevice_id("dev1");
200
+        faultData.setController_id("ctrl1");
201
+        faultData.setTimestamp("2024-01-01T00:00:00Z");
202
+        faultData.setType("恢复");
203
+        faultData.setDesc("overtemperature recovered");
204
 
204
 
205
         String topic = "ctrl1/fault_prot";
205
         String topic = "ctrl1/fault_prot";
206
 
206
 
207
-        SysDevice jingdu = new SysDevice();
208
-        jingdu.setV("116.3974");
209
-        SysDevice weidu = new SysDevice();
210
-        weidu.setV("39.9093");
207
+        SysDevice longitude = new SysDevice();
208
+        longitude.setV("116.3974");
209
+        SysDevice latitude = new SysDevice();
210
+        latitude.setV("39.9093");
211
 
211
 
212
-        when(sysrealtimeService.selecttables()).thenReturn(Collections.singletonList("ctrl1" + LocalDate.now().getYear() + String.format("%02d", LocalDate.now().getMonthValue()) + "_fault"));
213
-        when(sysControllerService.selectjingweidu("ctrl1", "经度")).thenReturn(jingdu);
214
-        when(sysControllerService.selectjingweidu("ctrl1", "纬度")).thenReturn(weidu);
212
+        when(sysRealtimeService.selectTables()).thenReturn(Collections.singletonList("ctrl1" + LocalDate.now().getYear() + String.format("%02d", LocalDate.now().getMonthValue()) + "_fault"));
213
+        when(sysControllerService.selectCoordinates("ctrl1", "经度")).thenReturn(longitude);
214
+        when(sysControllerService.selectCoordinates("ctrl1", "纬度")).thenReturn(latitude);
215
         when(numericIdGenerator.nextId()).thenReturn("987654321");
215
         when(numericIdGenerator.nextId()).thenReturn("987654321");
216
 
216
 
217
-        mqttFaultConsumer.triggermethod(topic, weather);
217
+        mqttFaultConsumer.triggerMethod(topic, faultData);
218
 
218
 
219
-        verify(sysAlarmService).insertalarm(anyString(), eq("GJ987654321"), eq("overtemperature recovered"), eq("1"), anyString(), eq("0"), eq("ctrl1"), eq("dev1"), eq("116.3974"), eq("39.9093"));
220
-        verify(sysFaultService).updatefault(eq("1"), eq("0"), eq("116.3974"), eq("39.9093"), eq("overtemperature recovered"), eq("ctrl1"), eq("dev1"), anyString());
219
+        verify(sysAlarmService).insertAlarm(anyString(), eq("GJ987654321"), eq("overtemperature recovered"), eq("1"), anyString(), eq("0"), eq("ctrl1"), eq("dev1"), eq("116.3974"), eq("39.9093"));
220
+        verify(sysFaultService).updateFault(eq("1"), eq("0"), eq("116.3974"), eq("39.9093"), eq("overtemperature recovered"), eq("ctrl1"), eq("dev1"), anyString());
221
     }
221
     }
222
 }
222
 }

iot-platform/src/test/java/com/iot/platform/service/SysrealtimeServiceTest.java → iot-platform/src/test/java/com/iot/platform/service/SysRealtimeServiceTest.java View File

1
 package com.iot.platform.service;
1
 package com.iot.platform.service;
2
 
2
 
3
-import com.iot.platform.mapper.SysrealtimeMapper;
3
+import com.iot.platform.mapper.SysRealtimeMapper;
4
 import org.junit.jupiter.api.DisplayName;
4
 import org.junit.jupiter.api.DisplayName;
5
 import org.junit.jupiter.api.Test;
5
 import org.junit.jupiter.api.Test;
6
 import org.junit.jupiter.api.extension.ExtendWith;
6
 import org.junit.jupiter.api.extension.ExtendWith;
12
 import static org.mockito.Mockito.*;
12
 import static org.mockito.Mockito.*;
13
 
13
 
14
 @ExtendWith(MockitoExtension.class)
14
 @ExtendWith(MockitoExtension.class)
15
-class SysrealtimeServiceTest {
15
+class SysRealtimeServiceTest {
16
 
16
 
17
     @Mock
17
     @Mock
18
-    private SysrealtimeMapper sysrealtimeMapper;
18
+    private SysRealtimeMapper sysRealtimeMapper;
19
 
19
 
20
     @InjectMocks
20
     @InjectMocks
21
-    private SysrealtimeService service;
21
+    private SysRealtimeService service;
22
 
22
 
23
     @Test
23
     @Test
24
-    @DisplayName("createrealtime: 空表名应抛出 IllegalArgumentException")
24
+    @DisplayName("createRealtime: 空表名应抛出 IllegalArgumentException")
25
     void createrealtime_nullTableName_throws() {
25
     void createrealtime_nullTableName_throws() {
26
-        assertThatThrownBy(() -> service.createrealtime(null))
26
+        assertThatThrownBy(() -> service.createRealtime(null))
27
             .isInstanceOf(IllegalArgumentException.class)
27
             .isInstanceOf(IllegalArgumentException.class)
28
             .hasMessageContaining("表名不能为空");
28
             .hasMessageContaining("表名不能为空");
29
     }
29
     }
30
 
30
 
31
     @Test
31
     @Test
32
-    @DisplayName("createrealtime: SQL注入表名应抛出 IllegalArgumentException")
32
+    @DisplayName("createRealtime: SQL注入表名应抛出 IllegalArgumentException")
33
     void createrealtime_sqlInjectionTableName_throws() {
33
     void createrealtime_sqlInjectionTableName_throws() {
34
-        assertThatThrownBy(() -> service.createrealtime("users; DROP TABLE users;"))
34
+        assertThatThrownBy(() -> service.createRealtime("users; DROP TABLE users;"))
35
             .isInstanceOf(IllegalArgumentException.class)
35
             .isInstanceOf(IllegalArgumentException.class)
36
             .hasMessageContaining("非法表名");
36
             .hasMessageContaining("非法表名");
37
     }
37
     }
38
 
38
 
39
     @Test
39
     @Test
40
-    @DisplayName("createrealtime: 超长表名应抛出 IllegalArgumentException")
40
+    @DisplayName("createRealtime: 超长表名应抛出 IllegalArgumentException")
41
     void createrealtime_tooLongTableName_throws() {
41
     void createrealtime_tooLongTableName_throws() {
42
-        assertThatThrownBy(() -> service.createrealtime("a".repeat(65)))
42
+        assertThatThrownBy(() -> service.createRealtime("a".repeat(65)))
43
             .isInstanceOf(IllegalArgumentException.class)
43
             .isInstanceOf(IllegalArgumentException.class)
44
             .hasMessageContaining("表名过长");
44
             .hasMessageContaining("表名过长");
45
     }
45
     }
46
 
46
 
47
     @Test
47
     @Test
48
-    @DisplayName("createrealtime: 合法表名应调用 mapper")
48
+    @DisplayName("createRealtime: 合法表名应调用 mapper")
49
     void createrealtime_validTableName_callsMapper() {
49
     void createrealtime_validTableName_callsMapper() {
50
-        service.createrealtime("device_data_202401");
51
-        verify(sysrealtimeMapper).createrealtime("device_data_202401");
50
+        service.createRealtime("device_data_202401");
51
+        verify(sysRealtimeMapper).createRealtime("device_data_202401");
52
     }
52
     }
53
 
53
 
54
     @Test
54
     @Test
55
-    @DisplayName("inserttables: 非法表名应抛出异常且不调用 mapper")
55
+    @DisplayName("insertTables: 非法表名应抛出异常且不调用 mapper")
56
     void inserttables_invalidTableName_throwsWithoutCallingMapper() {
56
     void inserttables_invalidTableName_throwsWithoutCallingMapper() {
57
-        assertThatThrownBy(() -> service.inserttables("bad;name", "2024-01-01", "D1", "ts", "k", "v"))
57
+        assertThatThrownBy(() -> service.insertTables("bad;name", "2024-01-01", "D1", "ts", "k", "v"))
58
             .isInstanceOf(IllegalArgumentException.class);
58
             .isInstanceOf(IllegalArgumentException.class);
59
-        verifyNoInteractions(sysrealtimeMapper);
59
+        verifyNoInteractions(sysRealtimeMapper);
60
     }
60
     }
61
 
61
 
62
     @Test
62
     @Test
63
-    @DisplayName("updatetables: 合法表名应调用 mapper")
63
+    @DisplayName("updateTables: 合法表名应调用 mapper")
64
     void updatetables_validTableName_callsMapper() {
64
     void updatetables_validTableName_callsMapper() {
65
-        service.updatetables("dev_001", "2024-01-01", "v1", "ts", "key1", "D1");
66
-        verify(sysrealtimeMapper).updatetables("dev_001", "2024-01-01", "v1", "ts", "key1", "D1");
65
+        service.updateTables("dev_001", "2024-01-01", "v1", "ts", "key1", "D1");
66
+        verify(sysRealtimeMapper).updateTables("dev_001", "2024-01-01", "v1", "ts", "key1", "D1");
67
     }
67
     }
68
 
68
 
69
     @Test
69
     @Test
70
-    @DisplayName("selectkey: 非法表名应抛出异常")
70
+    @DisplayName("selectKey: 非法表名应抛出异常")
71
     void selectkey_invalidTableName_throws() {
71
     void selectkey_invalidTableName_throws() {
72
-        assertThatThrownBy(() -> service.selectkey("--comment", "k"))
72
+        assertThatThrownBy(() -> service.selectKey("--comment", "k"))
73
             .isInstanceOf(IllegalArgumentException.class)
73
             .isInstanceOf(IllegalArgumentException.class)
74
             .hasMessageContaining("非法表名");
74
             .hasMessageContaining("非法表名");
75
     }
75
     }
78
     @DisplayName("selectAllKeys: 合法表名应调用 mapper")
78
     @DisplayName("selectAllKeys: 合法表名应调用 mapper")
79
     void selectAllKeys_validTableName_callsMapper() {
79
     void selectAllKeys_validTableName_callsMapper() {
80
         service.selectAllKeys("realtime_001");
80
         service.selectAllKeys("realtime_001");
81
-        verify(sysrealtimeMapper).selectAllKeys("realtime_001");
81
+        verify(sysRealtimeMapper).selectAllKeys("realtime_001");
82
     }
82
     }
83
 }
83
 }

Loading…
Cancel
Save