Merge remote-tracking branch 'origin/master'

# Conflicts:
#	huimv-smart-management/src/main/java/com/huimv/management/controller/YearPigBaseController.java
#	huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigBaseServiceImpl.java

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

@@ -88,8 +88,8 @@ public class EmployeeController {
      * 查询全部
      */
     @RequestMapping("/findAll")
-    public R findAll(){
-        List list = employeeService.findAll();
+    public R findAll(Integer formFarmId){
+        List list = employeeService.findAll(formFarmId);
 
         return R.ok().put("all",list);
     }

huimv-smart-management/src/main/java/com/huimv/management/controller/HealthMedicalRecordController.java

@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -94,8 +96,11 @@ public class HealthMedicalRecordController {
      * 查询全部
      */
     @RequestMapping("/findAll")
-    public R findAll(){
-        return R.ok().put("all",healthMedicalRecordService.list());
+    public R findAll(Integer formFarmId){
+        LambdaQueryWrapper<HealthMedicalRecordEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(HealthMedicalRecordEntity::getFarmId,formFarmId);
+
+        return R.ok().put("all",healthMedicalRecordService.list(wrapper));
     }
 
 }

huimv-smart-management/src/main/java/com/huimv/management/controller/PeriodController.java

@@ -88,8 +88,8 @@ public class PeriodController {
     }
 
     @RequestMapping("/findAll")
-    public R findAll(){
-        List list = periodService.findAll();
+    public R findAll(Integer formFarmId){
+        List list = periodService.findAll(formFarmId);
 
         return R.ok().put("all",list);
     }

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

@@ -91,8 +91,8 @@ public class PigstyController {
      * 查询全部
      */
     @RequestMapping("/findAll")
-    public R findAll(){
-        List list = pigstyService.findAll();
+    public R findAll(Integer formFarmId){
+        List list = pigstyService.findAll(formFarmId);
 
         return R.ok().put("all",list);
     }

huimv-smart-management/src/main/java/com/huimv/management/controller/YearPigBaseController.java

@@ -1,6 +1,8 @@
  package com.huimv.management.controller;
 
 import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 
 import io.swagger.annotations.Api;
@@ -44,17 +46,6 @@ public class YearPigBaseController {
 
 
     /**
-     * 查谱系问题，请求头中需要有ID
-     */
-    @RequestMapping("/queryByRelationship")
-    public R queryPageByRelationship(@RequestParam Map<String, Object> params){
-        Map<String, Object> stringObjectMap = yearPigBaseService.queryPageByRelationship(params);
-        return R.ok().put("Result", stringObjectMap);
-    }
-
-
-
-    /**
      * 信息
      */
     @RequestMapping("/info/{id}")
@@ -103,6 +94,7 @@ public class YearPigBaseController {
 
         return R.ok();
     } */
+    //批量入栏
     @RequestMapping("/batchLairage")
     public R batchLairage(@RequestBody YearPigBaseEntity yearPigBase){
 
@@ -114,15 +106,35 @@ public class YearPigBaseController {
         return R.ok();
     }
 
+    //批量出栏
     @RequestMapping("/such")
-    public R such(@RequestBody YearPigBaseEntity yearPigBase){
-
-        for (String eartage : yearPigBase.getEartag().split(",")) {
-            yearPigBase.setEartag(eartage);
-            yearPigBaseService.save(yearPigBase);
-        }
-
+    public R such(@RequestParam Integer[] ids){
+
+//        YearPigBaseEntity yearPigBaseEntity = new YearPigBaseEntity();
+//        yearPigBaseEntity.setOutFenceStatus(1);
+//        yearPigBaseEntity.setOutFenceTime(new Date());
+//
+//
+//        for (Integer id : ids) {
+//            yearPigBaseEntity.setId(id);
+//            yearPigBaseService.updateById(yearPigBaseEntity);
+//        }
+
+        yearPigBaseService.such(ids);
         return R.ok();
     }
 
+    //出栏入栏比例
+    @RequestMapping("/outAndInProportion")
+    public R outAndInProportion(Integer farmId){
+        //出栏
+        Integer outFenct = yearPigBaseService.findByoutFenceStatus(1,farmId);
+        //育肥
+        Integer inFenct = yearPigBaseService.findByoutFenceStatus(0,farmId);
+        Map<String,Integer> resultMap = new HashMap<String,Integer>();
+        resultMap.put("outFenct",outFenct);
+        resultMap.put("inFenct",inFenct);
+
+        return R.ok().put("data",resultMap);
+    }
 }

huimv-smart-management/src/main/java/com/huimv/management/dao/EmployeeDao.java

@@ -3,6 +3,7 @@ package com.huimv.management.dao;
 import com.huimv.management.entity.EmployeeEntity;
 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 EmployeeDao extends BaseMapper<EmployeeEntity> {
 	
 }

huimv-smart-management/src/main/java/com/huimv/management/entity/BreedParentsEntity.java

@@ -1,6 +1,7 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
@@ -71,6 +72,7 @@ public class BreedParentsEntity implements Serializable {
 	/**
 	 * 数据是否有效
 	 */
+	@TableLogic(delval = "0",value = "1")
 	private Integer effective;
 	/**
 	 * 后备字段

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

@@ -44,6 +44,10 @@ public class EmployeeEntity implements Serializable {
      */
     private Boolean jobStatus;
     /**
+     * 牧场id
+     */
+    private Integer farmId ;
+    /**
      * 删除状态 0正常 1已删除
      */
     @TableLogic

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

@@ -18,6 +18,6 @@ public interface EmployeeService extends IService<EmployeeEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 
-    List findAll();
+    List findAll(Integer formFarmId);
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/PeriodService.java

@@ -18,7 +18,7 @@ public interface PeriodService extends IService<PeriodEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 
-    List findAll();
+    List findAll(Integer formFarmId);
 
     List findAllByFarmId(Integer id);
 }

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

@@ -18,7 +18,7 @@ public interface PigstyService extends IService<PigstyEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 
-    List findAll();
+    List findAll(Integer formFarmId);
 
     Integer delete(Integer[] ids);
 

huimv-smart-management/src/main/java/com/huimv/management/service/YearPigBaseService.java

@@ -37,5 +37,7 @@ public interface YearPigBaseService extends IService<YearPigBaseEntity> {
 
 
     void such(Integer[] ids);
+
+    Integer findByoutFenceStatus(int i, Integer farmId);
 }
 

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

@@ -1,6 +1,7 @@
 package com.huimv.management.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.management.entity.EmployeeEntity;
 import com.huimv.management.entity.EmployeeEntity;
@@ -39,6 +40,9 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
    public PageUtils queryPage(Map<String, Object> params) {
 
        LambdaQueryWrapper<EmployeeEntity> lambdaQuery = Wrappers.lambdaQuery();
+       String farmId = (String)params.get("formFarmId");
+       lambdaQuery.eq(StringUtils.isNotBlank(farmId),EmployeeEntity::getFarmId,farmId);
+
        String keywords = (String) params.get("keywords");
        //没有参数
        if (keywords == null || keywords.equals("")){
@@ -59,8 +63,12 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
    }
 
     @Override
-    public List findAll() {
+    public List findAll(Integer formFarmId) {
         LambdaQueryWrapper<EmployeeEntity> lambdaQuery = Wrappers.lambdaQuery();
+        if (formFarmId != null){
+            lambdaQuery.eq(EmployeeEntity::getFarmId,formFarmId);
+        }
+
         List<EmployeeEntity> pastureEntities = employeeDao.selectList(lambdaQuery);
         return pastureEntities;
     }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/HealthMedicalRecordServiceImpl.java

@@ -22,7 +22,7 @@ public class HealthMedicalRecordServiceImpl extends ServiceImpl<HealthMedicalRec
     public PageUtils queryPage(Map<String, Object> params) {
 
         //根据牧场查询
-        String farmId = (String) params.get("farmId");
+        String farmId = (String) params.get("formFarmId");
         QueryWrapper<HealthMedicalRecordEntity> wrapper = new QueryWrapper<HealthMedicalRecordEntity>();
         wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
 

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

@@ -32,7 +32,7 @@ public class PeriodServiceImpl extends ServiceImpl<PeriodDao, PeriodEntity> impl
     public PageUtils queryPage(Map<String, Object> params) {
 
         LambdaQueryWrapper<PeriodEntity> lambdaQuery = Wrappers.lambdaQuery();
-        String farmId = (String)params.get("farmId");
+        String farmId = (String)params.get("fromFarmId");
         lambdaQuery.eq(StringUtils.isNotBlank(farmId),PeriodEntity::getPigstyId,farmId);
 
         String keywords = (String) params.get("keywords");
@@ -56,8 +56,9 @@ public class PeriodServiceImpl extends ServiceImpl<PeriodDao, PeriodEntity> impl
     }
 
     @Override
-    public List findAll() {
+    public List findAll(Integer formFarmId) {
         LambdaQueryWrapper<PeriodEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(PeriodEntity::getPastureId,formFarmId);
         List<PeriodEntity> pastureEntities = periodDao.selectList(lambdaQuery);
         return pastureEntities;
     }

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

@@ -1,6 +1,7 @@
 package com.huimv.management.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.management.dao.YearPigBaseDao;
 import com.huimv.management.entity.PigstyEntity;
@@ -35,6 +36,9 @@ public class PigstyServiceImpl extends ServiceImpl<PigstyDao, PigstyEntity> impl
     public PageUtils queryPage(Map<String, Object> params) {
 
         LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String farmId = (String) params.get("formFarmId");
+        lambdaQuery.eq(StringUtils.isNotBlank(farmId),PigstyEntity::getFarmId,farmId);
+
         String keywords = (String) params.get("keywords");
         //没有参数
         if (keywords == null || keywords.equals("")){
@@ -45,6 +49,8 @@ public class PigstyServiceImpl extends ServiceImpl<PigstyDao, PigstyEntity> impl
             return new PageUtils(page);
         }
 
+
+
         lambdaQuery.like(PigstyEntity::getNumber,keywords);
         IPage<PigstyEntity> page = page(this.page(
                 new Query<PigstyEntity>().getPage(params)
@@ -55,8 +61,9 @@ public class PigstyServiceImpl extends ServiceImpl<PigstyDao, PigstyEntity> impl
     }
 
     @Override
-    public List findAll() {
+    public List findAll(Integer formFarmId) {
         LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(PigstyEntity::getFarmId,formFarmId);
         List<PigstyEntity> pastureEntities = pigstyDao.selectList(lambdaQuery);
         return pastureEntities;
     }

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

@@ -7,7 +7,7 @@ import com.huimv.management.entity.YearPigBaseEntity;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.*;
+import java.util.Map;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.PageUtils;
@@ -21,10 +21,8 @@ import com.huimv.management.service.YearPigBaseService;
 @Service("yearPigBaseService")
 public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigBaseEntity> implements YearPigBaseService {
 
-
-
-
-
+    @Autowired
+    private YearPigBaseDao pigBaseDao;
 
 //    @Override
 //    public PageUtils queryPage(Map<String, Object> params) {
@@ -49,85 +47,6 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
 //        return new PageUtils(page);
 //    }
 
-//params  里面有耳标号
-    @Override
-    public   Map<String ,Object> queryPageByRelationship(Map<String, Object> params) {
-
-
-
-
-
-
-
-       /* Optional<BreedingSheepDetails> detail = breedingSheepDetailsRepository.findById(id);
-        if (!detail.isPresent()) {
-            throw new PlatformException("sheep doesn't exists", "羊只不存在");
-        }
-        BreedingSheepDetails self = detail.get();
-
-        EarTagBind earTag = earTagBindRepository.findBySheepId(id).orElse(null);
-        self.setEarTag(earTag == null ? null :earTag.getEarTag());
-
-
-        result.put("self", self );
-
-        BreedingSheepDetails father = self.getFather() == null ? null : breedingSheepDetailsRepository.findById(self.getFather()).orElse(null);
-        BreedingSheepDetails mother = self.getMother() == null ? null : breedingSheepDetailsRepository.findById(self.getMother()).orElse(null);
-
-        result.put("father", father);
-        result.put("mother", mother);
-        result.put("fatherFather", father == null ? null : breedingSheepDetailsRepository.findById(father.getFather()).orElse(null));
-        result.put("fatherMother", father == null ? null : breedingSheepDetailsRepository.findById(father.getMother()).orElse(null));
-        result.put("motherFather", mother == null ? null : breedingSheepDetailsRepository.findById(mother.getFather()).orElse(null));
-        result.put("motherMother", mother == null ? null : breedingSheepDetailsRepository.findById(mother.getMother()).orElse(null));
-
-        return result;
-    }*/
-
-
-        Map<String, Object> result = new HashMap<>();
-        String eartag_no = (String) params.get("eartag");
-        System.out.println(eartag_no);
-        YearPigBaseEntity  self = baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, eartag_no));
-        System.out.println(self);
-        result.put("self",   self  );
-
-
-        System.out.println("父亲ID"+self.getFatherEartag());   System.out.println("母亲ID"+self.getMotherEartag());
-        String math = self.getMotherEartag();
-
-        YearPigBaseEntity father = self.getFatherEartag() == null ? null :  baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, self.getFatherEartag()));
-        YearPigBaseEntity mother = self.getMotherEartag() == null ? null :  baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, math));
-
-
-
-        //父亲父母
-        result.put("father", father);
-        result.put("mother", mother);
-        YearPigBaseEntity fathermother = father == null ? null :  baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, father.getFatherEartag()));
-        YearPigBaseEntity fatherfather = father == null ? null :  baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, father.getMotherEartag()));
-        result.put("fathermother", fathermother);
-        result.put("fatherfather", fatherfather);
-        //母亲父母
-        YearPigBaseEntity mothermother = mother == null ? null :  baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, mother.getFatherEartag()));
-        YearPigBaseEntity  motherfather = mother == null ? null :  baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, mother.getMotherEartag()));
-        result.put("mothermother", mothermother);
-        result.put("motherfather", motherfather);
-
-
-        return   result;
-    }
-
-
-
-
-
-
-
-
-
-
-
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
@@ -181,13 +100,17 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
             lambdaQuery.eq(YearPigBaseEntity::getUnitId,unitId);
         }
 
+        //单元
+        String farmId = (String) params.get("formFarmId");
+        if (StringUtils.isNotEmpty(farmId)) {
+            lambdaQuery.eq(YearPigBaseEntity::getFarmId,farmId);
+        }
 
         IPage<YearPigBaseEntity> page = page(this.page(
                 new Query<YearPigBaseEntity>().getPage(params)
         ), lambdaQuery);
 
 
-
         return new PageUtils(page);
     }
 
@@ -201,10 +124,17 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         }
     }
 
-
-    //谁的代码。没做实现
     @Override
     public void such(Integer[] ids) {
+        pigBaseDao.such(ids);
+    }
 
+    @Override
+    public Integer findByoutFenceStatus(int i, Integer farmId) {
+        LambdaQueryWrapper<YearPigBaseEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(YearPigBaseEntity::getFarmId,farmId);
+        wrapper.eq(YearPigBaseEntity::getOutFenceStatus,i);
+        Integer integer = pigBaseDao.selectCount(wrapper);
+        return integer;
     }
 }