修改ssr连接bug

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TopologicalCommonController.java

@@ -124,7 +124,7 @@ public class TopologicalCommonController {
         int pages = PageUtil.totalPage(wdCount.size(), size);
         for (int i = 0; i < pages; i++) {
             try {
-                List<PointBo> boList = CollUtil.page(i + 1, size, wdCount);
+                List<PointBo> boList = CollUtil.page(i, size, wdCount);
                 if (!boList.isEmpty()) sseEmitter.send(SseEmitter.event().name("message").data(JSONUtil.toJsonStr(boList)));
             } catch (IOException e) {
                 sseEmitter.completeWithError(e);

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/TopologicalWdAceeptVo.java

@@ -16,6 +16,11 @@ import java.math.BigDecimal;
 @Data
 public class TopologicalWdAceeptVo implements Serializable {
 
+    /**
+     * 网点Id
+     */
+    private String wdId;
+
     /**
      * 中心点半径范围
      */
@@ -51,6 +56,7 @@ public class TopologicalWdAceeptVo implements Serializable {
         stringBuilder.append(radius);
         stringBuilder.append(pageSize);
         stringBuilder.append(pageNum);
+        stringBuilder.append(wdId);
 
         String s = stringBuilder.toString();
         String md5 = HashUtil.hash(s, "MD5");

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TopologicalStoreWdServiceImpl.java

@@ -31,6 +31,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional
@@ -69,6 +70,12 @@ public class TopologicalStoreWdServiceImpl implements TopologicalStoreWdService
             return result;
         }
 
+        //按应标要求去除本身
+        if (topologicalWdAceeptVo.getWdId() != null && !topologicalWdAceeptVo.getWdId().equals("")){
+            aroundWdId.remove(topologicalWdAceeptVo.getWdId());
+        }
+
+
         //2.分页查找网点信息
         QueryWrapper<WdInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("wd_type_code","1");