develop
Angel 10 months ago
parent b7a821c680
commit f3cd4b8e3d

@ -7,10 +7,12 @@ import com.ruoyi.business.domain.vo.*;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.NumKit;
import com.ruoyi.common.utils.StringKit;
import com.ruoyi.business.controller.utils.NumKit;
import com.ruoyi.business.controller.utils.StringKit;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.database.domain.*;
import com.ruoyi.database.domain.dto.MetaRealEstateInfoDTO;
import com.ruoyi.database.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -19,10 +21,7 @@ import lombok.RequiredArgsConstructor;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@ -95,6 +94,29 @@ public class BigScreenController extends BaseController {
}
}
@PostMapping("/boundary")
@ApiOperation("边界列表")
public TableDataInfo<MetaRealEstateInfo> list(
@RequestParam("startLongitude") Double startLongitude,
@RequestParam("endLongitude") Double endLongitude,
@RequestParam("startLatitude") Double startLatitude,
@RequestParam("endLatitude") Double endLatitude) {
QueryWrapper<MetaRealEstateInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.between("longitude", startLongitude, endLongitude)
.between("latitude", startLatitude, endLatitude);
List<MetaRealEstateInfo> list = realEstateInfoService.list(queryWrapper);
int count = realEstateInfoService.count(queryWrapper);
List<MetaRealEstateInfoDTO> resultList = new ArrayList<>();
for (MetaRealEstateInfo info : list) {
MetaRealEstateInfoDTO dto = new MetaRealEstateInfoDTO();
org.springframework.beans.BeanUtils.copyProperties(info, dto);
String concatenatedAddress = info.getRealEstateBriefAddress() + info.getBuildingName() + "幢";
dto.setConcatenatedAddress(concatenatedAddress);
resultList.add(dto);
}
TableDataInfo dataTable = getDataTable(resultList);
return dataTable;
}
@GetMapping
@ApiOperation("常驻人员列表")
@ -549,8 +571,6 @@ public class BigScreenController extends BaseController {
Collectors.toList()
)
));
return AjaxResult.success(resultMap);
} catch (Exception e) {
logger.info(StringKit.toString(e));
@ -672,5 +692,4 @@ public class BigScreenController extends BaseController {
}
}

Loading…
Cancel
Save