523096025 4 years ago
parent
commit
4a8acbc8cc
89 changed files with 521 additions and 143 deletions
  1. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/BaoyvCountController.java
  2. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MCleanTimesController.java
  3. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MElectricQuantityController.java
  4. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MFattenAreaController.java
  5. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigFeedController.java
  6. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigPigpenHumidityController.java
  7. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigPigpenTemperatureController.java
  8. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigWaterController.java
  9. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigletHealthCountController.java
  10. 2 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigletLiveController.java
  11. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigletLiveRatioController.java
  12. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPlanImmunityController.java
  13. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPurchasePlanController.java
  14. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MResstrusRatioController.java
  15. 4 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSaleDayController.java
  16. 4 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSaleDetailController.java
  17. 4 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSaleMonthController.java
  18. 4 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSaleYearController.java
  19. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSmartCountController.java
  20. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSmartWeightController.java
  21. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowAblactationController.java
  22. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowAnimalHeatController.java
  23. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowAreaController.java
  24. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowHeatController.java
  25. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPigpenHumidityController.java
  26. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPigpenTemperatureController.java
  27. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowWaterController.java
  28. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/SowCountController.java
  29. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/YvfeiCountController.java
  30. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigPigpenHumidityRepository.java
  31. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigPigpenTemperatureRepository.java
  32. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigWaterRepository.java
  33. 7 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigletHealthCountEntityRepo.java
  34. 6 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigletLiveEntityRepo.java
  35. 6 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigletLiveRatioEntityRepo.java
  36. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPlanImmunityEntityRepo.java
  37. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPurchasePlanEntityRepo.java
  38. 6 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MReestrusRatioEntityRepo.java
  39. 9 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleDayRepository.java
  40. 9 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleDetailRepository.java
  41. 9 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleMonthRepository.java
  42. 9 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleYearRepository.java
  43. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSmartCountRepository.java
  44. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSmartWeightRepository.java
  45. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAblactationEntityRepo.java
  46. 4 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAnimalHeatEntityRepo.java
  47. 9 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAreaRepository.java
  48. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigPigpenHumidityService.java
  49. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigPigpenTemperatureService.java
  50. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigWaterService.java
  51. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigletHealthCountService.java
  52. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigletLiveRatioService.java
  53. 1 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigletLiveService.java
  54. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPlanImmunityService.java
  55. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPurchasePlanService.java
  56. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MResstrusRatioService.java
  57. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleDayService.java
  58. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleDetailService.java
  59. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleMonthService.java
  60. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleYearService.java
  61. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSmartCountService.java
  62. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSmartWeightService.java
  63. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowAblactationService.java
  64. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowAnimalHeatService.java
  65. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowAreaService.java
  66. 14 4
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigPigpenHumidityServiceImpl.java
  67. 14 4
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigPigpenTemperatureServiceImpl.java
  68. 14 4
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigWaterServiceImpl.java
  69. 13 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigletHealthCountServiceImpl.java
  70. 13 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigletLiveRatioServiceImpl.java
  71. 13 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigletLiveServiceImpl.java
  72. 11 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPlanImmunityServiceImpl.java
  73. 11 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPurchasePlanServiceImpl.java
  74. 13 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MResstrusRatioServiceImpl.java
  75. 14 4
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSaleDayServiceImpl.java
  76. 14 4
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSaleDetailServiceImpl.java
  77. 14 4
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSaleMonthServiceImpl.java
  78. 14 4
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSaleYearServiceImpl.java
  79. 14 4
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSmartCountServiceImpl.java
  80. 14 4
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSmartWeightServiceImpl.java
  81. 11 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowAblactationServiceImpl.java
  82. 11 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowAnimalHeatServiceImpl.java
  83. 12 8
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowAreaServiceImpl.java
  84. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowServiceImpl.java
  85. 32 0
      huimv-ql-farm/huimv-ql-production/src/main/resources/application-haiyan.yml
  86. 32 0
      huimv-ql-farm/huimv-ql-production/src/main/resources/application-wuyi.yml
  87. 0 0
      huimv-ql-farm/huimv-ql-production/src/main/resources/application-ycg.yml
  88. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/resources/application.properties
  89. 4 4
      huimv-ql-farm/huimv-ql-video/src/main/java/com/huimv/video/controller/CameraInfoController.java

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

