diff --git a/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadReqDTO.java b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadReqDTO.java index 2374d35..8d7c89a 100644 --- a/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadReqDTO.java +++ b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadReqDTO.java @@ -22,4 +22,6 @@ public class RoadReqDTO { @Schema(description = "维度", example = "121.40476") private String latitude; + @Schema(description = "道路名称", example = "中国") + private String roadName; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java index 46e31c5..428601d 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java @@ -14,6 +14,7 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.util.ArrayList; import java.util.HashMap; @@ -44,9 +45,12 @@ public class RoadApiImpl implements RoadApi { param.put("companyCode", reqDTO.getBusiLine()); param.put("longitude", reqDTO.getLongitude()); param.put("latitude", reqDTO.getLatitude()); + if (StringUtils.hasText(reqDTO.getRoadName())) { + param.put("roadName", reqDTO.getRoadName()); + } String responseBody = HttpUtils.post(roadInfoUrl, null, JSON.toJSONString(param)); - log.info("获取道路信息接口,系统:{},经度:{},维度:{},返回结果:{}", reqDTO.getBusiLine(), reqDTO.getLongitude(), reqDTO.getLatitude(), responseBody); + log.info("获取道路信息接口,系统:{},经度:{},维度:{},roadName:{},返回结果:{}", reqDTO.getBusiLine(), reqDTO.getLongitude(), reqDTO.getLatitude(), reqDTO.getRoadName(), responseBody); JSONObject response = JSONUtil.parseObj(responseBody); if (response.getInt("code") != 200) { return new ArrayList<>(); diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/eventinfo/AppEventInfoController.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/eventinfo/AppEventInfoController.java index 2b5a509..444660c 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/eventinfo/AppEventInfoController.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/eventinfo/AppEventInfoController.java @@ -61,13 +61,13 @@ public class AppEventInfoController { return CommonResult.error(BAD_REQUEST, "子系统编码不能为空"); } - SysMappingEnum sys = SysMappingEnum.getBySysCode(companyCode); + String sys = SysMappingEnum.getNameBySysCode(companyCode); EventInfoSaveReqVO vo = new EventInfoSaveReqVO(); String eventNo = workOrderApi.generateWONum(EVENT_INFO_PREFFIX_UNIVERSE); vo.setEventNo(eventNo); vo.setEventStatus(EventStatusEnum.PENDING.getCode()); - vo.setBusiLine(sys.name().toLowerCase()); + vo.setBusiLine(sys); vo.setLon(createReqVO.getUserConfrimLon()); vo.setLat(createReqVO.getUserConfrimLat()); vo.setConfrimImgs(createReqVO.getUserConfrimImgs()); diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/eventinfo/EventInfoMapper.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/eventinfo/EventInfoMapper.java index d31131b..fa2e42e 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/eventinfo/EventInfoMapper.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/eventinfo/EventInfoMapper.java @@ -36,6 +36,7 @@ public interface EventInfoMapper extends BaseMapperX { .eqIfPresent(EventInfoDO::getEventStatus, reqVO.getEventStatus()) .likeIfPresent(EventInfoDO::getRemark, reqVO.getRemark()) .betweenIfPresent(EventInfoDO::getCreateTime, reqVO.getCreateTime()) + .ne(EventInfoDO::getBusiLine, "sz") .orderByDesc(EventInfoDO::getId)); } diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/enums/SysMappingEnum.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/enums/SysMappingEnum.java index 2b7f0a5..1c58726 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/enums/SysMappingEnum.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/enums/SysMappingEnum.java @@ -40,4 +40,14 @@ public enum SysMappingEnum { } throw new IllegalArgumentException("未知的系统: " + sysCode); } + + public static String getNameBySysCode(String sysCode) { + for (SysMappingEnum node : values()) { + if (node.getSysCode().equals(sysCode) ) { + return node.name().toLowerCase(); + } + } + return sysCode.toLowerCase(); + } + }