门口门禁视频功能bug修复
parent
8ed6799ffb
commit
989174104c
src/main
java/com/zcloud
controller/videoreceive
mapper/datasource/videoreceive
service/receive
resources/mybatis/datasource/videoreceive
|
@ -264,6 +264,13 @@ public class VideoReceiveController extends BaseController {
|
||||||
return videoReceiveService.listAllForMap(pd);
|
return videoReceiveService.listAllForMap(pd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@RequestMapping(value="/listAllCameraForMapBinding")
|
||||||
|
@ResponseBody
|
||||||
|
public Object listAllCameraForMapBingDing() throws Exception{
|
||||||
|
PageData pd = this.getPageData();
|
||||||
|
return videoReceiveService.listAllForMapBinding(pd);
|
||||||
|
}
|
||||||
|
|
||||||
@RequestMapping(value="/getHlsPath")
|
@RequestMapping(value="/getHlsPath")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public Object getHlsPath() throws Exception{
|
public Object getHlsPath() throws Exception{
|
||||||
|
|
|
@ -43,6 +43,8 @@ public interface VideoReceiveMapper {
|
||||||
|
|
||||||
List<PageData> listAllForMap(PageData pd);
|
List<PageData> listAllForMap(PageData pd);
|
||||||
|
|
||||||
|
List<PageData> listAllForMapBinding(PageData pd);
|
||||||
|
|
||||||
/**列表
|
/**列表
|
||||||
* @param page
|
* @param page
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
|
|
|
@ -42,6 +42,8 @@ public interface VideoReceiveService {
|
||||||
|
|
||||||
Object listAllForMap(PageData pd);
|
Object listAllForMap(PageData pd);
|
||||||
|
|
||||||
|
Object listAllForMapBinding(PageData pd);
|
||||||
|
|
||||||
/**列表
|
/**列表
|
||||||
* @param page
|
* @param page
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
|
|
|
@ -67,6 +67,16 @@ public class VideoReceiveServiceImpl implements VideoReceiveService {
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object listAllForMapBinding(PageData pd) {
|
||||||
|
Map<String,Object> map = new HashMap<String,Object>();
|
||||||
|
String errInfo = "success";
|
||||||
|
List<PageData> varList = videoReceiveMapper.listAllForMapBinding(pd);
|
||||||
|
map.put("varList", varList);
|
||||||
|
map.put("result", errInfo);
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
|
||||||
/**列表
|
/**列表
|
||||||
* @param page
|
* @param page
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
|
|
|
@ -15,6 +15,8 @@
|
||||||
<!-- 字段 -->
|
<!-- 字段 -->
|
||||||
<sql id="Field">
|
<sql id="Field">
|
||||||
f.VIDEORECEIVE_ID,
|
f.VIDEORECEIVE_ID,
|
||||||
|
f.GATE_AREA_ID,
|
||||||
|
f.ISBINDING,
|
||||||
f.ResCode,
|
f.ResCode,
|
||||||
f.OrgCode,
|
f.OrgCode,
|
||||||
f.ResName,
|
f.ResName,
|
||||||
|
@ -77,34 +79,34 @@
|
||||||
update
|
update
|
||||||
<include refid="tableName"></include>
|
<include refid="tableName"></include>
|
||||||
set
|
set
|
||||||
<if test="ResCode != null and ResCode != ''"><!-- 门禁区域 -->
|
<if test="ResCode != null and ResCode != ''">
|
||||||
ResCode=#{ResCode},
|
ResCode=#{ResCode},
|
||||||
</if>
|
</if>
|
||||||
<if test="OrgCode != null and OrgCode != ''"><!-- 门禁区域 -->
|
<if test="OrgCode != null and OrgCode != ''">
|
||||||
OrgCode=#{OrgCode},
|
OrgCode=#{OrgCode},
|
||||||
</if>
|
</if>
|
||||||
<if test="ResName != null and ResName != ''"><!-- 门禁区域 -->
|
<if test="ResName != null and ResName != ''">
|
||||||
ResName=#{ResName},
|
ResName=#{ResName},
|
||||||
</if>
|
</if>
|
||||||
<if test="ResType != null and ResType != ''"><!-- 门禁区域 -->
|
<if test="ResType != null and ResType != ''">
|
||||||
ResType=#{ResType},
|
ResType=#{ResType},
|
||||||
</if>
|
</if>
|
||||||
<if test="ResSubType != null and ResSubType != ''"><!-- 门禁区域 -->
|
<if test="ResSubType != null and ResSubType != ''">
|
||||||
ResSubType=#{ResSubType},
|
ResSubType=#{ResSubType},
|
||||||
</if>
|
</if>
|
||||||
<if test="ISDELETE != null and ISDELETE != ''"><!-- 门禁区域 -->
|
<if test="ISDELETE != null and ISDELETE != ''">
|
||||||
ISDELETE=#{ISDELETE},
|
ISDELETE=#{ISDELETE},
|
||||||
</if>
|
</if>
|
||||||
<if test="LONGITUDE != null and LONGITUDE != ''"><!-- 门禁区域 -->
|
<if test="LONGITUDE != null and LONGITUDE != ''">
|
||||||
LONGITUDE=#{LONGITUDE},
|
LONGITUDE=#{LONGITUDE},
|
||||||
</if>
|
</if>
|
||||||
<if test="LATITUDE != null and LATITUDE != ''"><!-- 门禁区域 -->
|
<if test="LATITUDE != null and LATITUDE != ''">
|
||||||
LATITUDE=#{LATITUDE},
|
LATITUDE=#{LATITUDE},
|
||||||
</if>
|
</if>
|
||||||
<if test="ISBINDING != null and ISBINDING != ''"><!-- 门禁区域 -->
|
<if test="ISBINDING != null and ISBINDING != ''">
|
||||||
ISBINDING=#{ISBINDING},
|
ISBINDING=#{ISBINDING},
|
||||||
</if>
|
</if>
|
||||||
<if test="GATE_AREA_ID != null and GATE_AREA_ID != ''"><!-- 门禁区域 -->
|
<if test="GATE_AREA_ID != null and GATE_AREA_ID != ''">
|
||||||
GATE_AREA_ID=#{GATE_AREA_ID},
|
GATE_AREA_ID=#{GATE_AREA_ID},
|
||||||
</if>
|
</if>
|
||||||
VIDEORECEIVE_ID = VIDEORECEIVE_ID
|
VIDEORECEIVE_ID = VIDEORECEIVE_ID
|
||||||
|
@ -213,4 +215,18 @@
|
||||||
from
|
from
|
||||||
<include refid="tableName"></include> f
|
<include refid="tableName"></include> f
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="listAllForMapBinding" parameterType="pd" resultType="pd">
|
||||||
|
select
|
||||||
|
VIDEORECEIVE_ID as id,
|
||||||
|
ResName as NAME,
|
||||||
|
ResName as MAP_POINT_NAME,
|
||||||
|
LONGITUDE as LONGITUDE,
|
||||||
|
LATITUDE as LATITUDE,
|
||||||
|
ResCode
|
||||||
|
from
|
||||||
|
<include refid="tableName"></include> f
|
||||||
|
where
|
||||||
|
f.ISBINDING = '1'
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
Loading…
Reference in New Issue