瀏覽代碼

所以类添加查询接口

523096025 4 年之前
父節點
當前提交
06c67a468a
共有 28 個文件被更改,包括 502 次插入54 次删除
  1. 10 0
      huimv-smart-management/src/main/java/com/huimv/management/controller/EmployeeController.java
  2. 11 0
      huimv-smart-management/src/main/java/com/huimv/management/controller/PastureController.java
  3. 11 0
      huimv-smart-management/src/main/java/com/huimv/management/controller/PigstyController.java
  4. 11 0
      huimv-smart-management/src/main/java/com/huimv/management/controller/UnitController.java
  5. 2 0
      huimv-smart-management/src/main/java/com/huimv/management/dao/PastureDao.java
  6. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/EmployeeEntity.java
  7. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/PigstyEntity.java
  8. 3 0
      huimv-smart-management/src/main/java/com/huimv/management/service/EmployeeService.java
  9. 3 0
      huimv-smart-management/src/main/java/com/huimv/management/service/PastureService.java
  10. 3 0
      huimv-smart-management/src/main/java/com/huimv/management/service/PigstyService.java
  11. 3 0
      huimv-smart-management/src/main/java/com/huimv/management/service/UnitService.java
  12. 27 1
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/AnimalHeatServiceImpl.java
  13. 20 4
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/EatTimeServiceImpl.java
  14. 40 1
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/EmployeeServiceImpl.java
  15. 27 1
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/IndoorEnvironmentServiceImpl.java
  16. 20 4
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/OutdoorEnvironmentServiceImpl.java
  17. 42 1
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/PastureServiceImpl.java
  18. 20 4
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/PeriodServiceImpl.java
  19. 21 4
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/PigstyPigServiceImpl.java
  20. 43 1
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/PigstyServiceImpl.java
  21. 20 5
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/SleepStatusServiceImpl.java
  22. 20 4
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/SportTimeServiceImpl.java
  23. 43 1
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/UnitServiceImpl.java
  24. 20 5
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/WaterTargetServiceImpl.java
  25. 20 4
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigBaseServiceImpl.java
  26. 20 4
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigHistortWeightServiceImpl.java
  27. 20 4
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigHistoryImgServiceImpl.java
  28. 20 4
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigPedigreeServiceImpl.java

+ 10 - 0
huimv-smart-management/src/main/java/com/huimv/management/controller/EmployeeController.java

@@ -1,6 +1,7 @@
  package com.huimv.management.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import io.swagger.annotations.Api;
@@ -83,4 +84,13 @@ public class EmployeeController {
         return R.ok();
     }
 
+    /**
+     * 查询全部
+     */
+    @RequestMapping("/findAll")
+    public R findAll(){
+        List list = employeeService.findAll();
+
+        return R.ok().put("all",list);
+    }
 }

+ 11 - 0
huimv-smart-management/src/main/java/com/huimv/management/controller/PastureController.java

@@ -1,6 +1,7 @@
  package com.huimv.management.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import io.swagger.annotations.Api;
@@ -83,4 +84,14 @@ public class PastureController {
         return R.ok();
     }
 
+    /**
+     * 查询全部
+     */
+    @RequestMapping("/findAll")
+    public R findAll(){
+        List list = pastureService.findAll();
+
+        return R.ok().put("all",list);
+    }
+
 }

+ 11 - 0
huimv-smart-management/src/main/java/com/huimv/management/controller/PigstyController.java

@@ -1,6 +1,7 @@
  package com.huimv.management.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import io.swagger.annotations.Api;
@@ -83,4 +84,14 @@ public class PigstyController {
         return R.ok();
     }
 
+    /**
+     * 查询全部
+     */
+    @RequestMapping("/findAll")
+    public R findAll(){
+        List list = pigstyService.findAll();
+
+        return R.ok().put("all",list);
+    }
+
 }

+ 11 - 0
huimv-smart-management/src/main/java/com/huimv/management/controller/UnitController.java

@@ -1,6 +1,7 @@
  package com.huimv.management.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import io.swagger.annotations.Api;
@@ -83,4 +84,14 @@ public class UnitController {
         return R.ok();
     }
 
+
+    /**
+     * 查询全部
+     */
+    @RequestMapping("/findAll")
+    public R findAll(){
+        List list = unitService.findAll();
+
+        return R.ok().put("all",list);
+    }
 }

