From e27862fe53aeb6e373da3d14442c57f6505b0237 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Tue, 9 Jan 2024 16:01:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=A6=81=E9=97=B8=E6=9C=BA=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gatemachine/GateMachineController.java | 2 + .../gatemachine/GateVideoController.java | 1 + .../PlatformvideomanagementController.java | 2 + .../zcloud/controller/map/MapController.java | 59 +++++++ .../PlatformvideomanagementMapper.java | 2 + .../impl/GateMachineServiceImpl.java | 7 +- .../PlatformvideomanagementService.java | 4 +- .../PlatformvideomanagementServiceImpl.java | 145 ++++++++++-------- .../gatemachine/GateVideoMapper.xml | 4 +- .../PlatformvideomanagementMapper.xml | 35 ++++- 10 files changed, 188 insertions(+), 73 deletions(-) diff --git a/src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java b/src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java index 2d3b48f9..ba62b7bc 100644 --- a/src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java +++ b/src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java @@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.gatemachine.GateMachineService; +import com.zcloud.util.Jurisdiction; import com.zcloud.util.ReturnMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -52,6 +53,7 @@ public class GateMachineController extends BaseController { @RequestMapping(value = "/add") public ReturnMap add() { PageData pageData = this.getPageData(); + pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); gateMachineService.save(pageData); return ReturnMap.ok(); } diff --git a/src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java b/src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java index bd5b35f9..e906cf47 100644 --- a/src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java +++ b/src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java @@ -45,6 +45,7 @@ public class GateVideoController extends BaseController { pd.put("GATEVIDEO_ID", this.get32UUID()); //主键 pd.put("OPDATE", DateUtil.date2Str(new Date())); //操作日期 pd.put("OPUSER", Jurisdiction.getUsername()); //操作人 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //操作人 pd.put("ISDELETE", "0"); //是否删除 gateVideoService.save(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java index 43b89913..0910ae20 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java @@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.keyProjects.PlatformvideomanagementService; +import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; import com.zcloud.util.hk.HKUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -70,6 +71,7 @@ public class PlatformvideomanagementController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("PLATFORMVIDEOMANAGEMENT_ID", this.get32UUID()); //主键 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键 platformvideomanagementService.save(pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 9a604741..e0d41387 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -10,6 +10,7 @@ import com.zcloud.service.fireresources.FireResourcesService; import com.zcloud.service.gatemachine.GateMachineService; //import com.zcloud.service.keyProjects.MeteorologicalService; //import com.zcloud.service.keyProjects.MeteorologicalinfoService; +import com.zcloud.service.keyProjects.PlatformvideomanagementService; import com.zcloud.service.keyProjects.VideoManagerService; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.UsersService; @@ -46,6 +47,8 @@ public class MapController extends BaseController { @Autowired private CorpInfoService corpInfoService; + @Autowired + private PlatformvideomanagementService platformvideomanagementService; @Autowired private UsersService usersService; @@ -348,6 +351,27 @@ public class MapController extends BaseController { public Object getCzksBasicLocationInfoData() { 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 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: 人员定位信息 * @Author: dearLin @@ -414,6 +438,41 @@ public class MapController extends BaseController { // 标签卡 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 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 dataList = platformvideomanagementService.getListMapSluiceCount(pageData); + returnMap.put("varList",dataList); + return returnMap; + } @RequestMapping(value = "/czks/person/staff/listPage") @ResponseBody public Object getCzksPersonStaffListPage() { diff --git a/src/main/java/com/zcloud/mapper/datasource/keyProjects/PlatformvideomanagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/keyProjects/PlatformvideomanagementMapper.java index 1458b582..1f3bbb73 100644 --- a/src/main/java/com/zcloud/mapper/datasource/keyProjects/PlatformvideomanagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/keyProjects/PlatformvideomanagementMapper.java @@ -59,5 +59,7 @@ public interface PlatformvideomanagementMapper { void delLocation(PageData pd); + + List getListMapSluiceCount(PageData pageData); } diff --git a/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java b/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java index 5bbb5529..0d0071b2 100644 --- a/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java +++ b/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java @@ -82,17 +82,16 @@ public class GateMachineServiceImpl implements GateMachineService { @Override public List getGatePosition(PageData pageData) { - // todo 需求变更，现在闸机变成了区域 - if (pageData.getString("TYPE").equals("PERSON")) { + if ("PERSON".equals(pageData.getString("TYPE"))) { pageData.put("GATE_AREA_TYPE", 0); // 人闸机定位 } - if (pageData.getString("TYPE").equals("CAR")) { + if ("CAR".equals(pageData.getString("TYPE"))) { // 车闸机定位 pageData.put("GATE_AREA_TYPE", 1); } - if (pageData.getString("TYPE").equals("CAMERA")) { + if ("camera".equals(pageData.getString("TYPE"))) { // 摄像头定位 return gateVideoMapper.getCameraPosition(pageData); } diff --git a/src/main/java/com/zcloud/service/keyProjects/PlatformvideomanagementService.java b/src/main/java/com/zcloud/service/keyProjects/PlatformvideomanagementService.java index 71d8ffc8..f4caefc5 100644 --- a/src/main/java/com/zcloud/service/keyProjects/PlatformvideomanagementService.java +++ b/src/main/java/com/zcloud/service/keyProjects/PlatformvideomanagementService.java @@ -54,8 +54,10 @@ public interface PlatformvideomanagementService { * @throws Exception */ public void deleteAll(String[] ArrayDATA_IDS)throws Exception; - Object listAllForMap(PageData pd); + List listAllForMap(PageData pd); void delLocation(PageData pd); + + List getListMapSluiceCount(PageData pageData); } diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java index ecf91e6e..b7c41272 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java @@ -21,82 +21,95 @@ import java.util.Map; */ @Service @Transactional //开启事物 -public class PlatformvideomanagementServiceImpl implements PlatformvideomanagementService{ +public class PlatformvideomanagementServiceImpl implements PlatformvideomanagementService { - @Autowired - private PlatformvideomanagementMapper platformvideomanagementMapper; + @Autowired + private PlatformvideomanagementMapper platformvideomanagementMapper; - /**新增 - * @param pd - * @throws Exception - */ - public void save(PageData pd)throws Exception{ - platformvideomanagementMapper.save(pd); - } + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public void save(PageData pd) throws Exception { + platformvideomanagementMapper.save(pd); + } - /**删除 - * @param pd - * @throws Exception - */ - public void delete(PageData pd)throws Exception{ - platformvideomanagementMapper.delete(pd); - } + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception { + platformvideomanagementMapper.delete(pd); + } - /**修改 - * @param pd - * @throws Exception - */ - public void edit(PageData pd)throws Exception{ - platformvideomanagementMapper.edit(pd); - } + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception { + platformvideomanagementMapper.edit(pd); + } - /**列表 - * @param page - * @throws Exception - */ - public List list(Page page)throws Exception{ - return platformvideomanagementMapper.datalistPage(page); - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception { + return platformvideomanagementMapper.datalistPage(page); + } - /**列表(全部) - * @param pd - * @throws Exception - */ - public List listAll(PageData pd)throws Exception{ - return platformvideomanagementMapper.listAll(pd); - } + /** + * 列表(全部) + * + * @param pd + * @throws Exception + */ + public List listAll(PageData pd) throws Exception { + return platformvideomanagementMapper.listAll(pd); + } - /**通过id获取数据 - * @param pd - * @throws Exception - */ - public PageData findById(PageData pd)throws Exception{ - return platformvideomanagementMapper.findById(pd); - } + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception { + return platformvideomanagementMapper.findById(pd); + } - /**批量删除 - * @param ArrayDATA_IDS - * @throws Exception - */ - public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ - platformvideomanagementMapper.deleteAll(ArrayDATA_IDS); - } + /** + * 批量删除 + * + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS) throws Exception { + platformvideomanagementMapper.deleteAll(ArrayDATA_IDS); + } - @Override - public Object listAllForMap(PageData pd) { - Map map = new HashMap(); - String errInfo = "success"; - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - List varList = platformvideomanagementMapper.listAllForMap(pd); - map.put("varList", varList); - map.put("result", errInfo); - return map; - } + @Override + public List listAllForMap(PageData pd) { + return platformvideomanagementMapper.listAllForMap(pd); + } - @Override - public void delLocation(PageData pd) { - platformvideomanagementMapper.delLocation(pd); - } + @Override + public void delLocation(PageData pd) { + platformvideomanagementMapper.delLocation(pd); + } + + @Override + public List getListMapSluiceCount(PageData pageData) { + return platformvideomanagementMapper.getListMapSluiceCount(pageData); + } } diff --git a/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml index 5dfa199e..5f9afa21 100644 --- a/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml +++ b/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml @@ -37,6 +37,7 @@ PLATFORMVIDEOMANAGEMENT_ID, GATEVIDEO_ID, LATITUDE, + CORPINFO_ID, LONGITUDE @@ -51,6 +52,7 @@ #{PLATFORMVIDEOMANAGEMENT_ID}, #{GATEVIDEO_ID}, #{LATITUDE}, + #{CORPINFO_ID}, #{LONGITUDE} @@ -243,7 +245,6 @@ SELECT GATEVIDEO_ID AS id, VIDEONAME AS `NAME`, - 'CAMERA' AS TYPE, v.LATITUDE, v.LONGITUDE FROM @@ -258,6 +259,7 @@ and o.CORPINFO_ID = #{CORPINFO_ID} + GROUP BY v.GATEVIDEO_ID diff --git a/src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml index aabe492a..9871c543 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml @@ -57,6 +57,7 @@ REGIONNAME, REGIONPATH, REGIONPATHNAME, + CORPINFO_ID, PLATFORMVIDEOMANAGEMENT_ID @@ -81,6 +82,7 @@ #{REGIONNAME}, #{REGIONPATH}, #{REGIONPATHNAME}, + #{CORPINFO_ID}, #{PLATFORMVIDEOMANAGEMENT_ID} @@ -181,8 +183,39 @@ and f.CORPINFO_ID = #{CORPINFO_ID} + - + update