1

13693261870

2022-11-04 8aa79d9913374a471c80f5855a773850b87f601c

 src/main/java/com/lf/server/controller/all/BaseQueryController.java

@@ -20,6 +20,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

import java.util.List;

@@ -36,11 +37,11 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "name", value = "映射名称", dataType = "String", paramType = "query", example = "dlgAgnp"),
            @ApiImplicitParam(name = "filter", value = "过滤条件", dataType = "String", paramType = "query", example = "gid >= 50 and name like '县' and objectid < 5000.0"),
            @ApiImplicitParam(name = "wkt", value = "WKT（著名文本）", dataType = "String", paramType = "query", example = "gAPpDbZ53XfoQfvT8dj/uhBWX5os8kBJQ1LrNvH3VX7byFQdUJMPiEr8Fkj0q2i1pw+L8KFrvR0MLXq2xaO21nlQQXmEPofJxpDQZwEWUIFZsToXo1kLRD3t6WQezxWB8YTzXHM20Ba73x/ZuuezVhOFOq1U8HKf1dXQdv7gBzEB6fWMmFDc3FuH8GDDHv3LfT86Gio9VgMO6ohlrUdf3ZKtTHeLSuzGF4t0RZuX97YBNo25IIzpeTfRTXBxfdxA"),
            @ApiImplicitParam(name = "srid", value = "空间引用标识符", dataType = "Integer", paramType = "query", example = "4326")
            @ApiImplicitParam(name = "wkt", value = "WKT（著名文本）", dataType = "String", paramType = "query", example = "gAPpDbZ53XfoQfvT8dj/uhBWX5os8kBJQ1LrNvH3VX7byFQdUJMPiEr8Fkj0q2i1pw+L8KFrvR0MLXq2xaO21nlQQXmEPofJxpDQZwEWUIFZsToXo1kLRD3t6WQezxWB8YTzXHM20Ba73x/ZuuezVhOFOq1U8HKf1dXQdv7gBzEB6fWMmFDc3FuH8GDDHv3LfT86Gio9VgMO6ohlrUdf3ZKtTHeLSuzGF4t0RZuX97YBNo25IIzpeTfRTXBxfdxA")
    })
    @GetMapping({"/selectCount"})
    public ResponseMsg<Long> selectCount(String name, String filter, String wkt, Integer srid) {
    @GetMapping(value = "/selectCount")
    @PostMapping(value = "/selectCount")
    public ResponseMsg<Long> selectCount(String name, String filter, String wkt) {
        try {
            BasicMapper baseMapper = baseQueryService.getBasicMapper(name);
            if (baseMapper == null) {
@@ -49,7 +50,7 @@

            QueryWrapper wrapper = new QueryWrapper();
            baseQueryService.addFilterWrapper(wrapper, filter);
            baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt, srid);
            baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt);

            long count = baseMapper.selectCount(wrapper);

@@ -65,12 +66,13 @@
            @ApiImplicitParam(name = "name", value = "映射名称", dataType = "String", paramType = "query", example = "dlgAgnp"),
            @ApiImplicitParam(name = "filter", value = "过滤条件", dataType = "String", paramType = "query", example = ""),
            @ApiImplicitParam(name = "wkt", value = "WKT（著名文本）", dataType = "String", paramType = "query", example = ""),
            @ApiImplicitParam(name = "srid", value = "空间引用标识符", dataType = "Integer", paramType = "query", example = "4326"),
            //@ApiImplicitParam(name = "srid", value = "空间引用标识符", dataType = "Integer", paramType = "query", example = "4326"),
            @ApiImplicitParam(name = "pageIndex", value = "分页数（从1开始）", dataType = "Integer", paramType = "query", example = "1"),
            @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "Integer", paramType = "query", example = "10")
    })
    @GetMapping(value = "/selectByPage")
    public ResponseMsg<List<Object>> selectByPage(String name, String filter, String wkt, Integer srid, Integer pageIndex, Integer pageSize) {
    @PostMapping(value = "/selectByPage")
    public ResponseMsg<List<Object>> selectByPage(String name, String filter, String wkt, Integer pageIndex, Integer pageSize) {
        try {
            BasicMapper baseMapper = baseQueryService.getBasicMapper(name);
            if (baseMapper == null) {
@@ -79,7 +81,7 @@

            QueryWrapper wrapper = new QueryWrapper();
            baseQueryService.addFilterWrapper(wrapper, filter);
            baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt, srid);
            baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt);

            Page<Object> page = new Page<>(pageIndex, pageSize);
            page.addOrder(OrderItem.asc("gid"));