+ 2 - 0
huimv-smart-management/src/main/java/com/huimv/management/dao/PastureDao.java

@@ -3,6 +3,7 @@ package com.huimv.management.dao;
 import com.huimv.management.entity.PastureEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * 牧场表
@@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2021-05-07 15:32:42
  */
 @Mapper
+@Repository
 public interface PastureDao extends BaseMapper<PastureEntity> {
 	
 }

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/EmployeeEntity.java

@@ -43,7 +43,7 @@ public class EmployeeEntity implements Serializable {
     /**
      * 是否当前在职(1:在岗,0不在岗)
      */
-    private Boolean jobStauts;
+    private Boolean jobStatus;
     /**
      * 删除状态 0正常 1已删除
      */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/PigstyEntity.java

@@ -35,7 +35,7 @@ public class PigstyEntity implements Serializable {
     /**
      * 养殖员名称
      */
-    private String feederId;
+    private Integer feederId;
     /**
      * 删除状态 0正常 1已删除
      */

+ 3 - 0
huimv-smart-management/src/main/java/com/huimv/management/service/EmployeeService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.management.entity.EmployeeEntity;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,5 +17,7 @@ import java.util.Map;
 public interface EmployeeService extends IService<EmployeeEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    List findAll();
 }
 

+ 3 - 0
huimv-smart-management/src/main/java/com/huimv/management/service/PastureService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.management.entity.PastureEntity;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,5 +17,7 @@ import java.util.Map;
 public interface PastureService extends IService<PastureEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    List findAll();
 }
 

+ 3 - 0
huimv-smart-management/src/main/java/com/huimv/management/service/PigstyService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.management.entity.PigstyEntity;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,5 +17,7 @@ import java.util.Map;
 public interface PigstyService extends IService<PigstyEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    List findAll();
 }
 

+ 3 - 0
huimv-smart-management/src/main/java/com/huimv/management/service/UnitService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.management.entity.UnitEntity;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,5 +17,7 @@ import java.util.Map;
 public interface UnitService extends IService<UnitEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    List findAll();
 }
 

+ 27 - 1
huimv-smart-management/src/main/java/com/huimv/management/service/impl/AnimalHeatServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.AnimalHeatEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,12 +21,35 @@ public class AnimalHeatServiceImpl extends ServiceImpl<AnimalHeatDao, AnimalHeat
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
+        LambdaQueryWrapper<AnimalHeatEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<AnimalHeatEntity> page = this.page(
+                    new Query<AnimalHeatEntity>().getPage(params),
+                    new QueryWrapper<AnimalHeatEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(AnimalHeatEntity::getEartag,keywords);
+        IPage<AnimalHeatEntity> page = page(this.page(
+                new Query<AnimalHeatEntity>().getPage(params)
+        ), lambdaQuery);
+
+
+        return new PageUtils(page);
+    }
+    
+   /* @Override
+    public PageUtils queryPage(Map<String, Object> params) {
         IPage<AnimalHeatEntity> page = this.page(
                 new Query<AnimalHeatEntity>().getPage(params),
                 new QueryWrapper<AnimalHeatEntity>()
         );
 
         return new PageUtils(page);
-    }
+    }*/
 
 }

+ 20 - 4
huimv-smart-management/src/main/java/com/huimv/management/service/impl/EatTimeServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.EatTimeEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,10 +21,23 @@ public class EatTimeServiceImpl extends ServiceImpl<EatTimeDao, EatTimeEntity> i
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<EatTimeEntity> page = this.page(
-                new Query<EatTimeEntity>().getPage(params),
-                new QueryWrapper<EatTimeEntity>()
-        );
+
+        LambdaQueryWrapper<EatTimeEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<EatTimeEntity> page = this.page(
+                    new Query<EatTimeEntity>().getPage(params),
+                    new QueryWrapper<EatTimeEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(EatTimeEntity::getEartag,keywords);
+        IPage<EatTimeEntity> page = page(this.page(
+                new Query<EatTimeEntity>().getPage(params)
+        ), lambdaQuery);
+
 
         return new PageUtils(page);
     }

+ 40 - 1
huimv-smart-management/src/main/java/com/huimv/management/service/impl/EmployeeServiceImpl.java

