Procházet zdrojové kódy

fix findall method

yangdi před 4 roky
rodič
revize
fcb81ce2f1
17 změnil soubory, kde provedl 92 přidání a 27 odebrání
  1. 6 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/BLaborRoomStateController.java
  2. 8 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/BaoyvCountController.java
  3. 6 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/IndexAllController.java
  4. 8 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/IndexBoardController.java
  5. 10 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/IndexParameterController.java
  6. 10 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MAnimalHeatWarningController.java
  7. 8 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MChildbirthProgressController.java
  8. 6 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MChildbirthRatioController.java
  9. 8 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MChildbirthTimesController.java
  10. 4 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MCleanTimesController.java
  11. 2 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MConceptionRatioController.java
  12. 4 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MElectricQuantityController.java
  13. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MFattenAreaController.java
  14. 3 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MIncubatorHeatController.java
  15. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MLaborRomStateController.java
  16. 3 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MLaborRoomHeatController.java
  17. 1 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigFeedController.java

+ 6 - 2
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);
+    }
 }

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

@@ -24,8 +24,15 @@ public class BaoyvCountController {
 	@RequestMapping("/update")
 	public Result update(BaoyvCount childcareEntity){ return service.update(childcareEntity); }
 
-	@RequestMapping("/findAll")
+	/*@RequestMapping("/findAll")
 	public Result findAll(){ return service.findAll(); }
+*/
+	@RequestMapping("/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); }

+ 6 - 1
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);
     }
 
 }

+ 8 - 2
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);
+   }
+
+
 }

+ 10 - 2
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);
+   }
+
+
+
+
 
 }

+ 10 - 2
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(){

+ 8 - 1
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);
     }
 
+
+
 }

+ 6 - 1
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);
     }
 
 }

+ 8 - 1
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);
     }
 
+
 }

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

@@ -25,7 +25,10 @@ public class MCleanTimesController {
 	@RequestMapping("/update")
 	public Result update(MCleanTimes 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);
+	}
 
 }

+ 2 - 3
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);
     }
-
 }

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

@@ -25,7 +25,9 @@ public class MElectricQuantityController {
 	@RequestMapping("/update")
 	public Result update(MElectricQuantity childcareEntity){ return service.update(childcareEntity); }
 
-	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
 
+	@RequestMapping("/findAll")
+	public Result findAll(String name , Integer pageNum , Integer pageSize){
+		return service.findAll(name,pageNum,pageSize);
+	}
 }

+ 3 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MFattenAreaController.java

@@ -26,7 +26,9 @@ public class MFattenAreaController {
 	public Result update(MFattenArea 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("/findAllBy")
 	public Result findAllBy(Integer locationId){ return service.findAllBy(locationId); }

+ 3 - 2
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);
     }
 
+
 }

+ 2 - 2
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);
     }
 
 }

+ 3 - 3
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);
     }
 
+
 }

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

@@ -29,3 +29,4 @@ public class MPigFeedController {
 	public Result findAll(){ return service.findAll(); }
 
 }
+//****************************