分页

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

@@ -31,7 +31,11 @@ public class BLaborRoomStateController {
     @RequestMapping("/update")
     public Result update(BLaborRoomStateEntity childcareEntity){ return childcareService.update(childcareEntity); }
 
-    @RequestMapping("/findAll")
-    public Result findAll(){ return childcareService.findAll(); }
+    /*@RequestMapping("/findAll")
+    public Result findAll(){ return childcareService.findAll(); }*/
 
+    @RequestMapping("/findAll")
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
+    }
 }

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

@@ -24,10 +24,12 @@ public class BaoyvCountController {
 	@RequestMapping("/update")
 	public Result update(BaoyvCount 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/IndexAllController.java

@@ -31,9 +31,14 @@ public class IndexAllController {
         return allService.update(allEntity);
     }
 
-    @RequestMapping("/findAll")
+   /* @RequestMapping("/findAll")
     public Result findAll(){
         return allService.findAll();
+    }*/
+
+    @RequestMapping("/findAll")
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return allService.findAll(name,pageNum,pageSize);
     }
 
 }

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

@@ -38,8 +38,14 @@ public class IndexBoardController {
         return boardService.update(BoardEntity);
     }
 
-    @RequestMapping("/findAll")
+   /* @RequestMapping("/findAll")
     public Result findAll(){
         return boardService.findAll();
-    }
+    }*/
+   @RequestMapping("/findAll")
+   public Result findAll(String name , Integer pageNum , Integer pageSize){
+       return boardService.findAll(name,pageNum,pageSize);
+   }
+
+
 }

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

@@ -38,9 +38,17 @@ public class IndexParameterController {
         return parameterService.update(parameterEntity);
     }
 
-    @RequestMapping("/findAll")
+   /* @RequestMapping("/findAll")
     public Result findAll(){
         return parameterService.findAll();
-    }
+    }*/
+   @RequestMapping("/findAll")
+   public Result findAll(String name , Integer pageNum , Integer pageSize){
+       return parameterService.findAll(name,pageNum,pageSize);
+   }
+
+
+
+
 
 }

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

@@ -40,10 +40,18 @@ public class MAnimalHeatWarningController {
         return childcareService.update(childcareEntity);
     }
 
-    @RequestMapping("/findAll")
+   /* @RequestMapping("/findAll")
     public Result findAll(){
         return childcareService.findAll();
-    }
+    }*/
+   @RequestMapping("/findAll")
+   public Result findAll(String name , Integer pageNum , Integer pageSize){
+       return childcareService.findAll(name,pageNum,pageSize);
+   }
+
+
+
+
 
     @RequestMapping("/findAllBy")
     public Result findAllBy(){

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

@@ -39,9 +39,16 @@ public class MChildbirthProgressController {
         return childcareService.update(childcareEntity);
     }
 
-    @RequestMapping("/findAll")
+    /*@RequestMapping("/findAll")
     public Result findAll(){
         return childcareService.findAll();
+    }*/
+
+    @RequestMapping("/findAll")
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
+
+
 }

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

@@ -38,10 +38,15 @@ public class MChildbirthRatioController {
     public Result update(MChildbirthRatioEntity childcareEntity){
         return childcareService.update(childcareEntity);
     }
-
+/*
     @RequestMapping("/findAll")
     public Result findAll(){
         return childcareService.findAll();
+    }*/
+
+    @RequestMapping("/findAll")
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
 }

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

@@ -39,9 +39,16 @@ public class MChildbirthTimesController {
         return childcareService.update(childcareEntity);
     }
 
-    @RequestMapping("/findAll")
+   /* @RequestMapping("/findAll")
     public Result findAll(){
         return childcareService.findAll();
+    }*/
+
+
+    @RequestMapping("/findAll")
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
+
 }

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