@@ -1,6 +1,13 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.EmployeeEntity;
+import com.huimv.management.entity.EmployeeEntity;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,7 +23,10 @@ import com.huimv.management.service.EmployeeService;
 @Service("employeeService")
 public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity> implements EmployeeService {
 
-    @Override
+    @Autowired
+    private EmployeeDao employeeDao;
+    
+   /* @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<EmployeeEntity> page = this.page(
                 new Query<EmployeeEntity>().getPage(params),
@@ -24,6 +34,35 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
         );
 
         return new PageUtils(page);
+    }*/
+   @Override
+   public PageUtils queryPage(Map<String, Object> params) {
+
+       LambdaQueryWrapper<EmployeeEntity> lambdaQuery = Wrappers.lambdaQuery();
+       String keywords = (String) params.get("keywords");
+       //没有参数
+       if (keywords == null || keywords.equals("")){
+           IPage<EmployeeEntity> page = this.page(
+                   new Query<EmployeeEntity>().getPage(params),
+                   new QueryWrapper<EmployeeEntity>()
+           );
+           return new PageUtils(page);
+       }
+
+       lambdaQuery.like(EmployeeEntity::getName,keywords);
+       IPage<EmployeeEntity> page = page(this.page(
+               new Query<EmployeeEntity>().getPage(params)
+       ), lambdaQuery);
+
+
+       return new PageUtils(page);
+   }
+
+    @Override
+    public List findAll() {
+        LambdaQueryWrapper<EmployeeEntity> lambdaQuery = Wrappers.lambdaQuery();
+        List<EmployeeEntity> pastureEntities = employeeDao.selectList(lambdaQuery);
+        return pastureEntities;
     }
 
 }

+ 27 - 1
huimv-smart-management/src/main/java/com/huimv/management/service/impl/IndoorEnvironmentServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.IndoorEnvironmentEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,12 +21,35 @@ public class IndoorEnvironmentServiceImpl extends ServiceImpl<IndoorEnvironmentD
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
+        LambdaQueryWrapper<IndoorEnvironmentEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<IndoorEnvironmentEntity> page = this.page(
+                    new Query<IndoorEnvironmentEntity>().getPage(params),
+                    new QueryWrapper<IndoorEnvironmentEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(IndoorEnvironmentEntity::getPigstyId,keywords);
+        IPage<IndoorEnvironmentEntity> page = page(this.page(
+                new Query<IndoorEnvironmentEntity>().getPage(params)
+        ), lambdaQuery);
+
+
+        return new PageUtils(page);
+    }
+    
+    /*@Override
+    public PageUtils queryPage(Map<String, Object> params) {
         IPage<IndoorEnvironmentEntity> page = this.page(
                 new Query<IndoorEnvironmentEntity>().getPage(params),
                 new QueryWrapper<IndoorEnvironmentEntity>()
         );
 
         return new PageUtils(page);
-    }
+    }*/
 
 }

+ 20 - 4
huimv-smart-management/src/main/java/com/huimv/management/service/impl/OutdoorEnvironmentServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.OutdoorEnvironmentEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,10 +21,23 @@ public class OutdoorEnvironmentServiceImpl extends ServiceImpl<OutdoorEnvironmen
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<OutdoorEnvironmentEntity> page = this.page(
-                new Query<OutdoorEnvironmentEntity>().getPage(params),
-                new QueryWrapper<OutdoorEnvironmentEntity>()
-        );
+
+        LambdaQueryWrapper<OutdoorEnvironmentEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<OutdoorEnvironmentEntity> page = this.page(
+                    new Query<OutdoorEnvironmentEntity>().getPage(params),
+                    new QueryWrapper<OutdoorEnvironmentEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(OutdoorEnvironmentEntity::getId,keywords);
+        IPage<OutdoorEnvironmentEntity> page = page(this.page(
+                new Query<OutdoorEnvironmentEntity>().getPage(params)
+        ), lambdaQuery);
+
 
         return new PageUtils(page);
     }

+ 42 - 1
huimv-smart-management/src/main/java/com/huimv/management/service/impl/PastureServiceImpl.java