@@ -25,7 +25,9 @@ public class BaoyvCountController {
 	public Result update(BaoyvCount childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+    public Result findAll(){
+        return service.findAll();
+    }
 
 	@RequestMapping("/findAllById")
 	public Result findAllById(Integer id){ return service.findAllById(id); }

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

@@ -26,6 +26,8 @@ public class MCleanTimesController {
 	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 childcareService.findAll(name,pageNum,pageSize);
+    }
 
 }

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

@@ -26,6 +26,8 @@ public class MElectricQuantityController {
 	public Result update(MElectricQuantity childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.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 childcareService.findAll(name,pageNum,pageSize);
+    }
 
 	@RequestMapping("/findAllBy")
 	public Result findAllBy(Integer locationId){ return service.findAllBy(locationId); }

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

@@ -26,6 +26,8 @@ public class MPigFeedController {
 	public Result update(MPigFeed childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
+    }
 
 }

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

@@ -26,6 +26,8 @@ public class MPigPigpenHumidityController {
 	public Result update(MPigPigpenHumidity 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);
+	}
 
 }

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

@@ -26,6 +26,8 @@ public class MPigPigpenTemperatureController {
 	public Result update(MPigPigpenTemperature 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);
+	}
 
 }

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

@@ -26,6 +26,8 @@ public class MPigWaterController {
 	public Result update(MPigWater 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 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigletHealthCountController.java

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

+ 2 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigletLiveController.java

@@ -40,8 +40,7 @@ public class MPigletLiveController {
     }
 
     @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/MPigletLiveRatioController.java

@@ -40,8 +40,8 @@ public class MPigletLiveRatioController {
     }
 
     @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/MPlanImmunityController.java

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

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

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

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

@@ -39,8 +39,8 @@ public class MResstrusRatioController {
     }
 
     @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/MSaleDayController.java

@@ -25,7 +25,9 @@ public Result add(Integer[] ids){ return service.remove(ids); }
 @RequestMapping("/update")
 public Result update(MSaleDay 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);
+    }
 
 }

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

@@ -25,7 +25,9 @@ public Result add(Integer[] ids){ return service.remove(ids); }
 @RequestMapping("/update")
 public Result update(MSaleDetail 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);
+    }
 
 }

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

@@ -25,7 +25,9 @@ public Result add(Integer[] ids){ return service.remove(ids); }
 @RequestMapping("/update")
 public Result update(MSaleMonth 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);
+    }
 
 }

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

@@ -25,7 +25,9 @@ public Result add(Integer[] ids){ return service.remove(ids); }
 @RequestMapping("/update")
 public Result update(MSaleYear 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/MSmartCountController.java

@@ -26,6 +26,8 @@ public class MSmartCountController {
 	public Result update(MSmartCount 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);
+    }
 
 }

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

