Merge remote-tracking branch 'origin/master'

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/MapDataController.java

@@ -125,11 +125,11 @@ public class MapDataController {
     }
 
     @GetMapping("getMapDataType")
-    public Map<String, Object> getMapDataType(int page,int limit,String dictType,String type,String title) {
-        if (ObjectUtil.hasEmpty(page,limit)){
-            return SendUtil.send(false, ConstStr.RESULT_FAILED, "");
-        }
-        return mapDataService.getMapDataType( page, limit,dictType,type,title);
+    public Map<String, Object> getMapDataType(String dictType,String type,String title) {
+//        if (ObjectUtil.hasEmpty(page,limit)){
+//            return SendUtil.send(false, ConstStr.RESULT_FAILED, "");
+//        }
+        return mapDataService.getMapDataType(dictType,type,title);
     }
 
 

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/MapDataDao.java

@@ -116,5 +116,5 @@ public interface MapDataDao {
 	long pageCount(@Param("mapVo") MapVo mapVo);
 
 	Integer getMapDataCount(@Param("dictType") String[] dictType, @Param("type") String type, @Param("title") String title);
-	List<MapData> getMapDataType(@Param("page") int page, @Param("limit") int limit,@Param("dictType") String[] dictType, @Param("type") String type, @Param("title") String title);
+	List<MapData> getMapDataType(@Param("dictType") String[] dictType, @Param("type") String type, @Param("title") String title);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/MapDataService.java

@@ -86,5 +86,5 @@ public interface MapDataService {
 	Map<String, Object> queryMap(String name, String type, String dictType);
 	Map<String, Object> queryMapPage(MapVo mapVo);
 
-	Map<String,Object> getMapDataType(int page, int limit, String dictType, String type, String title);
+	Map<String,Object> getMapDataType( String dictType, String type, String title);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/MapDataServiceImpl.java

@@ -235,16 +235,16 @@ public class MapDataServiceImpl implements MapDataService {
     }
 
     @Override
-    public Map<String,Object> getMapDataType(int page, int limit, String dictType, String type, String title) {
+    public Map<String,Object> getMapDataType( String dictType, String type, String title) {
         String[] split = null;
         if (StrUtil.isNotEmpty(dictType)){
              split = dictType.split(",");
         }
-        page = (page - 1) * limit;
-        Integer mapDataCount = mapDataDao.getMapDataCount(split, type, title);
-        if (mapDataCount == 0){
-            return SendUtil.layuiTable(mapDataCount, null);
-        }
-        return SendUtil.layuiTable(mapDataCount, mapDataDao.getMapDataType(page,limit,split, type, title));
+//        page = (page - 1) * limit;
+//        Integer mapDataCount = mapDataDao.getMapDataCount(split, type, title);
+//        if (mapDataCount == 0){
+//            return SendUtil.layuiTable(mapDataCount, null);
+//        }
+        return SendUtil.send(true,"", mapDataDao.getMapDataType(split, type, title));
     }
 }

nngkxxdp/src/main/resources/mapper/MapDataDao.xml

@@ -341,7 +341,6 @@
                 and dep like  CONCAT('%',#{title},'%')
             </if>
         </where>
-        limit #{page},#{limit}
     </select>
-
+<!--    limit #{page},#{limit}-->
 </mapper>