分页

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/IndexParameterController.java

@@ -43,8 +43,8 @@ public class IndexParameterController {
         return parameterService.findAll();
     }*/
    @RequestMapping("/findAll")
-   public Result findAll(String name , Integer pageNum , Integer pageSize){
-       return parameterService.findAll(name,pageNum,pageSize);
+   public Result findAll(){
+       return parameterService.findAll();
    }
 
 

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigFeedController.java

@@ -27,7 +27,7 @@ public class MPigFeedController {
 
 	@RequestMapping("/findAll")
     public Result findAll(String name ,Integer pageNum , Integer pageSize){
-        return childcareService.findAll(name,pageNum,pageSize);
+        return service.findAll(name,pageNum,pageSize);
     }
 
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/SowCountController.java

@@ -26,9 +26,9 @@ public class SowCountController {
 	public Result update(SowCount childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-    public Result findAll(){
-        return service.findAll();
-    }
+	public Result findAll(String name , Integer pageNum , Integer pageSize){
+		return service.findAll(name,pageNum,pageSize);
+	}
 
 @RequestMapping("/findAllById")
 public Result findAllById(Integer id){ return service.findAllById(id); }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/YvfeiCountController.java

@@ -26,9 +26,9 @@ public class YvfeiCountController {
 	public Result update(YvfeiCount childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-    public Result findAll(){
-        return service.findAll();
-    }
+	public Result findAll(String name , Integer pageNum , Integer pageSize){
+		return service.findAll(name,pageNum,pageSize);
+	}
 
 @RequestMapping("/findAllById")
 public Result findAllById(Integer id){ return service.findAllById(id); }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigFeedRepository.java

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MPigFeed;
+import com.huimv.production.domain.MSowAnimalHeatEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface MPigFeedRepository extends JpaRepository<MPigFeed, Integer>,JpaSpecificationExecutor<MPigFeed>{
     List findAllByLocationId(Integer locationId);
 
+    @Query(nativeQuery = true ,value = "select * from m_pig_feed where location_id like %?1% limit ?2 , ?3")
+    List<MPigFeed> findAll(String name , Integer startPage , Integer pageSize);
+
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/SowCountRepository.java

@@ -1,7 +1,15 @@
 package com.huimv.production.repo;
 
+import com.huimv.production.domain.MFeedDetailEntity;
 import com.huimv.production.domain.SowCount;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
-public interface SowCountRepository extends JpaRepository<SowCount, Integer>,JpaSpecificationExecutor<SowCount>{}
+import java.util.List;
+
+public interface SowCountRepository extends JpaRepository<SowCount, Integer>,JpaSpecificationExecutor<SowCount>{
+
+    @Query(nativeQuery = true ,value = "select * from sow_count where date like %?1% limit ?2 , ?3")
+    List<SowCount> findAll(String name , Integer startPage , Integer pageSize);
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/YvfeiCountRepository.java

@@ -1,7 +1,15 @@
 package com.huimv.production.repo;
 
+import com.huimv.production.domain.MFeedDetailEntity;
 import com.huimv.production.domain.YvfeiCount;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
-public interface YvfeiCountRepository extends JpaRepository<YvfeiCount, Integer>,JpaSpecificationExecutor<YvfeiCount>{}
+import java.util.List;
+
+public interface YvfeiCountRepository extends JpaRepository<YvfeiCount, Integer>,JpaSpecificationExecutor<YvfeiCount>{
+    @Query(nativeQuery = true ,value = "select * from yvfei_count where date like %?1% limit ?2 , ?3")
+    List<YvfeiCount> findAll(String name , Integer startPage , Integer pageSize);
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/IndexParameterService.java

@@ -21,5 +21,5 @@ public interface IndexParameterService {
     Result update(IndexParameterEntity parameterEntity);
 
     //Result findAll();
-    Result findAll(String name ,Integer pageNum , Integer pageSize);
+    Result findAll();
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigFeedService.java

@@ -15,5 +15,5 @@ public interface MPigFeedService  {
    Result update(MPigFeed entity);
 
    //查询
-   Result findAll();
+   Result findAll(String name ,Integer pageNum , Integer pageSize);
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/SowCountService.java

@@ -15,7 +15,7 @@ public interface SowCountService  {
    Result update(SowCount entity);
 
    //查询
-   Result findAll();
+   Result findAll(String name ,Integer pageNum , Integer pageSize);
 
    //根据id查找
    Result findAllById(Integer id);

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/YvfeiCountService.java

@@ -15,7 +15,7 @@ public interface YvfeiCountService  {
    Result update(YvfeiCount entity);
 
    //查询
-   Result findAll();
+   Result findAll(String name ,Integer pageNum , Integer pageSize);
 
    //根据id查找
    Result findAllById(Integer id);

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/IndexParameterServiceImpl.java

@@ -73,17 +73,12 @@ public class IndexParameterServiceImpl implements IndexParameterService {
 
     }
 
-    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
+    @Override
+    public Result findAll() {
         try {
-            Map map = new HashMap();
-            int size = parameterEntityRepository.findAll().size() ;
-            Integer startPage = (pageNum-1) * pageSize;
-            List<IndexParameterEntity> all = parameterEntityRepository.findAll(name,startPage,pageSize);
-            map.put("total",size);
-            map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
-            map.put("data",all);
-
-            return new Result(10000, ResultStatus.findSuccess,map);
+
+
+            return new Result(10000, ResultStatus.findSuccess,parameterEntityRepository.findAll());
         }catch (Exception e){
             return new Result(10001, ResultStatus.findFailed,null);
         }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigFeedServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MPigFeed;
+import com.huimv.production.domain.MPigWater;
 import com.huimv.production.repo.MPigFeedRepository;
 import com.huimv.production.result.Result;
 import com.huimv.production.result.ResultStatus;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MPigFeedService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class MPigFeedServiceImpl implements MPigFeedService {
@@ -58,12 +61,19 @@ public class MPigFeedServiceImpl implements MPigFeedService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MPigFeed> all = rep.findAll();
-			return new Result(10000, ResultStatus.findSuccess,all);
+			Map map = new HashMap();
+			Integer startPage = (pageNum-1) * pageSize;
+
+			int size = rep.findAll().size() ;
+			List<MPigFeed> all = rep.findAll(name,startPage,pageSize);
+			map.put("total",size);
+			map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+			map.put("data",all);
+			return new Result(10000,"查询成功",map);
 		}catch (Exception e){
-			return new Result(10001, ResultStatus.findFailed,null);
+			return new Result(10001,"查询失败",null);
 		}
 	}
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/SowCountServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.production.service.impl;
 
+import com.huimv.production.domain.MAnimalHeatWarningEntity;
 import com.huimv.production.domain.SowCount;
 import com.huimv.production.repo.SowCountRepository;
 import com.huimv.production.result.Result;
@@ -8,7 +9,9 @@ import com.huimv.production.service.SowCountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class SowCountServiceImpl implements SowCountService {
@@ -58,15 +61,23 @@ public class SowCountServiceImpl implements SowCountService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<SowCount> all = rep.findAll();
-			return new Result(10000, ResultStatus.findSuccess,all);
+			Map map = new HashMap();
+			int size = rep.findAll().size() ;
+			Integer startPage = (pageNum-1) * pageSize;
+			List<SowCount> all = rep.findAll(name,startPage,pageSize);
+			map.put("total",size);
+			map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+			map.put("data",all);
+
+			return new Result(10000, ResultStatus.findSuccess,map);
 		}catch (Exception e){
-			return new Result(10001, ResultStatus.findFailed,null);
+			return new Result(10001,ResultStatus.findFailed,null);
 		}
 	}
 
+
 	@Override
 	public Result findAllById(Integer id) {
 		try {

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/YvfeiCountServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.production.service.impl;
 
+import com.huimv.production.domain.MAnimalHeatWarningEntity;
 import com.huimv.production.domain.YvfeiCount;
 import com.huimv.production.repo.YvfeiCountRepository;
 import com.huimv.production.result.Result;
@@ -8,7 +9,9 @@ import com.huimv.production.service.YvfeiCountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class YvfeiCountServiceImpl implements YvfeiCountService {
@@ -58,15 +61,21 @@ public class YvfeiCountServiceImpl implements YvfeiCountService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<YvfeiCount> all = rep.findAll();
-			return new Result(10000, ResultStatus.findSuccess,all);
+			Map map = new HashMap();
+			int size = rep.findAll().size() ;
+			Integer startPage = (pageNum-1) * pageSize;
+			List<YvfeiCount> all = rep.findAll(name,startPage,pageSize);
+			map.put("total",size);
+			map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+			map.put("data",all);
+
+			return new Result(10000, ResultStatus.findSuccess,map);
 		}catch (Exception e){
-			return new Result(10001, ResultStatus.findFailed,null);
+			return new Result(10001,ResultStatus.findFailed,null);
 		}
 	}
-
 	@Override
 	public Result findAllById(Integer id) {
 		try {