@@ -1,6 +1,14 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.dao.UnitDao;
+import com.huimv.management.entity.PastureEntity;
+import com.huimv.management.entity.PastureEntity;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,14 +24,47 @@ import com.huimv.management.service.PastureService;
 @Service("pastureService")
 public class PastureServiceImpl extends ServiceImpl<PastureDao, PastureEntity> implements PastureService {
 
+    @Autowired
+    private PastureDao pastureDao;
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
+        LambdaQueryWrapper<PastureEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<PastureEntity> page = this.page(
+                    new Query<PastureEntity>().getPage(params),
+                    new QueryWrapper<PastureEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(PastureEntity::getName,keywords);
+        IPage<PastureEntity> page = page(this.page(
+                new Query<PastureEntity>().getPage(params)
+        ), lambdaQuery);
+
+
+        return new PageUtils(page);
+    }
+
+    @Override
+    public List findAll() {
+        LambdaQueryWrapper<PastureEntity> lambdaQuery = Wrappers.lambdaQuery();
+        List<PastureEntity> pastureEntities = pastureDao.selectList(lambdaQuery);
+        return pastureEntities;
+    }
+    
+   /* @Override
+    public PageUtils queryPage(Map<String, Object> params) {
         IPage<PastureEntity> page = this.page(
                 new Query<PastureEntity>().getPage(params),
                 new QueryWrapper<PastureEntity>()
         );
 
         return new PageUtils(page);
-    }
+    }*/
 
 }

+ 20 - 4
huimv-smart-management/src/main/java/com/huimv/management/service/impl/PeriodServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.PeriodEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,10 +21,23 @@ public class PeriodServiceImpl extends ServiceImpl<PeriodDao, PeriodEntity> impl
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<PeriodEntity> page = this.page(
-                new Query<PeriodEntity>().getPage(params),
-                new QueryWrapper<PeriodEntity>()
-        );
+
+        LambdaQueryWrapper<PeriodEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<PeriodEntity> page = this.page(
+                    new Query<PeriodEntity>().getPage(params),
+                    new QueryWrapper<PeriodEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(PeriodEntity::getPigstyId,keywords);
+        IPage<PeriodEntity> page = page(this.page(
+                new Query<PeriodEntity>().getPage(params)
+        ), lambdaQuery);
+
 
         return new PageUtils(page);
     }

+ 21 - 4
huimv-smart-management/src/main/java/com/huimv/management/service/impl/PigstyPigServiceImpl.java

@@ -1,5 +1,9 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.IndoorEnvironmentEntity;
+import com.huimv.management.entity.PigstyPigEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,10 +22,23 @@ public class PigstyPigServiceImpl extends ServiceImpl<PigstyPigDao, PigstyPigEnt
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<PigstyPigEntity> page = this.page(
-                new Query<PigstyPigEntity>().getPage(params),
-                new QueryWrapper<PigstyPigEntity>()
-        );
+
+        LambdaQueryWrapper<PigstyPigEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<PigstyPigEntity> page = this.page(
+                    new Query<PigstyPigEntity>().getPage(params),
+                    new QueryWrapper<PigstyPigEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(PigstyPigEntity::getEartag,keywords);
+        IPage<PigstyPigEntity> page = page(this.page(
+                new Query<PigstyPigEntity>().getPage(params)
+        ), lambdaQuery);
+
 
         return new PageUtils(page);
     }

+ 43 - 1
huimv-smart-management/src/main/java/com/huimv/management/service/impl/PigstyServiceImpl.java

@@ -1,6 +1,13 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.PigstyEntity;
+import com.huimv.management.entity.PigstyEntity;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,14 +23,49 @@ import com.huimv.management.service.PigstyService;
 @Service("pigstyService")
 public class PigstyServiceImpl extends ServiceImpl<PigstyDao, PigstyEntity> implements PigstyService {
 
+    @Autowired
+    private PigstyDao pigstyDao;
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+
+        LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<PigstyEntity> page = this.page(
+                    new Query<PigstyEntity>().getPage(params),
+                    new QueryWrapper<PigstyEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(PigstyEntity::getNumber,keywords);
+        IPage<PigstyEntity> page = page(this.page(
+                new Query<PigstyEntity>().getPage(params)
+        ), lambdaQuery);
+
+
+        return new PageUtils(page);
+    }
+
     @Override
+    public List findAll() {
+        LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
+        List<PigstyEntity> pastureEntities = pigstyDao.selectList(lambdaQuery);
+        return pastureEntities;
+    }
+
+   /* @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
+
         IPage<PigstyEntity> page = this.page(
                 new Query<PigstyEntity>().getPage(params),
                 new QueryWrapper<PigstyEntity>()
         );
 
         return new PageUtils(page);
-    }
+    }*/
 
 }