@@ -25,9 +25,10 @@ public class MCleanTimesController {
 	@RequestMapping("/update")
 	public Result update(MCleanTimes childcareEntity){ return service.update(childcareEntity); }
 
+
 	@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/MConceptionRatioController.java

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

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

@@ -27,7 +27,7 @@ public class MElectricQuantityController {
 
 	@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/MFattenAreaController.java

@@ -25,10 +25,11 @@ public class MFattenAreaController {
 	@RequestMapping("/update")
 	public Result update(MFattenArea childcareEntity){ return service.update(childcareEntity); }
 
-	@RequestMapping("/findAll")
-    public Result findAll(String name ,Integer pageNum , Integer pageSize){
-        return childcareService.findAll(name,pageNum,pageSize);
-    }
+
+	public Result findAll(String name , Integer pageNum , Integer pageSize){
+		return service.findAll(name,pageNum,pageSize);
+	}
+
 
 	@RequestMapping("/findAllBy")
 	public Result findAllBy(Integer locationId){ return service.findAllBy(locationId); }

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

@@ -40,8 +40,9 @@ public class MIncubatorHeatController {
     }
 
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
+
 }

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

@@ -40,8 +40,8 @@ public class MLaborRomStateController {
     }
 
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
 }

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

@@ -38,10 +38,10 @@ public class MLaborRoomHeatController {
     public Result update(MLaborRoomHeatEntity childcareEntity){
         return childcareService.update(childcareEntity);
     }
-
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
+
 }

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

@@ -31,3 +31,4 @@ public class MPigFeedController {
     }
 
 }
+//****************************

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

@@ -27,7 +27,7 @@ public class MSowPigpenHumidityController {
 
 	@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/repo/BaoyvCountRepository.java

@@ -9,5 +9,7 @@ import java.util.List;
 
 public interface BaoyvCountRepository extends JpaRepository<BaoyvCount, Integer>,JpaSpecificationExecutor<BaoyvCount>{
 
+    @Query(nativeQuery = true ,value = "select * from baoyv_count where  date  like %?1% limit ?2 , ?3")
+    List<BaoyvCount> findAll(String name ,Integer startPage , Integer pageSize);
 
 }

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

@@ -3,6 +3,7 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.IndexAllEntity;
 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;
 
@@ -11,5 +12,6 @@ public interface IndexAllEntityRepository extends JpaRepository<IndexAllEntity,
     IndexAllEntity findByDay(String day);
 
 //    List<IndexAllEntity
-
-}
+@Query(nativeQuery = true ,value = "select * from index_all where sow like %?1% limit ?2 , ?3")
+List<IndexAllEntity> findAll(String name ,Integer startPage , Integer pageSize);
+        }

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

@@ -3,7 +3,15 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.IndexBoardEntity;
 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 IndexBoardEntityRepository extends JpaRepository<IndexBoardEntity, Integer>, JpaSpecificationExecutor<IndexBoardEntity> {
 
+    @Query(nativeQuery = true ,value = "select * from index_board where name like %?1% limit ?2 , ?3")
+    List<IndexBoardEntity> findAll(String name , Integer startPage , Integer pageSize);
+
+
+
 }

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

@@ -3,7 +3,15 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.IndexParameterEntity;
 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 IndexParameterEntityRepository extends JpaRepository<IndexParameterEntity, Integer>, JpaSpecificationExecutor<IndexParameterEntity> {
 
+
+    @Query(nativeQuery = true ,value = "select * from index_parameter where name like %?1% limit ?2 , ?3")
+    List<IndexParameterEntity> findAll(String name , Integer startPage , Integer pageSize);
+
+
 }

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

@@ -3,7 +3,15 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MAnimalHeatWarningEntity;
 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 MAnimalHeatWarningEntityRepo extends JpaRepository<MAnimalHeatWarningEntity, Integer>, JpaSpecificationExecutor<MAnimalHeatWarningEntity> {
 
+    @Query(nativeQuery = true ,value = "select * from m_animal_heat_warning where location like %?1% limit ?2 , ?3")
+    List<MAnimalHeatWarningEntity> findAll(String name , Integer startPage , Integer pageSize);
+
+
+
 }

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

