门禁闸机地图对接
parent
7437aa1395
commit
e27862fe53
|
@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController;
|
||||||
import com.zcloud.entity.Page;
|
import com.zcloud.entity.Page;
|
||||||
import com.zcloud.entity.PageData;
|
import com.zcloud.entity.PageData;
|
||||||
import com.zcloud.service.gatemachine.GateMachineService;
|
import com.zcloud.service.gatemachine.GateMachineService;
|
||||||
|
import com.zcloud.util.Jurisdiction;
|
||||||
import com.zcloud.util.ReturnMap;
|
import com.zcloud.util.ReturnMap;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
@ -52,6 +53,7 @@ public class GateMachineController extends BaseController {
|
||||||
@RequestMapping(value = "/add")
|
@RequestMapping(value = "/add")
|
||||||
public ReturnMap add() {
|
public ReturnMap add() {
|
||||||
PageData pageData = this.getPageData();
|
PageData pageData = this.getPageData();
|
||||||
|
pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||||
gateMachineService.save(pageData);
|
gateMachineService.save(pageData);
|
||||||
return ReturnMap.ok();
|
return ReturnMap.ok();
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,6 +45,7 @@ public class GateVideoController extends BaseController {
|
||||||
pd.put("GATEVIDEO_ID", this.get32UUID()); //主键
|
pd.put("GATEVIDEO_ID", this.get32UUID()); //主键
|
||||||
pd.put("OPDATE", DateUtil.date2Str(new Date())); //操作日期
|
pd.put("OPDATE", DateUtil.date2Str(new Date())); //操作日期
|
||||||
pd.put("OPUSER", Jurisdiction.getUsername()); //操作人
|
pd.put("OPUSER", Jurisdiction.getUsername()); //操作人
|
||||||
|
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //操作人
|
||||||
pd.put("ISDELETE", "0"); //是否删除
|
pd.put("ISDELETE", "0"); //是否删除
|
||||||
gateVideoService.save(pd);
|
gateVideoService.save(pd);
|
||||||
map.put("result", errInfo);
|
map.put("result", errInfo);
|
||||||
|
|
|
@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController;
|
||||||
import com.zcloud.entity.Page;
|
import com.zcloud.entity.Page;
|
||||||
import com.zcloud.entity.PageData;
|
import com.zcloud.entity.PageData;
|
||||||
import com.zcloud.service.keyProjects.PlatformvideomanagementService;
|
import com.zcloud.service.keyProjects.PlatformvideomanagementService;
|
||||||
|
import com.zcloud.util.Jurisdiction;
|
||||||
import com.zcloud.util.Tools;
|
import com.zcloud.util.Tools;
|
||||||
import com.zcloud.util.hk.HKUtil;
|
import com.zcloud.util.hk.HKUtil;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
@ -70,6 +71,7 @@ public class PlatformvideomanagementController extends BaseController {
|
||||||
PageData pd = new PageData();
|
PageData pd = new PageData();
|
||||||
pd = this.getPageData();
|
pd = this.getPageData();
|
||||||
pd.put("PLATFORMVIDEOMANAGEMENT_ID", this.get32UUID()); //主键
|
pd.put("PLATFORMVIDEOMANAGEMENT_ID", this.get32UUID()); //主键
|
||||||
|
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键
|
||||||
platformvideomanagementService.save(pd);
|
platformvideomanagementService.save(pd);
|
||||||
map.put("result", errInfo);
|
map.put("result", errInfo);
|
||||||
return map;
|
return map;
|
||||||
|
|
|
@ -10,6 +10,7 @@ import com.zcloud.service.fireresources.FireResourcesService;
|
||||||
import com.zcloud.service.gatemachine.GateMachineService;
|
import com.zcloud.service.gatemachine.GateMachineService;
|
||||||
//import com.zcloud.service.keyProjects.MeteorologicalService;
|
//import com.zcloud.service.keyProjects.MeteorologicalService;
|
||||||
//import com.zcloud.service.keyProjects.MeteorologicalinfoService;
|
//import com.zcloud.service.keyProjects.MeteorologicalinfoService;
|
||||||
|
import com.zcloud.service.keyProjects.PlatformvideomanagementService;
|
||||||
import com.zcloud.service.keyProjects.VideoManagerService;
|
import com.zcloud.service.keyProjects.VideoManagerService;
|
||||||
import com.zcloud.service.system.DepartmentService;
|
import com.zcloud.service.system.DepartmentService;
|
||||||
import com.zcloud.service.system.UsersService;
|
import com.zcloud.service.system.UsersService;
|
||||||
|
@ -46,6 +47,8 @@ public class MapController extends BaseController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private CorpInfoService corpInfoService;
|
private CorpInfoService corpInfoService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private PlatformvideomanagementService platformvideomanagementService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private UsersService usersService;
|
private UsersService usersService;
|
||||||
|
|
||||||
|
@ -348,6 +351,27 @@ public class MapController extends BaseController {
|
||||||
public Object getCzksBasicLocationInfoData() {
|
public Object getCzksBasicLocationInfoData() {
|
||||||
return HttpRequestUtil.getPeopleApi("/statistics/personStatistics/todayPerson", "");
|
return HttpRequestUtil.getPeopleApi("/statistics/personStatistics/todayPerson", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@RequestMapping("/czks/getGatePosition")
|
||||||
|
@ResponseBody
|
||||||
|
public ReturnMap getCzksGatePosition() {
|
||||||
|
ReturnMap returnMap = new ReturnMap();
|
||||||
|
PageData pageData = this.getPageData();
|
||||||
|
//
|
||||||
|
pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||||
|
List<PageData> value = gateMachineService.getGatePosition(pageData);
|
||||||
|
// 添加标点上的统一的title
|
||||||
|
for (PageData data : value) {
|
||||||
|
if (Tools.notEmpty(data.getString("GATE_AREA_NAME"))) {
|
||||||
|
data.put("MAP_POINT_NAME", data.getString("GATE_AREA_NAME"));
|
||||||
|
} else {
|
||||||
|
data.put("MAP_POINT_NAME", data.getString("NAME"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
returnMap.put("varList", value);
|
||||||
|
return returnMap;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 人员定位信息
|
* @Description: 人员定位信息
|
||||||
* @Author: dearLin
|
* @Author: dearLin
|
||||||
|
@ -414,6 +438,41 @@ public class MapController extends BaseController {
|
||||||
// 标签卡
|
// 标签卡
|
||||||
return HttpRequestUtil.getPeopleApi("/system/rail/listPage", request.toString());
|
return HttpRequestUtil.getPeopleApi("/system/rail/listPage", request.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 获取摄像头定位
|
||||||
|
* @Author: dearLin
|
||||||
|
* @Date: 2024/1/6/006 11:15
|
||||||
|
* @Param: [] []
|
||||||
|
* @Return: java.lang.Object
|
||||||
|
*/
|
||||||
|
@RequestMapping(value = "/czks/getCameraPositioning")
|
||||||
|
@ResponseBody
|
||||||
|
public Object getCameraPositioning() {
|
||||||
|
ReturnMap returnMap = new ReturnMap();
|
||||||
|
PageData pageData = new PageData();
|
||||||
|
pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
|
||||||
|
List<PageData> dataList = platformvideomanagementService.listAllForMap(pageData);
|
||||||
|
returnMap.put("varList",dataList);
|
||||||
|
return returnMap;
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* @Description: 设备在线情况
|
||||||
|
* @Author: dearLin
|
||||||
|
* @Date: 2024/1/6/006 11:15
|
||||||
|
* @Param: [] []
|
||||||
|
* @Return: java.lang.Object
|
||||||
|
*/
|
||||||
|
@RequestMapping(value = "/czks/getListMapSluiceCount")
|
||||||
|
@ResponseBody
|
||||||
|
public Object getListMapSluiceCount() {
|
||||||
|
ReturnMap returnMap = new ReturnMap();
|
||||||
|
PageData pageData = new PageData();
|
||||||
|
pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
|
||||||
|
List<PageData> dataList = platformvideomanagementService.getListMapSluiceCount(pageData);
|
||||||
|
returnMap.put("varList",dataList);
|
||||||
|
return returnMap;
|
||||||
|
}
|
||||||
@RequestMapping(value = "/czks/person/staff/listPage")
|
@RequestMapping(value = "/czks/person/staff/listPage")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public Object getCzksPersonStaffListPage() {
|
public Object getCzksPersonStaffListPage() {
|
||||||
|
|
|
@ -59,5 +59,7 @@ public interface PlatformvideomanagementMapper {
|
||||||
|
|
||||||
|
|
||||||
void delLocation(PageData pd);
|
void delLocation(PageData pd);
|
||||||
|
|
||||||
|
List<PageData> getListMapSluiceCount(PageData pageData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -82,17 +82,16 @@ public class GateMachineServiceImpl implements GateMachineService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<PageData> getGatePosition(PageData pageData) {
|
public List<PageData> getGatePosition(PageData pageData) {
|
||||||
// todo 需求变更,现在闸机变成了区域
|
if ("PERSON".equals(pageData.getString("TYPE"))) {
|
||||||
if (pageData.getString("TYPE").equals("PERSON")) {
|
|
||||||
pageData.put("GATE_AREA_TYPE", 0);
|
pageData.put("GATE_AREA_TYPE", 0);
|
||||||
// 人闸机定位
|
// 人闸机定位
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pageData.getString("TYPE").equals("CAR")) {
|
if ("CAR".equals(pageData.getString("TYPE"))) {
|
||||||
// 车闸机定位
|
// 车闸机定位
|
||||||
pageData.put("GATE_AREA_TYPE", 1);
|
pageData.put("GATE_AREA_TYPE", 1);
|
||||||
}
|
}
|
||||||
if (pageData.getString("TYPE").equals("CAMERA")) {
|
if ("camera".equals(pageData.getString("TYPE"))) {
|
||||||
// 摄像头定位
|
// 摄像头定位
|
||||||
return gateVideoMapper.getCameraPosition(pageData);
|
return gateVideoMapper.getCameraPosition(pageData);
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,8 +54,10 @@ public interface PlatformvideomanagementService {
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
|
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
|
||||||
Object listAllForMap(PageData pd);
|
List<PageData> listAllForMap(PageData pd);
|
||||||
|
|
||||||
void delLocation(PageData pd);
|
void delLocation(PageData pd);
|
||||||
|
|
||||||
|
List<PageData> getListMapSluiceCount(PageData pageData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,82 +21,95 @@ import java.util.Map;
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
@Transactional //开启事物
|
@Transactional //开启事物
|
||||||
public class PlatformvideomanagementServiceImpl implements PlatformvideomanagementService{
|
public class PlatformvideomanagementServiceImpl implements PlatformvideomanagementService {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private PlatformvideomanagementMapper platformvideomanagementMapper;
|
private PlatformvideomanagementMapper platformvideomanagementMapper;
|
||||||
|
|
||||||
/**新增
|
/**
|
||||||
* @param pd
|
* 新增
|
||||||
* @throws Exception
|
*
|
||||||
*/
|
* @param pd
|
||||||
public void save(PageData pd)throws Exception{
|
* @throws Exception
|
||||||
platformvideomanagementMapper.save(pd);
|
*/
|
||||||
}
|
public void save(PageData pd) throws Exception {
|
||||||
|
platformvideomanagementMapper.save(pd);
|
||||||
|
}
|
||||||
|
|
||||||
/**删除
|
/**
|
||||||
* @param pd
|
* 删除
|
||||||
* @throws Exception
|
*
|
||||||
*/
|
* @param pd
|
||||||
public void delete(PageData pd)throws Exception{
|
* @throws Exception
|
||||||
platformvideomanagementMapper.delete(pd);
|
*/
|
||||||
}
|
public void delete(PageData pd) throws Exception {
|
||||||
|
platformvideomanagementMapper.delete(pd);
|
||||||
|
}
|
||||||
|
|
||||||
/**修改
|
/**
|
||||||
* @param pd
|
* 修改
|
||||||
* @throws Exception
|
*
|
||||||
*/
|
* @param pd
|
||||||
public void edit(PageData pd)throws Exception{
|
* @throws Exception
|
||||||
platformvideomanagementMapper.edit(pd);
|
*/
|
||||||
}
|
public void edit(PageData pd) throws Exception {
|
||||||
|
platformvideomanagementMapper.edit(pd);
|
||||||
|
}
|
||||||
|
|
||||||
/**列表
|
/**
|
||||||
* @param page
|
* 列表
|
||||||
* @throws Exception
|
*
|
||||||
*/
|
* @param page
|
||||||
public List<PageData> list(Page page)throws Exception{
|
* @throws Exception
|
||||||
return platformvideomanagementMapper.datalistPage(page);
|
*/
|
||||||
}
|
public List<PageData> list(Page page) throws Exception {
|
||||||
|
return platformvideomanagementMapper.datalistPage(page);
|
||||||
|
}
|
||||||
|
|
||||||
/**列表(全部)
|
/**
|
||||||
* @param pd
|
* 列表(全部)
|
||||||
* @throws Exception
|
*
|
||||||
*/
|
* @param pd
|
||||||
public List<PageData> listAll(PageData pd)throws Exception{
|
* @throws Exception
|
||||||
return platformvideomanagementMapper.listAll(pd);
|
*/
|
||||||
}
|
public List<PageData> listAll(PageData pd) throws Exception {
|
||||||
|
return platformvideomanagementMapper.listAll(pd);
|
||||||
|
}
|
||||||
|
|
||||||
/**通过id获取数据
|
/**
|
||||||
* @param pd
|
* 通过id获取数据
|
||||||
* @throws Exception
|
*
|
||||||
*/
|
* @param pd
|
||||||
public PageData findById(PageData pd)throws Exception{
|
* @throws Exception
|
||||||
return platformvideomanagementMapper.findById(pd);
|
*/
|
||||||
}
|
public PageData findById(PageData pd) throws Exception {
|
||||||
|
return platformvideomanagementMapper.findById(pd);
|
||||||
|
}
|
||||||
|
|
||||||
/**批量删除
|
/**
|
||||||
* @param ArrayDATA_IDS
|
* 批量删除
|
||||||
* @throws Exception
|
*
|
||||||
*/
|
* @param ArrayDATA_IDS
|
||||||
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
|
* @throws Exception
|
||||||
platformvideomanagementMapper.deleteAll(ArrayDATA_IDS);
|
*/
|
||||||
}
|
public void deleteAll(String[] ArrayDATA_IDS) throws Exception {
|
||||||
|
platformvideomanagementMapper.deleteAll(ArrayDATA_IDS);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object listAllForMap(PageData pd) {
|
public List<PageData> listAllForMap(PageData pd) {
|
||||||
Map<String,Object> map = new HashMap<String,Object>();
|
return platformvideomanagementMapper.listAllForMap(pd);
|
||||||
String errInfo = "success";
|
}
|
||||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
|
||||||
List<PageData> varList = platformvideomanagementMapper.listAllForMap(pd);
|
|
||||||
map.put("varList", varList);
|
|
||||||
map.put("result", errInfo);
|
|
||||||
return map;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void delLocation(PageData pd) {
|
public void delLocation(PageData pd) {
|
||||||
platformvideomanagementMapper.delLocation(pd);
|
platformvideomanagementMapper.delLocation(pd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<PageData> getListMapSluiceCount(PageData pageData) {
|
||||||
|
return platformvideomanagementMapper.getListMapSluiceCount(pageData);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
PLATFORMVIDEOMANAGEMENT_ID,
|
PLATFORMVIDEOMANAGEMENT_ID,
|
||||||
GATEVIDEO_ID,
|
GATEVIDEO_ID,
|
||||||
LATITUDE,
|
LATITUDE,
|
||||||
|
CORPINFO_ID,
|
||||||
LONGITUDE
|
LONGITUDE
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
|
@ -51,6 +52,7 @@
|
||||||
#{PLATFORMVIDEOMANAGEMENT_ID},
|
#{PLATFORMVIDEOMANAGEMENT_ID},
|
||||||
#{GATEVIDEO_ID},
|
#{GATEVIDEO_ID},
|
||||||
#{LATITUDE},
|
#{LATITUDE},
|
||||||
|
#{CORPINFO_ID},
|
||||||
#{LONGITUDE}
|
#{LONGITUDE}
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
|
@ -243,7 +245,6 @@
|
||||||
SELECT
|
SELECT
|
||||||
GATEVIDEO_ID AS id,
|
GATEVIDEO_ID AS id,
|
||||||
VIDEONAME AS `NAME`,
|
VIDEONAME AS `NAME`,
|
||||||
'CAMERA' AS TYPE,
|
|
||||||
v.LATITUDE,
|
v.LATITUDE,
|
||||||
v.LONGITUDE
|
v.LONGITUDE
|
||||||
FROM
|
FROM
|
||||||
|
@ -258,6 +259,7 @@
|
||||||
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
|
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
|
||||||
and o.CORPINFO_ID = #{CORPINFO_ID}
|
and o.CORPINFO_ID = #{CORPINFO_ID}
|
||||||
</if>
|
</if>
|
||||||
|
GROUP BY v.GATEVIDEO_ID
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
@ -57,6 +57,7 @@
|
||||||
REGIONNAME,
|
REGIONNAME,
|
||||||
REGIONPATH,
|
REGIONPATH,
|
||||||
REGIONPATHNAME,
|
REGIONPATHNAME,
|
||||||
|
CORPINFO_ID,
|
||||||
PLATFORMVIDEOMANAGEMENT_ID
|
PLATFORMVIDEOMANAGEMENT_ID
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
|
@ -81,6 +82,7 @@
|
||||||
#{REGIONNAME},
|
#{REGIONNAME},
|
||||||
#{REGIONPATH},
|
#{REGIONPATH},
|
||||||
#{REGIONPATHNAME},
|
#{REGIONPATHNAME},
|
||||||
|
#{CORPINFO_ID},
|
||||||
#{PLATFORMVIDEOMANAGEMENT_ID}
|
#{PLATFORMVIDEOMANAGEMENT_ID}
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
|
@ -181,8 +183,39 @@
|
||||||
and f.CORPINFO_ID = #{CORPINFO_ID}
|
and f.CORPINFO_ID = #{CORPINFO_ID}
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
<select id="getListMapSluiceCount" resultType="com.zcloud.entity.PageData">
|
||||||
|
SELECT
|
||||||
|
0 AS PER_GATE_COUNT,
|
||||||
|
( SELECT count( 1 ) FROM mk_gate_machine m WHERE m.GATE_AREA_ID = f.GATE_AREA_ID AND m.ISDELETE = '0' ) AS CAR_GATE_COUNT,
|
||||||
|
0 AS VIDEO_COUNT
|
||||||
|
FROM
|
||||||
|
mk_gate_area f
|
||||||
|
WHERE
|
||||||
|
f.ISDELETE = 0
|
||||||
|
AND f.GATE_AREA_TYPE = 1
|
||||||
|
AND f.CORPINFO_ID = #{CORPINFO_ID} UNION
|
||||||
|
SELECT
|
||||||
|
( SELECT count( 1 ) FROM mk_gate_machine m WHERE m.GATE_AREA_ID = f.GATE_AREA_ID AND m.ISDELETE = '0' ) AS PER_GATE_COUNT,
|
||||||
|
0 AS CAR_GATE_COUNT,
|
||||||
|
0 AS VIDEO_COUNT
|
||||||
|
FROM
|
||||||
|
mk_gate_area f
|
||||||
|
WHERE
|
||||||
|
f.ISDELETE = 0
|
||||||
|
AND f.GATE_AREA_TYPE = 0
|
||||||
|
AND f.CORPINFO_ID = #{CORPINFO_ID} UNION
|
||||||
|
SELECT
|
||||||
|
0 AS PER_GATE_COUNT,
|
||||||
|
0 AS CAR_GATE_COUNT,
|
||||||
|
COUNT( 1 ) AS VIDEO_COUNT
|
||||||
|
FROM
|
||||||
|
bus_gatevideo f
|
||||||
|
WHERE
|
||||||
|
f.ISDELETE = 0
|
||||||
|
AND f.CORPINFO_ID = #{CORPINFO_ID}
|
||||||
|
</select>
|
||||||
|
|
||||||
<!-- 批量删除 -->
|
<!-- 批量删除 -->
|
||||||
<delete id="deleteAll" parameterType="String">
|
<delete id="deleteAll" parameterType="String">
|
||||||
update
|
update
|
||||||
<include refid="tableName"></include>
|
<include refid="tableName"></include>
|
||||||
|
|
Loading…
Reference in New Issue