@@ -26,6 +26,8 @@ public class MSmartWeightController {
 	public Result update(MSmartWeight 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 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowAblactationController.java

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

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

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

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

@@ -26,7 +26,9 @@ public class MSowAreaController {
 	public Result update(MSowArea 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 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowHeatController.java

@@ -26,7 +26,9 @@ public class MSowHeatController {
 	public Result update(MSowHeat childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
+    }
 
 	@RequestMapping("/findAllBy")
 	public Result findAllBy(String sowId){ return service.findAllBy(sowId); }

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

@@ -26,6 +26,8 @@ public class MSowPigpenHumidityController {
 	public Result update(MSowPigpenHumidity childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
+    }
 
 }

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

@@ -26,6 +26,8 @@ public class MSowPigpenTemperatureController {
 	public Result update(MSowPigpenTemperature childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
+    }
 
 }

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

@@ -26,6 +26,8 @@ public class MSowWaterController {
 	public Result update(MSowWater childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
+    }
 
 }

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

@@ -26,7 +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(){
+        return service.findAll();
+    }
 
 @RequestMapping("/findAllById")
 public Result findAllById(Integer id){ return service.findAllById(id); }

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

@@ -26,7 +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(){
+        return service.findAll();
+    }
 
 @RequestMapping("/findAllById")
 public Result findAllById(Integer id){ return service.findAllById(id); }

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigPigpenHumidityRepository.java

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

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigPigpenTemperatureRepository.java

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

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigWaterRepository.java

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

+ 7 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigletHealthCountEntityRepo.java

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

+ 6 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigletLiveEntityRepo.java

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

+ 6 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigletLiveRatioEntityRepo.java

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

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPlanImmunityEntityRepo.java

@@ -1,13 +1,18 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MPlanImmunityEntity;
+import com.huimv.production.domain.MSowEntity;
 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 MPlanImmunityEntityRepo extends JpaRepository<MPlanImmunityEntity, Integer>, JpaSpecificationExecutor<MPlanImmunityEntity> {
 
+    @Query(nativeQuery = true ,value = "select * from m_plan_immunity where location like %?1% limit ?2 , ?3")
+    List<MPlanImmunityEntity> findAll(String name , Integer startPage , Integer pageSize);
+
 
     List findAllByState(Integer state);
 

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPurchasePlanEntityRepo.java

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

+ 6 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MReestrusRatioEntityRepo.java

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

+ 9 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleDayRepository.java

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

+ 9 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleDetailRepository.java

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

+ 9 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleMonthRepository.java

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

+ 9 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleYearRepository.java

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

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSmartCountRepository.java

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

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSmartWeightRepository.java

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

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAblactationEntityRepo.java

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

+ 4 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAnimalHeatEntityRepo.java

@@ -1,6 +1,7 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MSowAnimalHeatEntity;
+import com.huimv.production.domain.MSowEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -13,4 +14,7 @@ public interface MSowAnimalHeatEntityRepo extends JpaRepository<MSowAnimalHeatEn
 
     @Query(nativeQuery = true,value = "SELECT AVG(heat), measure_time FROM `m_sow_animal_heat` GROUP BY measure_time")
     List<List> findAllBy();
+
+    @Query(nativeQuery = true ,value = "select * from m_sow_animal_heat where location_id like %?1% limit ?2 , ?3")
+    List<MSowAnimalHeatEntity> findAll(String name , Integer startPage , Integer pageSize);
 }

+ 9 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAreaRepository.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigPigpenHumidityService.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigPigpenTemperatureService.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigWaterService.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigletHealthCountService.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigletLiveRatioService.java

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

+ 1 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigletLiveService.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPlanImmunityService.java

@@ -19,7 +19,7 @@ public interface MPlanImmunityService {
 
     Result update(MPlanImmunityEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllBy();
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPurchasePlanService.java

@@ -21,7 +21,7 @@ public interface MPurchasePlanService {
 
     Result update(MPurchasePlanEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllBy();
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MResstrusRatioService.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleDayService.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleDetailService.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleMonthService.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleYearService.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSmartCountService.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSmartWeightService.java

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

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowAblactationService.java

@@ -21,7 +21,7 @@ public interface MSowAblactationService {
 
     Result update(MSowAblactationEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllBy();
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowAnimalHeatService.java

@@ -20,7 +20,7 @@ public interface MSowAnimalHeatService {
 
     Result update(MSowAnimalHeatEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllById(String locationId);
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowAreaService.java

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

+ 14 - 4
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigPigpenHumidityServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MPigPigpenHumidity;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MPigPigpenHumidityRepository;
 import com.huimv.production.result.Result;
 import com.huimv.production.result.ResultStatus;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MPigPigpenHumidityService;
 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 MPigPigpenHumidityServiceImpl implements MPigPigpenHumidityService {
@@ -58,12 +61,19 @@ public class MPigPigpenHumidityServiceImpl implements MPigPigpenHumidityService
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MPigPigpenHumidity> 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<MPigPigpenHumidity> 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);
 		}
 	}
 }

+ 14 - 4
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigPigpenTemperatureServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MPigPigpenTemperature;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MPigPigpenTemperatureRepository;
 import com.huimv.production.result.Result;
 import com.huimv.production.result.ResultStatus;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MPigPigpenTemperatureService;
 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 MPigPigpenTemperatureServiceImpl implements MPigPigpenTemperatureService {
@@ -58,12 +61,19 @@ public class MPigPigpenTemperatureServiceImpl implements MPigPigpenTemperatureSe
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MPigPigpenTemperature> 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<MPigPigpenTemperature> 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);
 		}
 	}
 }

+ 14 - 4
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigWaterServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MPigWater;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MPigWaterRepository;
 import com.huimv.production.result.Result;
 import com.huimv.production.result.ResultStatus;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MPigWaterService;
 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 MPigWaterServiceImpl implements MPigWaterService {
@@ -58,12 +61,19 @@ public class MPigWaterServiceImpl implements MPigWaterService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MPigWater> 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<MPigWater> 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);
 		}
 	}
 }

+ 13 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigletHealthCountServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MPigletHealthCountEntity;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MPigletHealthCountEntityRepo;
 import com.huimv.production.repo.MPigletHealthCountEntityRepo;
 import com.huimv.production.result.Result;
@@ -9,7 +10,9 @@ 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,10 +69,17 @@ public class MPigletHealthCountServiceImpl implements MPigletHealthCountService
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MPigletHealthCountEntity> all = childcareEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            Integer startPage = (pageNum-1) * pageSize;
+
+            int size = childcareEntityRepo.findAll().size() ;
+            List<MPigletHealthCountEntity> 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,"查询成功",map);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }

+ 13 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigletLiveRatioServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MPigletLiveRatioEntity;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MPigletLiveRatioEntityRepo;
 import com.huimv.production.repo.MPigletLiveRatioEntityRepo;
 import com.huimv.production.result.Result;
@@ -9,7 +10,9 @@ 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,10 +69,17 @@ public class MPigletLiveRatioServiceImpl implements MPigletLiveRatioService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MPigletLiveRatioEntity> all = childcareEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            Integer startPage = (pageNum-1) * pageSize;
+
+            int size = childcareEntityRepo.findAll().size() ;
+            List<MPigletLiveRatioEntity> 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,"查询成功",map);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }

