From 252feb164154c1bbcb3f4a2f6d17457dcf392a0c Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Fri, 25 Oct 2024 09:26:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_grid' into gzdyh_grid
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/wechat/SyregionWechatController.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/wechat/SyregionWechatController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/wechat/SyregionWechatController.java
index 498a1b7..6b01f3e 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/wechat/SyregionWechatController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/wechat/SyregionWechatController.java
@@ -1,12 +1,9 @@
package cn.huge.module.kind.controller.wechat;
-import cn.huge.base.common.constant.GzAreaEnum;
-import cn.huge.base.common.utils.ObjectUtils;
-import cn.huge.base.common.utils.ReturnFailUtils;
-import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.base.common.constant.GzRegionEnum;
+import cn.huge.base.common.utils.*;
import cn.huge.module.kind.domain.po.SyRegion;
import cn.huge.module.kind.service.SyRegionService;
-import cn.huge.module.sys.dto.QueAddrBaseDTO;
import cn.huge.module.utils.BaiduMapAddrDTO;
import cn.huge.module.utils.BaiduMapUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -48,20 +45,22 @@
@GetMapping("/checkRegisterArea")
public Object checkRegisterArea(@RequestParam(value = "lng") String lng, @RequestParam(value = "lat") String lat) {
try {
- BaiduMapAddrDTO baiduMapAddrDTO = BaiduMapUtils.getAddrByLngLat(lng, lat, BaiduMapUtils.coordtype_bd09ll);
+ //经纬度转换
+ PointXY pointXY = MapUtils.gcj02tobd09(Double.valueOf(lng), Double.valueOf(lat));
+ BaiduMapAddrDTO baiduMapAddrDTO = BaiduMapUtils.getAddrByLngLat(String.valueOf(pointXY.getLon()), String.valueOf(pointXY.getLat()), BaiduMapUtils.coordtype_bd09ll);
QueryWrapper<SyRegion> syRegionQueryWrapper = new QueryWrapper<>();
// 查询区
syRegionQueryWrapper.clear();
syRegionQueryWrapper.like("name", baiduMapAddrDTO.getDistrict());
SyRegion district = service.getOne(syRegionQueryWrapper);
if (ObjectUtils.isNotEmpty(district)) {
- if (GzAreaEnum.GZAREAEnum_7.getIndex().equals(district.getId())) {
- return ReturnSucUtils.getRepInfo();
+ if (GzRegionEnum.AREA_7.getIndex().equals(district.getId())) {
+ return ReturnSucUtils.getRepInfo(true);
} else {
- return ReturnSucUtils.getRepInfo(200, "反映诉求服务目前仅支持纠纷发生地为白云区内的申请。", null);
+ return ReturnSucUtils.getRepInfo("反映诉求服务目前仅支持纠纷发生地为白云区内的申请。", false);
}
}else {
- return ReturnSucUtils.getRepInfo(200, "反映诉求服务目前仅支持纠纷发生地为白云区内的申请。", null);
+ return ReturnSucUtils.getRepInfo("反映诉求服务目前仅支持纠纷发生地为白云区内的申请。", false);
}
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
--
Gitblit v1.8.0