From 2c3deeb8fada43bc1df3f728cbdcee72ef1048da Mon Sep 17 00:00:00 2001 From: cs <673849330@qq,com> Date: Fri, 21 Jan 2022 15:19:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ComponentDetailController.java | 14 +++--- .../controller/ComponentTypeController.java | 2 +- .../impl/ComponentDetailServiceImpl.java | 43 +++++++++++++------ .../biz/tencent/map/config/TxMapConfig.java | 7 ++- 4 files changed, 42 insertions(+), 24 deletions(-) diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentDetailController.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentDetailController.java index ef7f4e4..58001a9 100644 --- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentDetailController.java +++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentDetailController.java @@ -101,37 +101,37 @@ public class ComponentDetailController { @ApiOperation(value = "查询当前区域下,过去半年内每个月的部件采集数量(拟态网格)") @PostMapping(value = "/selectSumComponentsByMounth") public ResultBean> selectSumComponentsByMounth(@ApiParam(name = "code",value = "区域编码,示例值(511402)",required = true)@RequestParam("code") String code, - @ApiParam(name = "type",value = "区域类型:grid-网格;community-社区;street-街道;district-区域,示例值(district)",required = true)@RequestParam("type") String type) { + @ApiParam(name = "type",value = "区域类型:grid-网格;community-社区;street-街道;district-区域;road-路段,示例值(district)",required = true)@RequestParam("type") String type) { return componentDetailService.selectSumComponentsByMounth(code,type); } @ApiOperation(value = "查询当前区域下今日每个父类下面的部件数及类型(拟态网格)") @PostMapping(value = "/selectTodayComponentsSuperTypeSum") public ResultBean> selectTodayComponentsSuperTypeSum(@ApiParam(name = "code",value = "区域编码,示例值(511402)",required = true)@RequestParam("code") String code, - @ApiParam(name = "type",value = "区域类型:grid-网格;community-社区;street-街道;district-区域,示例值(district)",required = true)@RequestParam("type") String type) { + @ApiParam(name = "type",value = "区域类型:grid-网格;community-社区;street-街道;district-区域;road-路段,示例值(district)",required = true)@RequestParam("type") String type) { return componentDetailService.selectTodayComponentsSuperTypeSum(code,type); } - @ApiOperation(value = "当前区域下，获取ar巡检的总数，部件的完好数，异常数(拟态网格)") + @ApiOperation(value = "查询当前区域下，获取ar巡检的总数，部件的完好数，异常数(拟态网格)") @PostMapping(value = "/selectSumComponentsInDirection") public ResultBean selectSumComponentsInDirection(@ApiParam(name = "code",value = "区域编码,示例值(511402)",required = true)@RequestParam("code") String code, - @ApiParam(name = "type",value = "区域类型:grid-网格;community-社区;street-街道;district-区域,示例值(district)",required = true)@RequestParam("type") String type) { + @ApiParam(name = "type",value = "区域类型:grid-网格;community-社区;street-街道;district-区域;road-路段,示例值(district)",required = true)@RequestParam("type") String type) { return componentDetailService.selectSumComponentsInDirection(code,type); } @ApiOperation(value = "查询当前区域下，根据部件类别获取该类别下的所有部件信息(拟态网格)") @PostMapping(value = "/selectDetailComponents") public ResultBean> selectDetailComponents(@ApiParam(name = "code",value = "区域编码,示例值(511402)",required = true)@RequestParam("code") String code, - @ApiParam(name = "type",value = "区域类型:grid-网格;community-社区;street-街道;district-区域,示例值(district)",required = true)@RequestParam("type") String type, + @ApiParam(name = "type",value = "区域类型:grid-网格;community-社区;street-街道;district-区域;road-路段,示例值(district)",required = true)@RequestParam("type") String type, @ApiParam(name = "componentName",value = "部件名称",required = true)@RequestParam("componentName") String componentName, @ApiParam(name = "componentCode",value = "部件代码",required = true)@RequestParam("componentCode") String componentCode) { return componentDetailService.selectDetailComponents(code,type,componentCode,componentName); } - @ApiOperation(value = "获取当前区域下今日巡检部件总数(拟态网格)") + @ApiOperation(value = "查询获取当前区域下今日巡检部件总数(拟态网格)") @PostMapping(value = "/selectTodaySumInDirection") public ResultBean selectTodaySumInDirection(@ApiParam(name = "code",value = "区域编码,示例值(511402)",required = true)@RequestParam("code") String code, - @ApiParam(name = "type",value = "区域类型:grid-网格;community-社区;street-街道;district-区域,示例值(district)",required = true)@RequestParam("type") String type) { + @ApiParam(name = "type",value = "区域类型:grid-网格;community-社区;street-街道;district-区域;road-路段,示例值(district)",required = true)@RequestParam("type") String type) { return componentDetailService.selectTodaySumInDirection(code,type); } diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentTypeController.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentTypeController.java index aafd908..28d7786 100644 --- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentTypeController.java +++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentTypeController.java @@ -57,7 +57,7 @@ public class ComponentTypeController { @ApiOperation(value = "查询当前区域下所有父类下面的子类部件(拟态网格)") @PostMapping(value = "/selectAllTypesBySupperComponents") public ResultBean> selectAllTypesBySupperComponents(@ApiParam(name = "code",value = "区域编码,示例值(511402)",required = true)@RequestParam("code") String code, - @ApiParam(name = "type",value = "区域类型:grid-网格;community-社区;street-街道;district-区域,示例值(district)",required = true)@RequestParam("type") String type) { + @ApiParam(name = "type",value = "区域类型:grid-网格;community-社区;street-街道;district-区域;road-路段,示例值(district)",required = true)@RequestParam("type") String type) { return componentTypeService.selectAllTypesBySupperComponents(code,type); } diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentDetailServiceImpl.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentDetailServiceImpl.java index 0dbbbdf..6505118 100644 --- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentDetailServiceImpl.java +++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentDetailServiceImpl.java @@ -173,8 +173,8 @@ public class ComponentDetailServiceImpl extends ServiceImpl componentDetails = componentDetailMapper.judgeAIComponentIsExist(componentTypeName,xCode,yCode); + log.info("84转百度的经度: {}, 以及纬度: {}",WGS84Lng,WGS84Lat); + List componentDetails = componentDetailMapper.judgeAIComponentIsExist(componentTypeName,WGS84Lng,WGS84Lat); if(CollectionUtil.isEmpty(componentDetails)) { throw new LocalBusinessException(430,componentTypeName); @@ -194,8 +194,21 @@ public class ComponentDetailServiceImpl extends ServiceImpl componentIssuesReports = componentIssuesReportMapper.selectIssueIdByComponentId(componentDetail.getId()); + if(CollectionUtil.isNotEmpty(componentIssuesReports)) { + componentIssuesReports.stream().forEach(componentIssuesReport -> { + componentSubsVo.setRegCondName(componentIssuesReport.getRegCondName()); + componentSubsVo.setRegCondCode(componentIssuesReport.getRegCondCode()); + componentSubsVos.add(componentSubsVo); + }); + }else { + componentSubsVo.setRegCondName(""); + componentSubsVo.setRegCondCode(""); + componentSubsVos.add(componentSubsVo); + } }else { String componentDetailLng = componentDetail.getXCode(); String componentDetailLat = componentDetail.getYCode(); @@ -227,21 +240,23 @@ public class ComponentDetailServiceImpl extends ServiceImpl componentIssuesReports = componentIssuesReportMapper.selectIssueIdByComponentId(componentDetail.getId()); - if(CollectionUtil.isNotEmpty(componentIssuesReports)) { - componentIssuesReports.stream().forEach(componentIssuesReport -> { - componentSubsVo.setRegCondName(componentIssuesReport.getRegCondName()); - componentSubsVo.setRegCondCode(componentIssuesReport.getRegCondCode()); + List componentIssuesReports = componentIssuesReportMapper.selectIssueIdByComponentId(componentDetail.getId()); + if(CollectionUtil.isNotEmpty(componentIssuesReports)) { + componentIssuesReports.stream().forEach(componentIssuesReport -> { + componentSubsVo.setRegCondName(componentIssuesReport.getRegCondName()); + componentSubsVo.setRegCondCode(componentIssuesReport.getRegCondCode()); + componentSubsVos.add(componentSubsVo); + }); + }else { + componentSubsVo.setRegCondName(""); + componentSubsVo.setRegCondCode(""); componentSubsVos.add(componentSubsVo); - }); - }else { - componentSubsVo.setRegCondName(""); - componentSubsVo.setRegCondCode(""); - componentSubsVos.add(componentSubsVo); + } } } }); + + log.info(componentSubsVos.toString()); Map> collect = componentSubsVos .stream() .collect(Collectors.groupingBy(ComponentSubsVo :: getComponentName)); diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/tencent/map/config/TxMapConfig.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/tencent/map/config/TxMapConfig.java index 08c3a3e..591cef2 100644 --- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/tencent/map/config/TxMapConfig.java +++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/tencent/map/config/TxMapConfig.java @@ -1,7 +1,9 @@ package com.hncy.service.wechat.applet.biz.tencent.map.config; +import com.hncy.service.wechat.applet.biz.tencent.map.core.response.TxMapResponse; import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; /** @@ -12,17 +14,18 @@ import org.springframework.stereotype.Component; */ @Component @Data +@ConfigurationProperties(prefix = TxMapConfig.PREFIX) public class TxMapConfig { + public static final String PREFIX = "config.tencent.map"; + /** * key */ - @Value("${config.tencent.map.key}") private String key; /** * url */ - @Value("${config.tencent.map.url}") private String url; } -- GitLab