地籍属性表接口添加了分页功能

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/CadastreManageController.java

@@ -14,6 +14,7 @@ import com.siwei.apply.utils.ServiceFileUtil;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.utils.StringUtils;
 import com.siwei.common.core.web.controller.BaseController;
+import com.siwei.common.core.web.page.TableDataInfo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.gdal.ogr.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -274,8 +275,19 @@ public class CadastreManageController extends BaseController {
      * @return
      */
     @GetMapping("/selectTableList")
-    public R<List<Map<String,Object>>> selectTableRow(@RequestParam("tableName") String tableName,@RequestParam("geomFlag") String geomFlag,@RequestParam(value = "bsm",required = false,defaultValue = "") String bsm, @RequestParam(value = "ywh",required = false,defaultValue = "") String ywh) {
+    public R<?> selectTableRow(@RequestParam("tableName") String tableName,
+                               @RequestParam("geomFlag") String geomFlag,
+                               @RequestParam(value = "bsm", required = false, defaultValue = "") String bsm,
+                               @RequestParam(value = "ywh", required = false, defaultValue = "") String ywh,
+                               @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                               @RequestParam(value = "pageSize", required = false) Integer pageSize) {
         try {
+            if (pageNum != null && pageSize != null) {
+                startPage();
+                List<Map<String, Object>> pageRows = cadastreManageService.selectTableRow(tableName, geomFlag, bsm, ywh, true);
+                TableDataInfo tableDataInfo = getDataTable(pageRows);
+                return R.ok(tableDataInfo);
+            }
             List<Map<String, Object>> res = cadastreManageService.selectTableRow(tableName, geomFlag, bsm, ywh);
             return R.ok(res);
         } catch (Exception e) {

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/CadastreFileMapper.java

@@ -97,7 +97,7 @@ public interface CadastreFileMapper {
 
     int batchDeleteByBsm(@Param("tableName") String tableName, @Param("list") List<Map<String, Object>> list);
 
-    List<Map<String,Object>> selectTableDataByCondition(@Param("validFlag") String validFlag, @Param("tableName") String tableName,@Param("bsm") String bsm,@Param("ywh") String ywh);
+    List<Map<String,Object>> selectTableDataByCondition(@Param("validFlag") String validFlag, @Param("tableName") String tableName,@Param("bsm") String bsm,@Param("ywh") String ywh,@Param("needLimit") Boolean needLimit);
 
 
     List<Map<String,Object>> selectTableDataByZDDMorBDCDYH(@Param("validFlag") String validFlag, @Param("tableName") String tableName,@Param("zdIdList") List<String> zdIdList,@Param("zddmKey") String zddmKey,@Param("bdcIdList") List<String> bdcIdList) ;

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/CadastreManageService.java

@@ -48,6 +48,8 @@ public interface CadastreManageService {
 
     List<Map<String,Object>> selectTableRow(String tableName,String geomFlag,String bsm,String ywh);
 
+    List<Map<String,Object>> selectTableRow(String tableName,String geomFlag,String bsm,String ywh, boolean pageQuery);
+
     List<Map<String,Object>> selectTableRowExcel(String tableName,String geomFlag,List<Object> bsmList,List<String> ywhList);
 
     String tableRowUpdate(String tableName, List<Map<String,Object>> list);

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/third/impl/DealExcelServiceImpl.java

@@ -1016,7 +1016,7 @@ public class DealExcelServiceImpl {
 
         try {
             String ywh = "dzjgh = " + "'" + dzjgh + "'";
-            List<Map<String, Object>> gdRes = cadastreFileMapper.selectTableDataByCondition("", "gj_gd_data", "", ywh);
+            List<Map<String, Object>> gdRes = cadastreFileMapper.selectTableDataByCondition("", "gj_gd_data", "", ywh, true);
 
             log.info("获取excel中电子监管号：{}", dzjgh);
             List<String> gdIdList = gdRes.stream().filter(s -> s.get("dzjgh") != null).map(s -> s.get("gid").toString()).collect(Collectors.toList());

siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/CadastreFileMapper.xml

@@ -302,7 +302,9 @@
         <if test="ywh != null and ywh != ''">
             and ${ywh}
         </if>
-        LIMIT 100
+        <if test="needLimit != null and needLimit">
+            LIMIT 100
+        </if>
     </select>