@@ -3,10 +3,17 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MChildbirthProgressEntity;
 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 MChildbirthProgressEntityRepo extends JpaRepository<MChildbirthProgressEntity, Integer>, JpaSpecificationExecutor<MChildbirthProgressEntity> {
     List findAllByRoomCode(String roomCode);
 
+
+    @Query(nativeQuery = true ,value = "select * from m_childbirth_progress where birth_date like %?1% limit ?2 , ?3")
+    List<MChildbirthProgressEntity> findAll(String name ,Integer startPage , Integer pageSize);
+
+
+
 }

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

@@ -3,7 +3,16 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MChildbirthRatioEntity;
 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 MChildbirthRatioEntityRepo extends JpaRepository<MChildbirthRatioEntity, Integer>, JpaSpecificationExecutor<MChildbirthRatioEntity> {
 
+    @Query(nativeQuery = true ,value = "select * from m_childbirth_ratio where year like %?1% limit ?2 , ?3")
+    List<MChildbirthRatioEntity> findAll(String name , Integer startPage , Integer pageSize);
+
+
+
+
 }

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

@@ -3,7 +3,14 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MChildbirthTimesEntity;
 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 MChildbirthTimesEntityRepo extends JpaRepository<MChildbirthTimesEntity, Integer>, JpaSpecificationExecutor<MChildbirthTimesEntity> {
 
+    @Query(nativeQuery = true ,value = "select * from m_childbirth_times where year like %?1% limit ?2 , ?3")
+    List<MChildbirthTimesEntity> findAll(String name , Integer startPage , Integer pageSize);
+
+
 }

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

@@ -3,10 +3,12 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MCleanTimes;
 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 MCleanTimesRepository extends JpaRepository<MCleanTimes, Integer>,JpaSpecificationExecutor<MCleanTimes>{
-
+    @Query(nativeQuery = true ,value = "select * from m_clean_times where location_id like %?1% limit ?2 , ?3")
+    List<MCleanTimes> findAll(String name ,Integer startPage , Integer pageSize);
     List findAllByLocationId(Integer locationId);
 }

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

