From c432d5cede4fb9e48234523841d1e7257828d808 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 18 十月 2023 17:02:13 +0800
Subject: [PATCH] 优化往来单位及onvif
---
igds-inout/src/main/java/models/inout.model.xml | 3 +++
igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java | 20 ++++++++++----------
igds-protocol-block/pom.xml | 4 ++--
igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java | 31 +++++++++++++++++++------------
4 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/igds-inout/src/main/java/models/inout.model.xml b/igds-inout/src/main/java/models/inout.model.xml
index 0ca54b0..f0077c3 100644
--- a/igds-inout/src/main/java/models/inout.model.xml
+++ b/igds-inout/src/main/java/models/inout.model.xml
@@ -78,6 +78,7 @@
<Property name="valueProperty">name</Property>
<Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="khlx">
<Property></Property>
@@ -87,10 +88,12 @@
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="khbh">
<Property></Property>
<Property name="label">瀹㈡埛缂栫爜</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="fddbr">
<Property></Property>
diff --git a/igds-protocol-block/pom.xml b/igds-protocol-block/pom.xml
index 9251cef..9da0a41 100644
--- a/igds-protocol-block/pom.xml
+++ b/igds-protocol-block/pom.xml
@@ -29,13 +29,13 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
- <!--onvif鍗忚瀹炵幇
+ <!--onvif鍗忚瀹炵幇-->
<dependency>
<groupId>com.ld.onvif</groupId>
<artifactId>ld-onvif</artifactId>
<version>1.0.0-RELEASE</version>
</dependency>
- -->
+
<!-- 寮曞叆娴峰悍鐨� OpenAPI-->
<dependency>
diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java
index e990254..25686dd 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java
+++ b/igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java
@@ -7,6 +7,9 @@
import com.ld.igds.camera.data.ApiSnapReq;
import com.ld.igds.protocol.snap.SnapPluginService;
import com.ld.igds.sec.dto.SecCameraDto;
+import com.ld.onvif.OnvifService;
+import com.ld.onvif.data.OnvifResult;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -16,14 +19,15 @@
/**
* 椋庢鑷磋繙鑷湁娴佸獟浣撴湇鍔″櫒
*/
+@Slf4j
@Component
public class VlcMediaService implements ApiCameraService {
@Resource
private SnapPluginService snapPluginService;
-// @Resource
-// private OnvifService onvifService;
+ @Resource
+ private OnvifService onvifService;
@Override
public String getPlayType() {
@@ -49,11 +53,13 @@
}
try {
- return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
-// OnvifResult result = onvifService.ptz(param.getIp(), param.getPortV(), param.getLoginId(),
-// param.getPwd(), param.getCommand(), 0.5);
-//
-// return new ApiCameraResp(result.get("code") + "", (String) result.get("msg"));
+ log.debug("瑙嗛鎺у埗寮�濮�={}", param.toString());
+// return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
+ OnvifResult result = onvifService.ptz(param.getIp(), param.getPortV(), param.getLoginId(),
+ param.getPwd(), param.getCommand(), 0.5);
+
+ log.debug("瑙嗛鎺у埗={}", result.toString());
+ return new ApiCameraResp(result.get("code") + "", (String) result.get("msg"));
} catch (Exception e) {
@@ -69,11 +75,12 @@
return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
}
try {
- return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
-// OnvifResult result = onvifService.preset(param.getIp(), param.getPortV(),
-// param.getLoginId(), param.getPwd(), param.getPreset());
-//
-// return new ApiCameraResp((String) result.get("code"), (String) result.get("msg"));
+ log.debug("瑙嗛鎺у埗寮�濮�={}", param.toString());
+// return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
+ OnvifResult result = onvifService.preset(param.getIp(), param.getPortV(),
+ param.getLoginId(), param.getPwd(), param.getPreset());
+ log.debug("瑙嗛鎺у埗={}", result.toString());
+ return new ApiCameraResp((String) result.get("code"), (String) result.get("msg"));
} catch (Exception e) {
diff --git a/igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java b/igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java
index 95d8b67..1bcc8d0 100644
--- a/igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java
+++ b/igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java
@@ -27,15 +27,15 @@
@Override
public void run(String... strings) throws Exception {
- if (configData.getActive().equals("dev")) {
- serverEngine.start(BhznQuantityServerEngine.PORT);
- return;
- }
-
- //椋庢鑷磋繙榛樿閮ㄧ讲鏈嶅姟褰撳墠搴旂敤浣跨敤9000绔彛
- if (configData.getActive().indexOf("pro") >= 0) {
- serverEngine.start(BhznQuantityServerEngine.PORT);
- return;
- }
+// if (configData.getActive().equals("dev")) {
+// serverEngine.start(BhznQuantityServerEngine.PORT);
+// return;
+// }
+//
+// //椋庢鑷磋繙榛樿閮ㄧ讲鏈嶅姟褰撳墠搴旂敤浣跨敤9000绔彛
+// if (configData.getActive().indexOf("pro") >= 0) {
+// serverEngine.start(BhznQuantityServerEngine.PORT);
+// return;
+// }
}
}
--
Gitblit v1.9.3