+ 13 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigletLiveServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MPigletLiveEntity;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MPigletLiveEntityRepo;
 import com.huimv.production.repo.MPigletLiveEntityRepo;
 import com.huimv.production.result.Result;
@@ -9,7 +10,9 @@ 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,10 +69,17 @@ public class MPigletLiveServiceImpl implements MPigletLiveService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MPigletLiveEntity> all = childcareEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            Integer startPage = (pageNum-1) * pageSize;
+
+            int size = childcareEntityRepo.findAll().size() ;
+            List<MPigletLiveEntity> 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,"查询成功",map);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }

+ 11 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPlanImmunityServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MPlanImmunityEntity;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MPlanImmunityEntityRepo;
 import com.huimv.production.repo.MPlanImmunityEntityRepo;
 import com.huimv.production.result.Result;
@@ -68,10 +69,17 @@ public class MPlanImmunityServiceImpl implements MPlanImmunityService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MPlanImmunityEntity> all = fattenEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            Integer startPage = (pageNum-1) * pageSize;
+
+            int size = fattenEntityRepo.findAll().size() ;
+            List<MPlanImmunityEntity> 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,"查询成功",map);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }

+ 11 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPurchasePlanServiceImpl.java

@@ -2,6 +2,7 @@ package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MPlanImmunityEntity;
 import com.huimv.production.domain.MPurchasePlanEntity;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MPurchasePlanEntityRepo;
 import com.huimv.production.repo.MPurchasePlanEntityRepo;
 import com.huimv.production.result.Result;
@@ -69,10 +70,17 @@ public class MPurchasePlanServiceImpl implements MPurchasePlanService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MPurchasePlanEntity> all = fattenEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            Integer startPage = (pageNum-1) * pageSize;
+
+            int size = fattenEntityRepo.findAll().size() ;
+            List<MPurchasePlanEntity> 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,"查询成功",map);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }

+ 13 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MResstrusRatioServiceImpl.java