@@ -1,9 +1,14 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MConceptionRatioEntity;
+import com.huimv.production.domain.MLaborRoomEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
-public interface MConceptionRatioEntityRepo extends JpaRepository<MConceptionRatioEntity, Integer>, JpaSpecificationExecutor<MConceptionRatioEntity> {
+import java.util.List;
 
+public interface MConceptionRatioEntityRepo extends JpaRepository<MConceptionRatioEntity, Integer>, JpaSpecificationExecutor<MConceptionRatioEntity> {
+    @Query(nativeQuery = true ,value = "select * from m_conception_ratio where year like %?1% limit ?2 , ?3")
+    List<MConceptionRatioEntity> findAll(String name , Integer startPage , Integer pageSize);
 }

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

@@ -3,10 +3,18 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MElectricQuantity;
 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 MElectricQuantityRepository extends JpaRepository<MElectricQuantity, Integer>,JpaSpecificationExecutor<MElectricQuantity>{
 
     List findAllByLocationId(Integer locationId);
+
+
+    @Query(nativeQuery = true ,value = "select * from m_electric_quantity where electric_quantity like %?1% limit ?2 , ?3")
+    List<MElectricQuantity> findAll(String name ,Integer startPage , Integer pageSize);
+
+
+
 }

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

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

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

@@ -3,10 +3,15 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MIncubatorHeatEntity;
 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 MIncubatorHeatEntityRepo extends JpaRepository<MIncubatorHeatEntity, Integer>, JpaSpecificationExecutor<MIncubatorHeatEntity> {
 
     List findAllByRoomCode(String roomCode);
+
+    @Query(nativeQuery = true ,value = "select * from m_incubator_heat where room_code like %?1% limit ?2 , ?3")
+    List<MIncubatorHeatEntity> findAll(String name ,Integer startPage , Integer pageSize);
+
 }

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

@@ -3,7 +3,12 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MLaborRomStateEntity;
 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 MLaborRomStateEntityRepo extends JpaRepository<MLaborRomStateEntity, Integer>, JpaSpecificationExecutor<MLaborRomStateEntity> {
+    @Query(nativeQuery = true ,value = "select * from m_labor_rom_state where room_state_name like %?1% limit ?2 , ?3")
+    List<MLaborRomStateEntity> findAll(String name , Integer startPage , Integer pageSize);
 
 }

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

@@ -3,10 +3,15 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MLaborRoomHeatEntity;
 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 MLaborRoomHeatEntityRepo extends JpaRepository<MLaborRoomHeatEntity, Integer>, JpaSpecificationExecutor<MLaborRoomHeatEntity> {
 
     List<MLaborRoomHeatEntity> findAllByRoomCode(String roomCode);
+
+    @Query(nativeQuery = true ,value = "select * from m_labor_room_heat where room_code like %?1% limit ?2 , ?3")
+    List<MLaborRoomHeatEntity> findAll(String name ,Integer startPage , Integer pageSize);
+
 }

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

@@ -3,7 +3,17 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.BLaborRoomStateEntity;
 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 MLaborRoomStateEntityRepo extends JpaRepository<BLaborRoomStateEntity, Integer>, JpaSpecificationExecutor<BLaborRoomStateEntity> {
+    @Query(nativeQuery = true ,value = "select * from b_labor_room_state where state_name like %?1% limit ?2 , ?3")
+    List<BLaborRoomStateEntity> findAll(String name , Integer startPage , Integer pageSize);
+
+
+
+
+
 
 }

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

@@ -20,6 +20,7 @@ public interface BLaborRoomStateService {
 
     Result update(BLaborRoomStateEntity fattenEntity);
 
-    Result findAll();
+   // Result findAll();
+   Result findAll(String name ,Integer pageNum , Integer pageSize);
 
 }

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

@@ -15,7 +15,10 @@ public interface BaoyvCountService  {
    Result update(BaoyvCount entity);
 
    //查询
-   Result findAll();
+  // 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/IndexAllService.java

@@ -15,5 +15,6 @@ public interface IndexAllService {
 
     Result update(IndexAllEntity allEntity);
 
-    Result findAll();
+    //Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 }

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

@@ -17,5 +17,7 @@ public interface IndexBoardService {
 
     Result update(IndexBoardEntity boardEntity);
 
-    Result findAll();
+    //Result findAll();
+
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 }

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

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

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

@@ -21,7 +21,9 @@ public interface MAnimalHeatWarningService {
 
     Result update(MAnimalHeatWarningEntity fattenEntity);
 
-    Result findAll();
+   // Result findAll();
+
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllBy();
 }

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

@@ -20,6 +20,7 @@ public interface MChildbirthProgressService {
 
     Result update(MChildbirthProgressEntity fattenEntity);
 
-    Result findAll();
+    //Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
 }

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

@@ -20,6 +20,7 @@ public interface MChildbirthRatioService {
 
     Result update(MChildbirthRatioEntity fattenEntity);
 
-    Result findAll();
+   // Result findAll();
 
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 }

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

@@ -19,6 +19,6 @@ public interface MChildbirthTimesService {
 
     Result update(MChildbirthTimesEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
 }

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

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

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

@@ -20,6 +20,7 @@ public interface MConceptionRatioService {
 
     Result update(MConceptionRatioEntity fattenEntity);
 
-    Result findAll();
 
+
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 }

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

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

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

@@ -15,7 +15,7 @@ public interface MFattenAreaService  {
    Result update(MFattenArea entity);
 
    //查询
-   Result findAll();
+   Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllBy(Integer locationId);
 }

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

@@ -20,6 +20,6 @@ public interface MIncubatorHeatService {
 
     Result update(MIncubatorHeatEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
 }

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

@@ -20,6 +20,6 @@ public interface MLaborRomStateService {
 
     Result update(MLaborRomStateEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
 }

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

@@ -20,6 +20,6 @@ public interface MLaborRoomHeatService {
 
     Result update(MLaborRoomHeatEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
 }

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

@@ -1,8 +1,8 @@
 package com.huimv.production.service;
 
-import com.huimv.production.domain.MLaborRomStateEntity;
-import com.huimv.production.domain.MSowEntity;
-import com.huimv.production.result.Result;
+        import com.huimv.production.domain.MLaborRomStateEntity;
+        import com.huimv.production.domain.MSowEntity;
+        import com.huimv.production.result.Result;
 
 /**
  * @Project : huimv.shiwan

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

@@ -3,11 +3,14 @@ package com.huimv.production.service.impl;
 import com.huimv.production.domain.BLaborRoomStateEntity;
 import com.huimv.production.repo.MLaborRoomStateEntityRepo;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.BLaborRoomStateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -63,7 +66,7 @@ public class BLaborRoomStateServiceImpl implements BLaborRoomStateService {
         }
     }
 
-    @Override
+   /* @Override
     public Result findAll() {
         try {
             List<BLaborRoomStateEntity> all = childcareEntityRepo.findAll();
@@ -71,6 +74,27 @@ public class BLaborRoomStateServiceImpl implements BLaborRoomStateService {
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }
+    }*/
+
+    @Override
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
+        try {
+            Map map = new HashMap();
+            int size = childcareEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<BLaborRoomStateEntity> all = childcareEntityRepo.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);
+        }
     }
+
+
+
+
     
 }

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

@@ -8,7 +8,9 @@ import com.huimv.production.service.BaoyvCountService;
 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 BaoyvCountServiceImpl implements BaoyvCountService {
@@ -57,7 +59,7 @@ public class BaoyvCountServiceImpl implements BaoyvCountService {
 		}
 	}
 
-	@Override
+	/*@Override
 	public Result findAll() {
 		try {
 			List<BaoyvCount> all = rep.findAll();
@@ -65,8 +67,28 @@ public class BaoyvCountServiceImpl implements BaoyvCountService {
 		}catch (Exception e){
 			return new Result(10001, ResultStatus.findFailed,null);
 		}
+	}*/
+	@Override
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
+		try {
+			Map map = new HashMap();
+			int size = rep.findAll().size() ;
+			Integer startPage = (pageNum-1) * pageSize;
+			List<BaoyvCount> 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);
+		}
 	}
 
+
+
+
+
 	@Override
 	public Result findAllById(Integer id) {
 		try {

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

@@ -5,11 +5,15 @@ import cn.hutool.core.date.DateUtil;
 import com.huimv.production.domain.IndexAllEntity;
 import com.huimv.production.repo.IndexAllEntityRepository;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.IndexAllService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -44,11 +48,25 @@ public class IndexAllServiceImpl  implements IndexAllService {
         repository.save(allEntity);
         return new Result(10000,"修改成功");
     }
-
+/*
     @Override
     public Result findAll() {
-        repository.findAll();
+        repository.findAll();*/
+@Override
+public Result findAll(String name ,Integer pageNum , Integer pageSize) {
+    try {
+        Map map = new HashMap();
+        int size = repository.findAll().size();
+        Integer startPage = (pageNum - 1) * pageSize;
+        List<IndexAllEntity> all = repository.findAll(name, startPage, pageSize);
+        map.put("total", size);
+        map.put("totalPageNum", (size + pageSize - 1) / pageSize);
+        map.put("data", all);
 
-        return null;
+        return new Result(10000, ResultStatus.findSuccess, map);
+    } catch (Exception e) {
+        return new Result(10001, ResultStatus.findFailed, null);
     }
 }
+
+}

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

@@ -4,13 +4,12 @@ import com.huimv.production.domain.IndexBoardEntity;
 import com.huimv.production.domain.IndexParameterEntity;
 import com.huimv.production.repo.IndexBoardEntityRepository;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.IndexBoardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * @Project : huimv.shiwan
@@ -68,7 +67,28 @@ public class IndexBoardServiceImpl implements IndexBoardService {
         }
     }
 
+
     @Override
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
+        try {
+            Map map = new HashMap();
+            int size = boardEntityRepository.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<IndexBoardEntity> all = boardEntityRepository.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);
+        }
+    }
+
+
+
+
+   /* @Override
     public Result findAll() {
         try {
             List<IndexBoardEntity> all = boardEntityRepository.findAll();
@@ -76,5 +96,5 @@ public class IndexBoardServiceImpl implements IndexBoardService {
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }
-    }
+    }*/
 }

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

