Pre Merge pull request !45 from 山海守门人/dev260107_2

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
           cp Release.txt LICENSE release/
           cat Release.txt
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           # Eclipse基金会维护的开源Java发行版 因为github action参考java的用这个 所以用这个

pom.xml

@@ -448,13 +448,22 @@
             </plugin>
 
             <plugin>
-                <groupId>pl.project13.maven</groupId>
+                <groupId>io.github.git-commit-id</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
-                <version>4.9.10</version>
+                <version>9.0.1</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                    </execution>
+                </executions>
                 <configuration>
-                    <offline>true</offline>
+                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
+                    <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
-                    <dateFormat>yyyyMMdd</dateFormat>
+                    <commitIdGenerationMode>full</commitIdGenerationMode>
                 </configuration>
             </plugin>
 

src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java

@@ -634,14 +634,14 @@ public interface CommonGBChannelMapper {
                                        @Param("level") Integer level, @Param("groupList") List<CameraGroup> groupList);
 
     @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForMysql", databaseId = "mysql")
-    @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForH2", databaseId = "h2")
+    @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForMysql", databaseId = "h2")
     @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForKingBase", databaseId = "kingbase")
     @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForKingBase", databaseId = "postgresql")
     List<CameraChannel> queryListInCircle(@Param("centerLongitude") Double centerLongitude, @Param("centerLatitude") Double centerLatitude,
                                           @Param("radius") Double radius, @Param("level") Integer level, @Param("groupList") List<CameraGroup> groupList);
 
     @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForMysql", databaseId = "mysql")
-    @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForH2", databaseId = "h2")
+    @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForMysql", databaseId = "h2")
     @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForKingBase", databaseId = "kingbase")
     @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForKingBase", databaseId = "postgresql")
     List<CameraChannel> queryListInPolygon(@Param("pointList") List<Point> pointList, @Param("level") Integer level, @Param("groupList") List<CameraGroup> groupList);

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceStatusQueryMessageHandler.java

@@ -50,9 +50,9 @@ public class DeviceStatusQueryMessageHandler extends SIPRequestProcessorParent i
     }
 
     @Override
-    public void handForPlatform(RequestEvent evt, Platform parentPlatform, Element rootElement) {
+    public void handForPlatform(RequestEvent evt, Platform platform, Element rootElement) {
 
-        log.info("接收到DeviceStatus查询消息");
+        log.info("[DeviceStatus Query] \n {}", rootElement.asXML());
         FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
         // 回复200 OK
         try {
@@ -62,13 +62,22 @@ public class DeviceStatusQueryMessageHandler extends SIPRequestProcessorParent i
         }
         String sn = rootElement.element("SN").getText();
         String channelId = getText(rootElement, "DeviceID");
-        CommonGBChannel channel= channelService.queryOneWithPlatform(parentPlatform.getId(), channelId);
+        if (platform.getDeviceGBId().equals(channelId)) {
+            // 上级平台查询本平台状态
+            try {
+                cmderFroPlatform.deviceStatusResponse(platform, channelId, sn, fromHeader.getTag(), true);
+            } catch (SipException | InvalidArgumentException | ParseException e) {
+                log.error("[命令发送失败] 国标级联 DeviceStatus查询回复: {}", e.getMessage());
+            }
+            return;
+        }
+        CommonGBChannel channel= channelService.queryOneWithPlatform(platform.getId(), channelId);
         if (channel ==null){
-            log.error("[平台没有该通道的使用权限]:platformId"+parentPlatform.getServerGBId()+"  deviceID:"+channelId);
+            log.error("[平台没有该通道的使用权限]:platformId"+platform.getServerGBId()+"  deviceID:"+channelId);
             return;
         }
         try {
-            cmderFroPlatform.deviceStatusResponse(parentPlatform, channelId, sn, fromHeader.getTag(), "ON".equalsIgnoreCase(channel.getGbStatus()));
+            cmderFroPlatform.deviceStatusResponse(platform, channelId, sn, fromHeader.getTag(), "ON".equalsIgnoreCase(channel.getGbStatus()));
         } catch (SipException | InvalidArgumentException | ParseException e) {
             log.error("[命令发送失败] 国标级联 DeviceStatus查询回复: {}", e.getMessage());
         }

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusResponseMessageHandler.java

@@ -40,7 +40,7 @@ public class DeviceStatusResponseMessageHandler extends SIPRequestProcessorParen
 
     @Override
     public void handForDevice(RequestEvent evt, Device device, Element element) {
-        log.info("接收到DeviceStatus应答消息");
+        log.info("[DeviceStatus Response] \n {}", element.asXML());
         // 检查设备是否存在， 不存在则不回复
         if (device == null) {
             return;

src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java

@@ -1,5 +1,6 @@
 package com.genersoft.iot.vmp.utils;
 
+import lombok.Getter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
@@ -7,6 +8,7 @@ import org.springframework.stereotype.Component;
 /**
  * 一个优秀的颓废程序猿（CSDN）
  */
+@Getter
 @Component
 @PropertySource(value = {"classpath:git.properties" }, ignoreResourceNotFound = true)
 public class GitUtil {
@@ -29,31 +31,4 @@ public class GitUtil {
     @Value("${git.commit.time:}")
     private String commitTime;
 
-    public String getGitCommitId() {
-        return gitCommitId;
-    }
-
-    public String getBranch() {
-        return branch;
-    }
-
-    public String getGitUrl() {
-        return gitUrl;
-    }
-
-    public String getBuildDate() {
-        return buildDate;
-    }
-
-    public String getCommitIdShort() {
-        return commitIdShort;
-    }
-
-    public String getBuildVersion() {
-        return buildVersion;
-    }
-
-    public String getCommitTime() {
-        return commitTime;
-    }
 }

web/src/views/dialog/devicePlayer.vue

@@ -517,7 +517,7 @@ export default {
           command,
           parseInt(this.controSpeed * 255 / 100),
           parseInt(this.controSpeed * 255 / 100),
-          parseInt(this.controSpeed * 16 / 100)
+          parseInt(this.controSpeed * 15 / 100)
         ])
     },
     irisCamera: function(command) {