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); 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); } 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; 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> <!-- 更新设备位置 --> 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>