@@ -3,12 +3,15 @@ package com.huimv.production.service.impl;
 import com.huimv.production.domain.IndexParameterEntity;
 import com.huimv.production.repo.IndexParameterEntityRepository;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.IndexParameterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -70,7 +73,26 @@ public class IndexParameterServiceImpl implements IndexParameterService {
 
     }
 
-    @Override
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
+        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);
+        }catch (Exception e){
+            return new Result(10001, ResultStatus.findFailed,null);
+        }
+    }
+
+
+
+
+  /*  @Override
     public Result findAll() {
         try {
             List<IndexParameterEntity> all = parameterEntityRepository.findAll();
@@ -79,5 +101,5 @@ public class IndexParameterServiceImpl implements IndexParameterService {
             return new Result(10001,"查询失败",null);
         }
 
-    }
+    }*/
 }

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

@@ -69,7 +69,34 @@ public class MAnimalHeatWarningServiceImpl implements MAnimalHeatWarningService
         }
     }
 
+
+
+
     @Override
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
+        try {
+            Map map = new HashMap();
+            int size = fattenEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MAnimalHeatWarningEntity> all = fattenEntityRepo.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);
+        }
+    }
+
+
+
+
+
+
+
+
+    /* @Override
     public Result findAll() {
         try {
             List<MAnimalHeatWarningEntity> all = fattenEntityRepo.findAll();
@@ -78,7 +105,7 @@ public class MAnimalHeatWarningServiceImpl implements MAnimalHeatWarningService
             return new Result(10001,"查询失败",null);
         }
     }
-
+*/
     @Override
     public Result findAllBy() {
 

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

@@ -4,12 +4,15 @@ import com.huimv.production.domain.MChildbirthProgressEntity;
 import com.huimv.production.repo.MChildbirthProgressEntityRepo;
 import com.huimv.production.repo.MChildbirthProgressEntityRepo;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.MChildbirthProgressService;
 import com.huimv.production.service.MSowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -65,7 +68,29 @@ public class MChildbirthProgressServiceImpl implements MChildbirthProgressServic
         }
     }
 