+ 20 - 5
huimv-smart-management/src/main/java/com/huimv/management/service/impl/SleepStatusServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.SleepStatusEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,12 +21,24 @@ public class SleepStatusServiceImpl extends ServiceImpl<SleepStatusDao, SleepSta
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<SleepStatusEntity> page = this.page(
-                new Query<SleepStatusEntity>().getPage(params),
-                new QueryWrapper<SleepStatusEntity>()
-        );
+
+        LambdaQueryWrapper<SleepStatusEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<SleepStatusEntity> page = this.page(
+                    new Query<SleepStatusEntity>().getPage(params),
+                    new QueryWrapper<SleepStatusEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(SleepStatusEntity::getEartag,keywords);
+        IPage<SleepStatusEntity> page = page(this.page(
+                new Query<SleepStatusEntity>().getPage(params)
+        ), lambdaQuery);
+
 
         return new PageUtils(page);
     }
-
 }

+ 20 - 4
huimv-smart-management/src/main/java/com/huimv/management/service/impl/SportTimeServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.SportTimeEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,10 +21,23 @@ public class SportTimeServiceImpl extends ServiceImpl<SportTimeDao, SportTimeEnt
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<SportTimeEntity> page = this.page(
-                new Query<SportTimeEntity>().getPage(params),
-                new QueryWrapper<SportTimeEntity>()
-        );
+
+        LambdaQueryWrapper<SportTimeEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<SportTimeEntity> page = this.page(
+                    new Query<SportTimeEntity>().getPage(params),
+                    new QueryWrapper<SportTimeEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(SportTimeEntity::getEartag,keywords);
+        IPage<SportTimeEntity> page = page(this.page(
+                new Query<SportTimeEntity>().getPage(params)
+        ), lambdaQuery);
+
 
         return new PageUtils(page);
     }

+ 43 - 1
huimv-smart-management/src/main/java/com/huimv/management/service/impl/UnitServiceImpl.java

@@ -1,6 +1,15 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.dao.PigstyDao;
+import com.huimv.management.entity.UnitEntity;
+import com.huimv.management.entity.UnitEntity;
+import com.huimv.management.entity.UnitEntity;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,7 +25,7 @@ import com.huimv.management.service.UnitService;
 @Service("unitService")
 public class UnitServiceImpl extends ServiceImpl<UnitDao, UnitEntity> implements UnitService {
 
-    @Override
+   /* @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<UnitEntity> page = this.page(
                 new Query<UnitEntity>().getPage(params),
@@ -24,6 +33,39 @@ public class UnitServiceImpl extends ServiceImpl<UnitDao, UnitEntity> implements
         );
 
         return new PageUtils(page);
+    }*/
+
+    @Autowired
+    private UnitDao unitDao;
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+
+        LambdaQueryWrapper<UnitEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<UnitEntity> page = this.page(
+                    new Query<UnitEntity>().getPage(params),
+                    new QueryWrapper<UnitEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(UnitEntity::getNumber,keywords);
+        IPage<UnitEntity> page = page(this.page(
+                new Query<UnitEntity>().getPage(params)
+        ), lambdaQuery);
+
+
+        return new PageUtils(page);
+    }
+
+    @Override
+    public List findAll() {
+        LambdaQueryWrapper<UnitEntity> lambdaQuery = Wrappers.lambdaQuery();
+        List<UnitEntity> pastureEntities = unitDao.selectList(lambdaQuery);
+        return pastureEntities;
     }
 
 }

+ 20 - 5
huimv-smart-management/src/main/java/com/huimv/management/service/impl/WaterTargetServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.WaterTargetEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,12 +21,24 @@ public class WaterTargetServiceImpl extends ServiceImpl<WaterTargetDao, WaterTar
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<WaterTargetEntity> page = this.page(
-                new Query<WaterTargetEntity>().getPage(params),
-                new QueryWrapper<WaterTargetEntity>()
-        );
+
+        LambdaQueryWrapper<WaterTargetEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<WaterTargetEntity> page = this.page(
+                    new Query<WaterTargetEntity>().getPage(params),
+                    new QueryWrapper<WaterTargetEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(WaterTargetEntity::getId,keywords);
+        IPage<WaterTargetEntity> page = page(this.page(
+                new Query<WaterTargetEntity>().getPage(params)
+        ), lambdaQuery);
+
 
         return new PageUtils(page);
     }
