From 94b83fc6cab9abf3a5991103580a0161344be6df Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 19:39:39 +0800
Subject: [PATCH] 监控表增加手机地址，调整手机接口播放方式
---
igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java | 29 ++++--
igds-core/src/main/resources/mapper/SecServiceMapper.xml | 21 +++-
igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml | 121 +++++++----------------------
igds-core/src/main/java/com/ld/igds/models/SecCamera.java | 22 ++--
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java | 21 +++-
5 files changed, 87 insertions(+), 127 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java
index 8119ced..70e5b76 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java
@@ -12,6 +12,7 @@
import com.ld.igds.phone.service.PhoneService;
import com.ld.igds.phone.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
+import com.ld.igds.sec.service.CoreSecCameraService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,6 +27,8 @@
@Autowired
private SecManager securityManager;
+ @Autowired
+ private CoreSecCameraService secCameraService;
@Override
public String getInterfaceId() {
@@ -43,19 +46,23 @@
if(param == null || StringUtils.isEmpty(param.getCameraId()) || StringUtils.isEmpty(param.getPlayType())){
return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鍙傛暟寮傚父锛岃閲嶈瘯锛�");
}
- // 鏍规嵁id鑾峰彇璁惧淇℃伅
-// SecCameraDto camera = securityManager.getCameraById(authUser.getCompanyId(), param.getCameraId(), true);
- SecCameraDto cameraParam = new SecCameraDto();
- cameraParam.setId(param.getCameraId());
- cameraParam.setCompanyId(authUser.getCompanyId());
- SecCameraDto camera = securityManager.getPlayAddr(cameraParam);
-
- if (camera == null) {
- return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
+ if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
}
- if (CameraUtil.PLAY_TYPE_DEFAULT.equals(camera.getPlayType())) {
- return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
+ //鑾峰彇璁惧淇℃伅
+ SecCameraDto camera = secCameraService.getCameraById(authUser.getCompanyId(), param.getCameraId());
+ if(null == camera){
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
+ }
+ if(StringUtils.isNotEmpty(camera.getPhoneAddr())){
+ camera.setPlayAddr(camera.getPhoneAddr());
+ return PhoneRespUtil.success(camera, req);
+ }
+
+ camera = securityManager.getPlayAddr(camera);
+ if (camera == null) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
}
return PhoneRespUtil.success(camera, req);
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
index 1ac4a38..875f00a 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
@@ -12,6 +12,7 @@
import com.ld.igds.phone35.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
import com.ld.igds.sec.manager.SecManager;
+import com.ld.igds.sec.service.CoreSecCameraService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,12 +26,14 @@
public class Phone35ServiceImpl5605 implements Phone35Service {
@Autowired
private SecManager securityManager;
-
+ @Autowired
+ private CoreSecCameraService secCameraService;
@Override
public String getInterfaceId() {
return Phone35Constant.API_PHONE_5605;
}
+ @SuppressWarnings("unchecked")
@Override
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
//杞寲瀵硅薄
@@ -42,20 +45,24 @@
if (StringUtils.isEmpty(param.getId())) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
- //鍙傛暟楠岃瘉
if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
}
- SecCameraDto cameraParam = new SecCameraDto();
- cameraParam.setId(param.getId());
- cameraParam.setCompanyId(phone35AuthUser.getCompanyId());
- SecCameraDto camera = securityManager.getPlayAddr(cameraParam);
-
+ //鑾峰彇璁惧淇℃伅
+ SecCameraDto camera = secCameraService.getCameraById(phone35AuthUser.getCompanyId(), param.getId());
if (camera == null) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "鏈煡璇㈠埌鐩稿叧璁惧锛�");
}
+ if(StringUtils.isNotEmpty(camera.getPhoneAddr())){
+ camera.setPlayAddr(camera.getPhoneAddr());
+ return PhoneRespUtil.success(camera, req);
+ }
+ camera = securityManager.getPlayAddr(camera);
+ if (camera == null) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
+ }
return PhoneRespUtil.success(camera, req);
}
diff --git a/igds-core/src/main/java/com/ld/igds/models/SecCamera.java b/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
index e80df65..1b49e25 100644
--- a/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
+++ b/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
@@ -52,9 +52,13 @@
@PropertyDef(label = "鎶撴媿鏂瑰紡")
private String snapType;
- @Column(name = "azwzlx", length = 2)
- @PropertyDef(label = "瀹夎浣嶇疆绫诲瀷")
- private String azwzlx;
+ @Column(name = "spjklx", length = 1)
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
+ private String spjklx;
+
+ @Column(name = "spdwlx", length = 2)
+ @PropertyDef(label = "瑙嗛鐐逛綅绫诲瀷")
+ private String spdwlx;
@Column(name = "NAME_", length = 50)
@PropertyDef(label = "鍚嶇О")
@@ -92,6 +96,10 @@
@PropertyDef(label = "娴佸獟浣撳湴鍧�")
private String mediaAddr;
+ @Column(name = "PHONE_ADDR_", length = 100)
+ @PropertyDef(label = "鎵嬫満鐩存挱鍦板潃")
+ private String phoneAddr;
+
@Column(name = "REMARK_", length = 300)
@PropertyDef(label = "澶囨敞")
private String remark;
@@ -115,14 +123,6 @@
@Column(name = "UPDATE_TIME_", length = 1)
@PropertyDef(label = "鏇存柊鏃堕棿")
private Date updateTime;
-
- @Column(name = "spjklx", length = 1)
- @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
- private String spjklx;
-
- @Column(name = "spdwlx", length = 2)
- @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
- private String spdwlx;
public int getChanNum() {
return chanNum;
diff --git a/igds-core/src/main/resources/mapper/SecServiceMapper.xml b/igds-core/src/main/resources/mapper/SecServiceMapper.xml
index 54c1ba8..3a18c75 100644
--- a/igds-core/src/main/resources/mapper/SecServiceMapper.xml
+++ b/igds-core/src/main/resources/mapper/SecServiceMapper.xml
@@ -8,23 +8,30 @@
<sql id="DATA_COLUMN">
ID_ as id,
+ SN_ AS sn,
COMPANY_ID_ as companyId,
DEPT_ID_ as deptId,
- NAME_ AS name,
- LOGIN_ID_
- AS loginId,
- PWD_ AS pwd,
- BRAND_ AS brand,
TYPE_ AS type,
PLAY_TYPE_ AS playType,
- SN_ AS sn,
+ SNAP_TYPE_ AS snapType,
+ spjklx AS spjklx,
+ spdwlx AS spdwlx,
+ NAME_ AS name,
+ LOGIN_ID_ AS loginId,
+ PWD_ AS pwd,
IP_IN_ AS ipIn,
PORT_IN_C_ AS portInC,
PORT_IN_V_ AS portInV,
CHAN_NUM_ AS chanNum,
+ BRAND_ AS brand,
MEDIA_ADDR_ AS mediaAddr,
+ PHONE_ADDR_ AS phoneAddr,
+ REMARK_ AS remark,
POS_X_ AS posX,
- POS_Y_ AS posY
+ POS_Y_ AS posY,
+ SCREEN_SHOW_ AS screenShow,
+ SNAP_TAG_ AS snapTag,
+ UPDATE_TIME_ AS updateTime
</sql>
<!-- 鏇存柊璁惧浣嶇疆 -->
diff --git a/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml b/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
index 2535004..9f57859 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
+++ b/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
@@ -141,6 +141,10 @@
<Property></Property>
<Property name="label">rtsp鍦板潃</Property>
</PropertyDef>
+ <PropertyDef name="phoneAddr">
+ <Property></Property>
+ <Property name="label">鎵嬫満鍦板潃</Property>
+ </PropertyDef>
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞璇存槑</Property>
@@ -192,70 +196,6 @@
<Entity>
<Property name="code">Y</Property>
<Property name="name">鑷姩鎶撴媿</Property>
- </Entity>
- </Collection>
- </Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="azwzlx">
- <Property></Property>
- <Property name="label">瀹夎浣嶇疆</Property>
- <Property name="mapping">
- <Property name="keyProperty">key</Property>
- <Property name="valueProperty">value</Property>
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="key">01</Property>
- <Property name="value">绮簱澶ч棬</Property>
- </Entity>
- <Entity>
- <Property name="key">02</Property>
- <Property name="value">鎵︽牱鏈�</Property>
- </Entity>
- <Entity>
- <Property name="key">03</Property>
- <Property name="value">鍖栭獙瀹�</Property>
- </Entity>
- <Entity>
- <Property name="key">04</Property>
- <Property name="value">缁撶畻瀹�</Property>
- </Entity>
- <Entity>
- <Property name="key">05</Property>
- <Property name="value">鍦扮鎴�</Property>
- </Entity>
- <Entity>
- <Property name="key">06</Property>
- <Property name="value">搴撳尯涓诲共閬�</Property>
- </Entity>
- <Entity>
- <Property name="key">07</Property>
- <Property name="value">浠撻棿鐩戞帶</Property>
- </Entity>
- <Entity>
- <Property name="key">08</Property>
- <Property name="value">浠撳唴</Property>
- </Entity>
- <Entity>
- <Property name="key">09</Property>
- <Property name="value">鑽搧搴�</Property>
- </Entity>
- <Entity>
- <Property name="key">10</Property>
- <Property name="value">鍣ㄦ潗搴�</Property>
- </Entity>
- <Entity>
- <Property name="key">11</Property>
- <Property name="value">鍒堕珮鐐�</Property>
- </Entity>
- <Entity>
- <Property name="key">12</Property>
- <Property name="value">鍛ㄧ晫</Property>
- </Entity>
- <Entity>
- <Property name="key">99</Property>
- <Property name="value">鍏朵粬</Property>
</Entity>
</Collection>
</Property>
@@ -627,11 +567,10 @@
</DataGrid>
</Container>
<Dialog id="dialogMain" layout="padding:5;regionPadding:5">
- <Property name="width">800</Property>
+ <Property name="width">75%</Property>
<Property name="caption">鐩戞帶璁惧淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
- <Property name="height">100%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
@@ -661,7 +600,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
@@ -696,11 +635,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">azwzlx</Property>
- <Property name="property">azwzlx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">spjklx</Property>
<Property name="property">spjklx</Property>
<Editor/>
@@ -719,10 +653,26 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
+ <AutoFormElement>
+ <Property name="name">screenShow</Property>
+ <Property name="property">screenShow</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">榛樿灞曠ず</Property>
+ <Property name="value">Y</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">閫夋嫨灞曠ず</Property>
+ <Property name="value">N</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
<AutoFormElement>
<Property name="name">snapTag</Property>
<Property name="property">snapTag</Property>
@@ -745,22 +695,6 @@
<Property name="color">blue</Property>
</Property>
</Label>
- <AutoFormElement>
- <Property name="name">screenShow</Property>
- <Property name="property">screenShow</Property>
- <Editor>
- <RadioGroup>
- <RadioButton>
- <Property name="text">榛樿灞曠ず</Property>
- <Property name="value">Y</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">閫夋嫨灞曠ず</Property>
- <Property name="value">N</Property>
- </RadioButton>
- </RadioGroup>
- </Editor>
- </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
@@ -793,7 +727,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
@@ -827,7 +761,7 @@
<Property name="property">portInC</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">mediaAddr</Property>
<Property name="property">mediaAddr</Property>
<Property name="trigger">triggerMedia</Property>
@@ -838,6 +772,11 @@
</Editor>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">phoneAddr</Property>
+ <Property name="property">phoneAddr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
<Property name="editorType">TextArea</Property>
--
Gitblit v1.9.3