From e9d80a8016a2c358252916e150281d60688d4ccc Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Tue, 23 Apr 2024 09:38:35 +0800 Subject: [PATCH 1/8] =?UTF-8?q?1.=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=B6=88?= =?UTF-8?q?=E9=98=B2=E7=82=B9=E4=BD=8D=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/AssembleControlRoomHandel.java | 37 +++++++++++++++++ .../map/AssemblePointSourceHandel.java | 40 +++++++++++++++++++ .../service/map/AssemblePumpRoomHandel.java | 38 ++++++++++++++++++ .../service/map/AssembleRescueTeamHandel.java | 38 ++++++++++++++++++ .../map/AssembleWaterSourceHandel.java | 38 ++++++++++++++++++ .../mybatis/dsno2/map/FireResourcesMapper.xml | 2 + 6 files changed, 193 insertions(+) create mode 100644 src/main/java/com/zcloud/service/map/AssembleControlRoomHandel.java create mode 100644 src/main/java/com/zcloud/service/map/AssemblePointSourceHandel.java create mode 100644 src/main/java/com/zcloud/service/map/AssemblePumpRoomHandel.java create mode 100644 src/main/java/com/zcloud/service/map/AssembleRescueTeamHandel.java create mode 100644 src/main/java/com/zcloud/service/map/AssembleWaterSourceHandel.java diff --git a/src/main/java/com/zcloud/service/map/AssembleControlRoomHandel.java b/src/main/java/com/zcloud/service/map/AssembleControlRoomHandel.java new file mode 100644 index 00000000..ac244afe --- /dev/null +++ b/src/main/java/com/zcloud/service/map/AssembleControlRoomHandel.java @@ -0,0 +1,37 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.PageData; +import org.springframework.stereotype.Component; + +import java.util.LinkedList; + +/** + * 说明：消防水源 + * * xfsy01 消防水源 + * * xfbf01 消防泵房 + * * xfjyd01 防救援队 Rescue team + * * xfkzs01 消防控制室 control + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Component +public class AssembleControlRoomHandel extends AbsFireSourcesHandel { + + + /** + * @Description: 消防控制室 + * @Author: dearLin + * @Date: 2023/9/20/020 15:37 + * @Param: [com.zcloud.entity.PageData] [pageData] + * @Return: java.util.LinkedList + */ + @Override + public LinkedList assemblyDataHandel(PageData pageData) throws Exception { + return fireResourcesMapper.getControlRoomDataList(pageData); + } + + @Override + public void afterPropertiesSet() throws Exception { + AssemblyBeanFactory.register("xfkzs01", this); + } +} diff --git a/src/main/java/com/zcloud/service/map/AssemblePointSourceHandel.java b/src/main/java/com/zcloud/service/map/AssemblePointSourceHandel.java new file mode 100644 index 00000000..986d3f5a --- /dev/null +++ b/src/main/java/com/zcloud/service/map/AssemblePointSourceHandel.java @@ -0,0 +1,40 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.PageData; +import org.springframework.stereotype.Component; + +import java.util.LinkedList; + +/** + * 说明：消防水源 + * * xfsy01 消防水源 + * * xfbf01 消防泵房 + * * xfjyd01 防救援队 + * * xfkzs01 消防控制室 + * * Point 消防点位 + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Component +public class AssemblePointSourceHandel extends AbsFireSourcesHandel { + + + /** + * @Description: 消防点位 + * @Author: dearLin + * @Date: 2023/9/20/020 15:38 + * @Param: [com.zcloud.entity.PageData] [pageData] + * @Return: java.util.LinkedList + */ + @Override + public LinkedList assemblyDataHandel(PageData pageData) throws Exception { + // 自己的业务 + + return fireResourcesMapper.getPointDataList(pageData); + } + + @Override + public void afterPropertiesSet() throws Exception { + AssemblyBeanFactory.register("point", this); + } +} diff --git a/src/main/java/com/zcloud/service/map/AssemblePumpRoomHandel.java b/src/main/java/com/zcloud/service/map/AssemblePumpRoomHandel.java new file mode 100644 index 00000000..d5a0b8d3 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/AssemblePumpRoomHandel.java @@ -0,0 +1,38 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.PageData; +import org.springframework.stereotype.Component; + +import java.util.LinkedList; + +/** + * 说明：消防水源 + * * xfsy01 消防水源 + * * xfbf01 消防泵房 PumpRoom + * * xfjyd01 防救援队 Rescue team + * * xfkzs01 消防控制室 control + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Component +public class AssemblePumpRoomHandel extends AbsFireSourcesHandel { + + + /** + * @Description: 消防泵房 + * @Author: dearLin + * @Date: 2023/9/20/020 15:38 + * @Param: [com.zcloud.entity.PageData] [pageData] + * @Return: java.util.LinkedList + */ + @Override + public LinkedList assemblyDataHandel(PageData pageData) throws Exception { + // 自己的业务 + return fireResourcesMapper.getPumpRoomDataList(pageData); + } + + @Override + public void afterPropertiesSet() throws Exception { + AssemblyBeanFactory.register("xfbf01", this); + } +} diff --git a/src/main/java/com/zcloud/service/map/AssembleRescueTeamHandel.java b/src/main/java/com/zcloud/service/map/AssembleRescueTeamHandel.java new file mode 100644 index 00000000..f8f61b10 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/AssembleRescueTeamHandel.java @@ -0,0 +1,38 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.PageData; +import org.springframework.stereotype.Component; + +import java.util.LinkedList; + +/** + * 说明：消防水源 + * * xfsy01 消防水源 + * * xfbf01 消防泵房 + * * xfjyd01 消防救援队 Rescue team + * * xfkzs01 消防控制室 + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Component +public class AssembleRescueTeamHandel extends AbsFireSourcesHandel { + + /** + * @Description: 消防救援队 + * @Author: dearLin + * @Date: 2023/9/20/020 15:38 + * @Param: [com.zcloud.entity.PageData] [pageData] + * @Return: java.util.LinkedList + */ + @Override + public LinkedList assemblyDataHandel(PageData pageData) throws Exception { + pageData.put("CORPINFO_ID",null); + // 自己的业务 + return fireResourcesMapper.getRescueTeamDataList(pageData); + } + + @Override + public void afterPropertiesSet() throws Exception { + AssemblyBeanFactory.register("xfjyd01", this); + } +} diff --git a/src/main/java/com/zcloud/service/map/AssembleWaterSourceHandel.java b/src/main/java/com/zcloud/service/map/AssembleWaterSourceHandel.java new file mode 100644 index 00000000..413f5810 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/AssembleWaterSourceHandel.java @@ -0,0 +1,38 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.PageData; +import org.springframework.stereotype.Component; + +import java.util.LinkedList; + +/** + * 说明：消防水源 + * * xfsy01 消防水源 + * * xfbf01 消防泵房 + * * xfjyd01 防救援队 + * * xfkzs01 消防控制室 + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Component +public class AssembleWaterSourceHandel extends AbsFireSourcesHandel { + + + /** + * @Description: 消防水源 + * @Author: dearLin + * @Date: 2023/9/20/020 15:38 + * @Param: [com.zcloud.entity.PageData] [pageData] + * @Return: java.util.LinkedList + */ + @Override + public LinkedList assemblyDataHandel(PageData pageData) throws Exception { + // 自己的业务 + return fireResourcesMapper.getWaterSourceDataList(pageData); + } + + @Override + public void afterPropertiesSet() throws Exception { + AssemblyBeanFactory.register("xfsy01", this); + } +} diff --git a/src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml b/src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml index 5d8a5afe..c9f230aa 100644 --- a/src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml +++ b/src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml @@ -228,6 +228,8 @@ `qa-gwj-prevention`.bus_fire_point f WHERE f.ISDELETE = 0 + and f.LONGITUDE is not null + and f.LONGITUDE != '' AND f.CORPINFO_ID = #{CORPINFO_ID} From 84080f7498a3c6ba1e2754641a57d0dcc595549e Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 23 Apr 2024 14:36:32 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/ApiHomeMajorDangerSourceController.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/com/zcloud/controller/api/ApiHomeMajorDangerSourceController.java b/src/main/java/com/zcloud/controller/api/ApiHomeMajorDangerSourceController.java index 4f8ecaef..dd88384a 100644 --- a/src/main/java/com/zcloud/controller/api/ApiHomeMajorDangerSourceController.java +++ b/src/main/java/com/zcloud/controller/api/ApiHomeMajorDangerSourceController.java @@ -11,12 +11,14 @@ import com.zcloud.service.majordangersource.MajordangersourceStoragetankService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import java.util.*; +import java.util.stream.Collectors; /** * 说明：可视化-重大危险源 @@ -266,6 +268,21 @@ public class ApiHomeMajorDangerSourceController extends BaseController { pd = this.getPageData(); pd.put("CORPINFO_ID", "035958e685cf4850bc40151c5e0617a6"); // 企业 List varList = majordangersourceService.findAllSourceAndVideo(pd); //获取重大危险源和视频监控 + // 将摄像头和灌区区分开 + if (pd.get("TYPE") != null && StringUtils.isNotEmpty(pd.getString("TYPE"))){ + PageData finalPd = pd; + varList = varList.stream().filter(n -> finalPd.getString("TYPE").equals(n.getString("TYPE"))).collect(Collectors.toList()); + for(PageData pageData:varList){ + if(StringUtils.isBlank(pageData.getString("NAME"))){ + pageData.put("MAP_POINT_NAME",""); + }else { + pageData.put("MAP_POINT_NAME",pageData.getString("NAME")); + } + } + map.put("varList", varList); + }else { + map.put("varList", new ArrayList<>()); + } map.put("varList", varList); map.put("result", errInfo); return map; From 03ac45ffa5da9f9f4955d7443fd5fc39a5212448 Mon Sep 17 00:00:00 2001 From: limingyu Date: Tue, 23 Apr 2024 14:42:00 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E7=82=B9=E4=BD=8D=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlatformvideomanagementController.java | 18 ++++++++++++++++++ .../PlatformvideomanagementMapper.xml | 6 +++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java index 0f41a466..b1a85702 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java @@ -127,8 +127,26 @@ public class PlatformvideomanagementController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); List varList = platformvideomanagementService.listAll(pd); //列出Platformvideomanagement列表 + for (PageData data : varList) { + data.put("MAP_POINT_NAME", data.getString("NAME")); + } map.put("varList", varList); map.put("result", errInfo); return map; } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/getHlsPathById") + @ResponseBody + public Object getHlsPathById() throws Exception{ + Map map = new HashMap(); + PageData pd =this.getPageData(); + pd = platformvideomanagementService.findById(pd); + map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls"); + map.put("pd",pd); + map.put("result", "success"); + return map; + } } diff --git a/src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml index 2bdfe30a..5752216b 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml @@ -162,9 +162,13 @@ From 672ee48f9409e5f4dae2fc845a8a75434e82a949 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 23 Apr 2024 17:58:27 +0800 Subject: [PATCH 4/8] =?UTF-8?q?1=E3=80=81=E4=BC=81=E4=B8=9A=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/controller/dw/DwController.java | 14 ++++++++++++++ .../zcloud/controller/map/MapController.java | 16 +++++++++------- .../java/com/zcloud/service/dw/DwService.java | 17 +++++++++++++++-- .../zcloud/service/dw/dto/GetLastPropDto.java | 11 +++++++++++ .../zcloud/service/dw/impl/DwServiceImpl.java | 10 ++++++++++ 5 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/zcloud/service/dw/dto/GetLastPropDto.java diff --git a/src/main/java/com/zcloud/controller/dw/DwController.java b/src/main/java/com/zcloud/controller/dw/DwController.java index d722fb43..7217f8d6 100644 --- a/src/main/java/com/zcloud/controller/dw/DwController.java +++ b/src/main/java/com/zcloud/controller/dw/DwController.java @@ -81,4 +81,18 @@ public class DwController extends BaseController { return dwService.getDictionary(); } + @RequestMapping(value = "getLastProp") + public Object getLastProp() throws Exception { + PageData pd = this.getPageData(); + GetLastPropDto mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), GetLastPropDto.class); + return dwService.getLastProp(mapGet); + } + + @RequestMapping(value = "getAllMessage") + public Object getAllMessage() throws Exception { + PageData pd = this.getPageData(); + return dwService.getAllMessage(); + } + + } diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 4998f895..61111842 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -885,13 +885,15 @@ public class MapController extends BaseController { return map; } else { MapInfo info = JSONObject.parseObject(JSONObject.toJSONString(map.get("info")), MapInfo.class); - PageData condition = new PageData(); - condition.put("USER_ID", info.getRequired().getUserId()); - PageData userInfo = usersService.findById(condition); - HashMap otherInfo = new HashMap<>(); - otherInfo.put("postName", userInfo.getString("postName")); - otherInfo.put("personType", userInfo.getString("PERSON_TYPE")); - map.put("otherInfo", otherInfo); + if (org.apache.commons.lang3.StringUtils.isNotBlank(info.getRequired().getUserId())){ + PageData condition = new PageData(); + condition.put("USER_ID", info.getRequired().getUserId()); + PageData userInfo = usersService.findById(condition); + HashMap otherInfo = new HashMap<>(); + otherInfo.put("postName", userInfo.getString("postName")); + otherInfo.put("personType", userInfo.getString("PERSON_TYPE")); + map.put("otherInfo", otherInfo); + } return map; } } else { diff --git a/src/main/java/com/zcloud/service/dw/DwService.java b/src/main/java/com/zcloud/service/dw/DwService.java index ca17590f..ed08a8d8 100644 --- a/src/main/java/com/zcloud/service/dw/DwService.java +++ b/src/main/java/com/zcloud/service/dw/DwService.java @@ -3,14 +3,27 @@ package com.zcloud.service.dw; import com.zcloud.service.dw.dto.*; public interface DwService { - + // 第一版定位接口 + // 废弃 + @Deprecated Object getMapInfo(MapGet param) throws Exception; + // 废弃 + @Deprecated Object getMapList(MapGet param) throws Exception; + // 废弃 + @Deprecated Object saveOrUpdateMap(MapInfo param) throws Exception; Object getTrace(TraceGet param) throws Exception; Object getAlarmList(AlarmGet param) throws Exception; Object manageAlarm(AlarmManageDto param) throws Exception; + // 废弃 + @Deprecated Object getDictionary() throws Exception; - + // 废弃 + @Deprecated Object deleteMap(DeleteDto deleteDto); + // 第二版定位接口 + Object getLastProp(GetLastPropDto dto) throws Exception; + Object getAllMessage() throws Exception; + } diff --git a/src/main/java/com/zcloud/service/dw/dto/GetLastPropDto.java b/src/main/java/com/zcloud/service/dw/dto/GetLastPropDto.java new file mode 100644 index 00000000..9fabc761 --- /dev/null +++ b/src/main/java/com/zcloud/service/dw/dto/GetLastPropDto.java @@ -0,0 +1,11 @@ +package com.zcloud.service.dw.dto; + +import lombok.Data; + +@Data +public class GetLastPropDto { + // 设备编号 + private String deviceCode; + //属性identifier,多个属性时逗号隔开，不传或为null时，查设备全部属性最新值 + private String prop; +} diff --git a/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java b/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java index edf9433c..29c609eb 100644 --- a/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java +++ b/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java @@ -67,4 +67,14 @@ public class DwServiceImpl implements DwService { public Object deleteMap(DeleteDto deleteDto) { return HttpUtil.post(url + "dw/deleteMap", deleteDto); } + + @Override + public Object getLastProp(GetLastPropDto dto) throws Exception { + return HttpUtil.post(url + "dw/getLastProp", dto); + } + + @Override + public Object getAllMessage() throws Exception { + return HttpUtil.post(url + "dw/getAllMessage",null); + } } From b5acd5f91d5917aa112f03908fa9f448b488e229 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 23 Apr 2024 18:30:39 +0800 Subject: [PATCH 5/8] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/service/dw/DwService.java | 2 ++ .../com/zcloud/service/dw/dto/GetCameraInfoDto.java | 8 ++++++++ .../com/zcloud/service/dw/dto/GetCameraListDto.java | 10 ++++++++++ .../java/com/zcloud/service/dw/impl/DwServiceImpl.java | 10 ++++++++++ 4 files changed, 30 insertions(+) create mode 100644 src/main/java/com/zcloud/service/dw/dto/GetCameraInfoDto.java create mode 100644 src/main/java/com/zcloud/service/dw/dto/GetCameraListDto.java diff --git a/src/main/java/com/zcloud/service/dw/DwService.java b/src/main/java/com/zcloud/service/dw/DwService.java index ed08a8d8..1d10fc06 100644 --- a/src/main/java/com/zcloud/service/dw/DwService.java +++ b/src/main/java/com/zcloud/service/dw/DwService.java @@ -25,5 +25,7 @@ public interface DwService { // 第二版定位接口 Object getLastProp(GetLastPropDto dto) throws Exception; Object getAllMessage() throws Exception; + Object getCameraList(GetCameraListDto dto) throws Exception; + Object getCameraInfo(GetCameraInfoDto dto) throws Exception; } diff --git a/src/main/java/com/zcloud/service/dw/dto/GetCameraInfoDto.java b/src/main/java/com/zcloud/service/dw/dto/GetCameraInfoDto.java new file mode 100644 index 00000000..40a2b6cc --- /dev/null +++ b/src/main/java/com/zcloud/service/dw/dto/GetCameraInfoDto.java @@ -0,0 +1,8 @@ +package com.zcloud.service.dw.dto; + +import lombok.Data; + +@Data +public class GetCameraInfoDto { + private String id; +} diff --git a/src/main/java/com/zcloud/service/dw/dto/GetCameraListDto.java b/src/main/java/com/zcloud/service/dw/dto/GetCameraListDto.java new file mode 100644 index 00000000..4525e595 --- /dev/null +++ b/src/main/java/com/zcloud/service/dw/dto/GetCameraListDto.java @@ -0,0 +1,10 @@ +package com.zcloud.service.dw.dto; + +import lombok.Data; + +@Data +public class GetCameraListDto { + private String name; + private int current; + private int size; +} diff --git a/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java b/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java index 29c609eb..d7bc375a 100644 --- a/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java +++ b/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java @@ -77,4 +77,14 @@ public class DwServiceImpl implements DwService { public Object getAllMessage() throws Exception { return HttpUtil.post(url + "dw/getAllMessage",null); } + + @Override + public Object getCameraList(GetCameraListDto dto) throws Exception { + return HttpUtil.post(url + "dw/getCameraList",dto); + } + + @Override + public Object getCameraInfo(GetCameraInfoDto dto) throws Exception { + return HttpUtil.post(url + "dw/getCameraInfo",dto); + } } From 0a95da31c73a7e136ded4b9c409ef0b9676ef6cd Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 23 Apr 2024 18:53:02 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/controller/map/MapController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 61111842..4fd206c1 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -922,7 +922,7 @@ public class MapController extends BaseController { } } - @RequestMapping(value = "/getAlarmList") + @RequestMapping(value = "/getAllDwMessage") @ResponseBody public Object getAlarmList() throws Exception { Map map = new HashMap(); @@ -934,7 +934,10 @@ public class MapController extends BaseController { alarmGet.getPage().setCurrent("1"); alarmGet.getPage().setSize("20"); alarmGet.setCorpId(pd.getString("corpId")); - return dwService.getAlarmList(alarmGet); + map.put("result", "success"); + map.put("alarmList",dwService.getAlarmList(alarmGet)); + map.put("orthermessage",dwService.getAllMessage()); + return map; }else { PageData value = usersService.getPersonByCardNo(pd); map.put("result", "success"); From 1054f21702c8c1ef22c31766e553c7e202863e23 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 23 Apr 2024 19:24:33 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/map/MapController.java | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 4fd206c1..a7a1c064 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -7,10 +7,7 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.dw.DwService; -import com.zcloud.service.dw.dto.AlarmGet; -import com.zcloud.service.dw.dto.MapGet; -import com.zcloud.service.dw.dto.MapInfo; -import com.zcloud.service.dw.dto.TraceGet; +import com.zcloud.service.dw.dto.*; import com.zcloud.service.keyProjects.VideoManagerService; import com.zcloud.service.map.*; import com.zcloud.service.map.util.ReturnMap; @@ -924,7 +921,7 @@ public class MapController extends BaseController { @RequestMapping(value = "/getAllDwMessage") @ResponseBody - public Object getAlarmList() throws Exception { + public Object getAllDwMessage() throws Exception { Map map = new HashMap(); PageData pd = this.getPageData(); // TODO 判断是否是公司人员定位 @@ -946,6 +943,28 @@ public class MapController extends BaseController { } } + /** + * 获取最新状态 + * @return + * @throws Exception + */ + @RequestMapping(value = "/getLastProp") + @ResponseBody + public Object getLastProp() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + // TODO 判断是否是公司人员定位 + if (pd.get("corpId") != null && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("corpId"))) { + GetLastPropDto dto = new GetLastPropDto(); + dto.setDeviceCode(pd.getString("CARDNO")); + return dwService.getLastProp(dto); + }else { + // TODO 其他系统有待开发 + return null; + } + } + + /** From 776f133f63d3c583cd6bb0a24519c31c4497525a Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 24 Apr 2024 14:02:37 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=97=B6=E6=9C=AA?= =?UTF-8?q?=E5=BC=82=E6=AD=A5bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/map/MapController.java | 44 +++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index a7a1c064..1226a031 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -405,7 +405,7 @@ public class MapController extends BaseController { */ @RequestMapping("/getPersonPositioningCount") @ResponseBody - public Object getPersonPositioningCount() { + public Object getPersonPositioningCount() throws Exception{ Map map = new HashMap(); PageData pageData = this.getPageData(); if ("00004".equals(pageData.getString("GANGKOU"))) { @@ -427,8 +427,6 @@ public class MapController extends BaseController { return result; } - // bus_riskunit - // bus_identificationparts PageData data = biMapService.getPersonPositioningCount(pageData); map.put("result", "success"); map.put("personPositioningCount", data); @@ -841,10 +839,15 @@ public class MapController extends BaseController { */ @RequestMapping(value = "/getCurrentLocationOnline") @ResponseBody - public Object getCurrentLocationOnline() { + public Object getCurrentLocationOnline() throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); + // created by liu jun 一公司人员定位新增摄像头功能 + if ("platcamera".equals(pd.getString("TYPE")) && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("CORPINFO_ID"))){ + GetCameraListDto dto = new GetCameraListDto(); + return dwService.getCameraList(dto); + } if ("00004".equals(pd.getString("GANGKOU")) && pd.getString("TYPE").equals("peoplePosition")) { MultiValueMap paramMap = new LinkedMultiValueMap(); Map result = @@ -964,6 +967,39 @@ public class MapController extends BaseController { } } + @RequestMapping(value = "/getCameraList") + @ResponseBody + public Object getCameraList() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + // TODO 判断是否是公司人员定位 + if (pd.get("corpId") != null && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("corpId"))) { + GetCameraListDto dto = new GetCameraListDto(); + return dwService.getCameraList(dto); + }else { + // TODO 其他系统有待开发 + return null; + } + } + + + @RequestMapping(value = "/getCameraInfo") + @ResponseBody + public Object getCameraInfo() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + // TODO 判断是否是公司人员定位 + if (pd.get("corpId") != null && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("corpId"))) { + GetCameraInfoDto dto = new GetCameraInfoDto(); + dto.setId(pd.getString("id")); + return dwService.getCameraInfo(dto); + }else { + // TODO 其他系统有待开发 + return null; + } + } + +