+
     @Override
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
+        try {
+            Map map = new HashMap();
+            int size = childcareEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MChildbirthProgressEntity> all = childcareEntityRepo.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);
+        }
+    }
+
+
+
+
+
+   /* @Override
     public Result findAll() {
         try {
             List<MChildbirthProgressEntity> all = childcareEntityRepo.findAll();
@@ -73,6 +98,6 @@ public class MChildbirthProgressServiceImpl implements MChildbirthProgressServic
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }
-    }
+    }*/
     
 }

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

@@ -4,12 +4,15 @@ import com.huimv.production.domain.MChildbirthRatioEntity;
 import com.huimv.production.repo.MChildbirthRatioEntityRepo;
 import com.huimv.production.repo.MChildbirthRatioEntityRepo;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.MChildbirthRatioService;
 import com.huimv.production.service.MSowStateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -66,6 +69,26 @@ public class MChildbirthRatioServiceImpl implements MChildbirthRatioService {
     }
 
     @Override
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
+        try {
+            Map map = new HashMap();
+            int size = childcareEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MChildbirthRatioEntity> all = childcareEntityRepo.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);
+        }
+    }
+
+
+
+
+   /* @Override
     public Result findAll() {
         try {
             List<MChildbirthRatioEntity> all = childcareEntityRepo.findAll();
@@ -73,6 +96,6 @@ public class MChildbirthRatioServiceImpl implements MChildbirthRatioService {
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }
-    }
+    }*/
     
 }

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

@@ -3,12 +3,15 @@ package com.huimv.production.service.impl;
 import com.huimv.production.domain.MChildbirthTimesEntity;
 import com.huimv.production.repo.MChildbirthTimesEntityRepo;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.MChildbirthTimesService;
 import com.huimv.production.service.MSowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -65,6 +68,24 @@ public class MChildbirthTimesServiceImpl implements MChildbirthTimesService {
     }
 
     @Override
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
+        try {
+            Map map = new HashMap();
+            int size = childcareEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MChildbirthTimesEntity> all = childcareEntityRepo.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);
+        }
+    }
+
+
+   /* @Override
     public Result findAll() {
         try {
             List<MChildbirthTimesEntity> all = childcareEntityRepo.findAll();
@@ -72,6 +93,6 @@ public class MChildbirthTimesServiceImpl implements MChildbirthTimesService {
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }
-    }
+    }*/
     
 }

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