@@ -1,13 +1,16 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MReestrusRatioEntity;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MReestrusRatioEntityRepo;
 import com.huimv.production.result.Result;
 import com.huimv.production.service.MResstrusRatioService;
 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,10 +67,17 @@ public class MResstrusRatioServiceImpl implements MResstrusRatioService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MReestrusRatioEntity> all = childcareEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            Integer startPage = (pageNum-1) * pageSize;
+
+            int size = childcareEntityRepo.findAll().size() ;
+            List<MReestrusRatioEntity> 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,"查询成功",map);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }

+ 14 - 4
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSaleDayServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MSaleDay;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MSaleDayRepository;
 import com.huimv.production.result.Result;
 import com.huimv.production.result.ResultStatus;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MSaleDayService;
 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 MSaleDayServiceImpl implements MSaleDayService {
@@ -58,12 +61,19 @@ public class MSaleDayServiceImpl implements MSaleDayService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MSaleDay> 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<MSaleDay> 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);
 		}
 	}
 }

+ 14 - 4
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSaleDetailServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MSaleDetail;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MSaleDetailRepository;
 import com.huimv.production.result.Result;
 import com.huimv.production.result.ResultStatus;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MSaleDetailService;
 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 MSaleDetailServiceImpl implements MSaleDetailService {
@@ -58,12 +61,19 @@ public class MSaleDetailServiceImpl implements MSaleDetailService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MSaleDetail> 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<MSaleDetail> 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);
 		}
 	}
 }

+ 14 - 4
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSaleMonthServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MSaleMonth;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MSaleMonthRepository;
 import com.huimv.production.result.Result;
 import com.huimv.production.result.ResultStatus;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MSaleMonthService;
 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 MSaleMonthServiceImpl implements MSaleMonthService {
@@ -58,12 +61,19 @@ public class MSaleMonthServiceImpl implements MSaleMonthService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MSaleMonth> 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<MSaleMonth> 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);
 		}
 	}
 }

+ 14 - 4
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSaleYearServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MSaleYear;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MSaleYearRepository;
 import com.huimv.production.result.Result;
 import com.huimv.production.result.ResultStatus;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MSaleYearService;
 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 MSaleYearServiceImpl implements MSaleYearService {
@@ -58,12 +61,19 @@ public class MSaleYearServiceImpl implements MSaleYearService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MSaleYear> 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<MSaleYear> 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);
 		}
 	}
 }

+ 14 - 4
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSmartCountServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MSmartCount;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MSmartCountRepository;
 import com.huimv.production.result.Result;
 import com.huimv.production.result.ResultStatus;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MSmartCountService;
 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 MSmartCountServiceImpl implements MSmartCountService {
@@ -58,12 +61,19 @@ public class MSmartCountServiceImpl implements MSmartCountService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MSmartCount> 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<MSmartCount> 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);
 		}
 	}
 }

+ 14 - 4
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSmartWeightServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MSmartWeight;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MSmartWeightRepository;
 import com.huimv.production.result.Result;
 import com.huimv.production.result.ResultStatus;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MSmartWeightService;
 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 MSmartWeightServiceImpl implements MSmartWeightService {
@@ -58,12 +61,19 @@ public class MSmartWeightServiceImpl implements MSmartWeightService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MSmartWeight> 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<MSmartWeight> 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);
 		}
 	}
 }

+ 11 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowAblactationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MSowAblactationEntity;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.domain.MTransferFattenEntity;
 import com.huimv.production.repo.MSowAblactationEntityRepo;
 import com.huimv.production.repo.MSowAblactationEntityRepo;
@@ -69,10 +70,17 @@ public class MSowAblactationServiceImpl implements MSowAblactationService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MSowAblactationEntity> all = fattenEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            Integer startPage = (pageNum-1) * pageSize;
+
+            int size = fattenEntityRepo.findAll().size() ;
+            List<MSowAblactationEntity> 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,"查询成功",map);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }

+ 11 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowAnimalHeatServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MSowAnimalHeatEntity;
+import com.huimv.production.domain.MSowEntity;
 import com.huimv.production.repo.MSowAnimalHeatEntityRepo;
 import com.huimv.production.result.Result;
 import com.huimv.production.service.MSowAnimalHeatService;