-
 }

+ 20 - 4
huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigBaseServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.YearPigBaseEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,10 +21,23 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<YearPigBaseEntity> page = this.page(
-                new Query<YearPigBaseEntity>().getPage(params),
-                new QueryWrapper<YearPigBaseEntity>()
-        );
+
+        LambdaQueryWrapper<YearPigBaseEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<YearPigBaseEntity> page = this.page(
+                    new Query<YearPigBaseEntity>().getPage(params),
+                    new QueryWrapper<YearPigBaseEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(YearPigBaseEntity::getBreed,keywords);
+        IPage<YearPigBaseEntity> page = page(this.page(
+                new Query<YearPigBaseEntity>().getPage(params)
+        ), lambdaQuery);
+
 
         return new PageUtils(page);
     }

+ 20 - 4
huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigHistortWeightServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.YearPigHistortWeightEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,10 +21,23 @@ public class YearPigHistortWeightServiceImpl extends ServiceImpl<YearPigHistortW
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<YearPigHistortWeightEntity> page = this.page(
-                new Query<YearPigHistortWeightEntity>().getPage(params),
-                new QueryWrapper<YearPigHistortWeightEntity>()
-        );
+
+        LambdaQueryWrapper<YearPigHistortWeightEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<YearPigHistortWeightEntity> page = this.page(
+                    new Query<YearPigHistortWeightEntity>().getPage(params),
+                    new QueryWrapper<YearPigHistortWeightEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(YearPigHistortWeightEntity::getEartag,keywords);
+        IPage<YearPigHistortWeightEntity> page = page(this.page(
+                new Query<YearPigHistortWeightEntity>().getPage(params)
+        ), lambdaQuery);
+
 
         return new PageUtils(page);
     }

+ 20 - 4
huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigHistoryImgServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.YearPigHistoryImgEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,10 +21,23 @@ public class YearPigHistoryImgServiceImpl extends ServiceImpl<YearPigHistoryImgD
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<YearPigHistoryImgEntity> page = this.page(
-                new Query<YearPigHistoryImgEntity>().getPage(params),
-                new QueryWrapper<YearPigHistoryImgEntity>()
-        );
+
+        LambdaQueryWrapper<YearPigHistoryImgEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<YearPigHistoryImgEntity> page = this.page(
+                    new Query<YearPigHistoryImgEntity>().getPage(params),
+                    new QueryWrapper<YearPigHistoryImgEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(YearPigHistoryImgEntity::getEartag,keywords);
+        IPage<YearPigHistoryImgEntity> page = page(this.page(
+                new Query<YearPigHistoryImgEntity>().getPage(params)
+        ), lambdaQuery);
+
 
         return new PageUtils(page);
     }

+ 20 - 4
huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigPedigreeServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.entity.YearPigPedigreeEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,10 +21,23 @@ public class YearPigPedigreeServiceImpl extends ServiceImpl<YearPigPedigreeDao,
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<YearPigPedigreeEntity> page = this.page(
-                new Query<YearPigPedigreeEntity>().getPage(params),
-                new QueryWrapper<YearPigPedigreeEntity>()
-        );
+
+        LambdaQueryWrapper<YearPigPedigreeEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String keywords = (String) params.get("keywords");
+        //没有参数
+        if (keywords == null || keywords.equals("")){
+            IPage<YearPigPedigreeEntity> page = this.page(
+                    new Query<YearPigPedigreeEntity>().getPage(params),
+                    new QueryWrapper<YearPigPedigreeEntity>()
+            );
+            return new PageUtils(page);
+        }
+
+        lambdaQuery.like(YearPigPedigreeEntity::getBoarEartag,keywords);
+        IPage<YearPigPedigreeEntity> page = page(this.page(
+                new Query<YearPigPedigreeEntity>().getPage(params)
+        ), lambdaQuery);
+
 
         return new PageUtils(page);
     }