From 0cecda00e8638f21d4acf1d9ede3b85c51d79216 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 17 一月 2022 17:04:31 +0800
Subject: [PATCH] 商业街距离计算修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsInformationServiceImpl.java | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsInformationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsInformationServiceImpl.java
index 5952e34..0139e47 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsInformationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsInformationServiceImpl.java
@@ -2,16 +2,11 @@
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
-import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+
+import java.util.Date;
import javax.annotation.Resource;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
-import com.panzhihua.common.model.vos.community.microCommercialStreet.McsGameVO;
-import com.panzhihua.common.model.vos.community.microCommercialStreet.McsMerchantVO;
-import com.panzhihua.common.utlis.DateUtils;
-import com.panzhihua.service_community.util.NearbyUtil;
-import com.spatial4j.core.shape.Rectangle;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -19,19 +14,20 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsInformationVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsMerchantVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.TopStatisticsVO;
+import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.dao.McsGameDAO;
import com.panzhihua.service_community.dao.McsInformationDAO;
import com.panzhihua.service_community.dao.McsMerchantDAO;
import com.panzhihua.service_community.entity.McsInformation;
import com.panzhihua.service_community.entity.McsMerchant;
import com.panzhihua.service_community.service.McsInformationService;
-
-import java.util.Date;
/**
* (McsInformation)表服务实现类
@@ -222,18 +218,7 @@
Page page = new Page<>();
page.setSize(pageMcsInformationDTO.getPageSize());
page.setCurrent(pageMcsInformationDTO.getPageNum());
- String lat = pageMcsInformationDTO.getLat();
- String lon = pageMcsInformationDTO.getLon();
- Integer distance = pageMcsInformationDTO.getDistance();
- IPage<McsInformationVO> mcsInfos;
- if (isNotEmpty(lat) && isNotEmpty(lon) && nonNull(distance)) {
- Rectangle rectangle =new NearbyUtil().getRectangle(pageMcsInformationDTO.getDistance(),
- Double.parseDouble(pageMcsInformationDTO.getLon()), Double.parseDouble(pageMcsInformationDTO.getLat()));
- mcsInfos = this.baseMapper.pageH5McsInfo(page, rectangle.getMinX(), rectangle.getMaxX(),
- rectangle.getMinY(), rectangle.getMaxY(), pageMcsInformationDTO);
- } else {
- mcsInfos = this.baseMapper.pageH5McsInfo(page, null, null, null, null, pageMcsInformationDTO);
- }
+ IPage<McsInformationVO> mcsInfos = this.baseMapper.pageH5McsInfo(page, pageMcsInformationDTO);
return R.ok(mcsInfos);
}
--
Gitblit v1.7.1