@@ -74,10 +75,17 @@ public class MSowAnimalHeatServiceImpl implements MSowAnimalHeatService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MSowAnimalHeatEntity> all = fattenEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            Integer startPage = (pageNum-1) * pageSize;
+
+            int size = fattenEntityRepo.findAll().size() ;
+            List<MSowAnimalHeatEntity> 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,"查询成功",map);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }

+ 12 - 8
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowAreaServiceImpl.java

@@ -1,9 +1,6 @@
 package com.huimv.production.service.impl;
 
-import com.huimv.production.domain.MPigFeed;
-import com.huimv.production.domain.MSowArea;
-import com.huimv.production.domain.MSowFeed;
-import com.huimv.production.domain.MSowWater;
+import com.huimv.production.domain.*;
 import com.huimv.production.repo.*;
 import com.huimv.production.result.Result;
 import com.huimv.production.result.ResultStatus;
@@ -63,12 +60,19 @@ public class MSowAreaServiceImpl implements MSowAreaService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MSowArea> 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<MSowArea> 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);
 		}
 	}
 

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowServiceImpl.java

@@ -75,7 +75,7 @@ public class MSowServiceImpl implements MSowService {
             Map map = new HashMap();
             Integer startPage = (pageNum-1) * pageSize;
 
-            int size = childcareEntityRepo.findAll().size() ;
+            int size = childcareEntityRepo.findAll().size();
             List<MSowEntity> all = childcareEntityRepo.findAll(name,startPage,pageSize);
             map.put("total",size);
             map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);

+ 32 - 0
huimv-ql-farm/huimv-ql-production/src/main/resources/application-haiyan.yml

@@ -0,0 +1,32 @@
+server:
+  port: 8090
+spring:
+  application:
+    name: production
+
+  datasource:
+#    url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    open-in-view: true
+
+    #  redis:
+#    database: 0
+#    host: 119.3.84.55
+#    port: 6379
+#    password: hm123456
+#    jedis:
+#      pool:
+#        max-active: 20
+#        max-wait: -1
+#        max-idle: 10
+#        min-idle: 0
+#    timeout: 5000

+ 32 - 0
huimv-ql-farm/huimv-ql-production/src/main/resources/application-wuyi.yml

@@ -0,0 +1,32 @@
+server:
+  port: 8090
+spring:
+  application:
+    name: production
+
+  datasource:
+#    url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/huimv_ql_farm_wuyi?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    open-in-view: true
+
+    #  redis:
+#    database: 0
+#    host: 119.3.84.55
+#    port: 6379
+#    password: hm123456
+#    jedis:
+#      pool:
+#        max-active: 20
+#        max-wait: -1
+#        max-idle: 10
+#        min-idle: 0
+#    timeout: 5000

huimv-ql-farm/huimv-ql-production/src/main/resources/application-dev.yml → huimv-ql-farm/huimv-ql-production/src/main/resources/application-ycg.yml


+ 3 - 1
huimv-ql-farm/huimv-ql-production/src/main/resources/application.properties

@@ -1 +1,3 @@
-spring.profiles.active=dev
+spring.profiles.active=ycg
+#spring.profiles.active=wuyi
+#spring.profiles.active=haiyan

+ 4 - 4
huimv-ql-farm/huimv-ql-video/src/main/java/com/huimv/video/controller/CameraInfoController.java

@@ -63,11 +63,11 @@ public class CameraInfoController {
     @RequestMapping("/findAll")
     private Result findAll(String name ,Integer pageNum , Integer pageSize){
         try {
-            Map list = cameraInfoService.findAll(name,pageNum,pageSize);
-            if (list == null){
-                return new Result(10002,"查询失败,地区信息有误",list);
+            Map map = cameraInfoService.findAll(name,pageNum,pageSize);
+            if (map == null){
+                return new Result(10002,"查询失败,地区信息有误",map);
             }
-            return new Result(10000,"查询成功",list);
+            return new Result(10000,"查询成功",map);
         }catch (Exception e){
             return new Result(10001,"查询失败");
         }