@@ -8,7 +8,9 @@ import com.huimv.production.service.MCleanTimesService;
 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 MCleanTimesServiceImpl implements MCleanTimesService {
@@ -57,13 +59,21 @@ public class MCleanTimesServiceImpl implements MCleanTimesService {
 		}
 	}
 
+
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MCleanTimes> 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<MCleanTimes> 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);
 		}
 	}
 }

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

@@ -4,12 +4,15 @@ import com.huimv.production.domain.MConceptionRatioEntity;
 import com.huimv.production.repo.MConceptionRatioEntityRepo;
 import com.huimv.production.repo.MConceptionRatioEntityRepo;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.MConceptionRatioService;
 import com.huimv.production.service.MSowStateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -66,12 +69,19 @@ public class MConceptionRatioServiceImpl implements MConceptionRatioService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MConceptionRatioEntity> all = childcareEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            int size = childcareEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MConceptionRatioEntity> all = childcareEntityRepo.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,"查询失败",null);
+            return new Result(10001,ResultStatus.findFailed,null);
         }
     }
     

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

@@ -8,7 +8,9 @@ import com.huimv.production.service.MElectricQuantityService;
 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 MElectricQuantityServiceImpl implements MElectricQuantityService {
@@ -57,13 +59,22 @@ public class MElectricQuantityServiceImpl implements MElectricQuantityService {
 		}
 	}
 
+
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MElectricQuantity> 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<MElectricQuantity> 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);
 		}
 	}
+
 }

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

@@ -60,13 +60,21 @@ public class MFattenAreaServiceImpl implements MFattenAreaService {
 		}
 	}
 
+
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MFattenArea> 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<MFattenArea> 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);
 		}
 	}
 

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

@@ -3,12 +3,15 @@ package com.huimv.production.service.impl;
 import com.huimv.production.domain.MIncubatorHeatEntity;
 import com.huimv.production.repo.MIncubatorHeatEntityRepo;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.MIncubatorHeatService;
 import com.huimv.production.service.MSowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -64,13 +67,21 @@ public class MIncubatorHeaServiceImpl implements MIncubatorHeatService {
         }
     }
 
+
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MIncubatorHeatEntity> all = childcareEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            int size = childcareEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MIncubatorHeatEntity> all = childcareEntityRepo.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,"查询失败",null);
+            return new Result(10001,ResultStatus.findFailed,null);
         }
     }
     

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

@@ -4,6 +4,7 @@ import com.huimv.production.domain.MLaborRomStateEntity;
 import com.huimv.production.repo.MLaborRomStateEntityRepo;
 import com.huimv.production.repo.MLaborRomStateEntityRepo;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.MLaborRomStateService;
 import com.huimv.production.service.MTransferChildcareService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,13 +69,19 @@ public class MLaborRomServiceImpl implements MLaborRomStateService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MLaborRomStateEntity> all = childcareEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            int size = childcareEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MLaborRomStateEntity> all = childcareEntityRepo.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,"查询失败",null);
+            return new Result(10001,ResultStatus.findFailed,null);
         }
     }
-    
 }

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

@@ -4,12 +4,15 @@ import com.huimv.production.domain.MLaborRoomHeatEntity;
 import com.huimv.production.repo.MLaborRoomHeatEntityRepo;
 import com.huimv.production.repo.MLaborRoomHeatEntityRepo;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.MLaborRoomHeatService;
 import com.huimv.production.service.MSowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -66,13 +69,21 @@ public class MLaborRoomHeatServiceImpl implements MLaborRoomHeatService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MLaborRoomHeatEntity> all = childcareEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            int size = childcareEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MLaborRoomHeatEntity> all = childcareEntityRepo.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,"查询失败",null);
+            return new Result(10001,ResultStatus.findFailed,null);
         }
     }
-    
+
+
 }