年猪基本信息添加牧场字段

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

@@ -80,5 +80,22 @@ public class BaseBloodlineController {
 
         return R.ok();
     }
+    /*
+    * @Method      : findAll
+    * @Description :
+    * @Params      :
+    * @Return      :
+    *
+    * @Author      : yuxuexuan
+    * @Date        : 2021/6/17 0017
+    * @Time        : 14:33
+    */
+    @RequestMapping("/findAll")
+    public R delete(){
+
+
+        return R.ok().put("baseBloodline",baseBloodlineService.list());
+    }
+
 
 }

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

@@ -0,0 +1,86 @@
+ package com.huimv.management.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.huimv.management.entity.BreedParentsEntity;
+import com.huimv.management.service.BreedParentsService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.R;
+
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-17 13:44:45
+ */
+@Api("种猪信息表")
+@RestController
+@RequestMapping("management/breedparents")
+public class BreedParentsController {
+    @Autowired
+    private BreedParentsService breedParentsService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = breedParentsService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		BreedParentsEntity breedParents = breedParentsService.getById(id);
+
+        return R.ok().put("breedParents", breedParents);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody BreedParentsEntity breedParents){
+		breedParentsService.save(breedParents);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody BreedParentsEntity breedParents){
+		breedParentsService.updateById(breedParents);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		breedParentsService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

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

@@ -6,11 +6,7 @@ import java.util.Map;
 
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.huimv.management.entity.PeriodEntity;
 import com.huimv.management.service.PeriodService;
@@ -98,4 +94,11 @@ public class PeriodController {
         return R.ok().put("all",list);
     }
 
+    @PostMapping("/findAllByFarmId")
+    public R findAllByFarmId(Integer id){
+        List list = periodService.findAllByFarmId(id);
+
+        return R.ok().put("all",list);
+    }
+
 }

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

@@ -6,11 +6,7 @@ import java.util.Map;
 
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.huimv.management.entity.PigstyEntity;
 import com.huimv.management.service.PigstyService;
@@ -101,4 +97,14 @@ public class PigstyController {
         return R.ok().put("all",list);
     }
 
+    /**
+     * 根据牧场id
+     */
+    @PostMapping("/findAllByFarmId")
+    public R findAllByFarmId(Integer id){
+        List list = pigstyService.findAllByFarmId(id);
+
+        return R.ok().put("all",list);
+    }
+
 }

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

@@ -6,11 +6,7 @@ import java.util.Map;
 
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.huimv.management.entity.UnitEntity;
 import com.huimv.management.service.UnitService;
@@ -94,4 +90,11 @@ public class UnitController {
 
         return R.ok().put("all",list);
     }
+
+    @PostMapping("/findAllByPigstyId")
+    public R findAllByFarmId(Integer id){
+        List list = unitService.findAllByFarmId(id);
+
+        return R.ok().put("all",list);
+    }
 }

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

@@ -1,6 +1,7 @@
  package com.huimv.management.controller;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.Map;
 
 import io.swagger.annotations.Api;
@@ -92,6 +93,7 @@ public class YearPigBaseController {
 
         return R.ok();
     } */
+    //批量入栏
     @RequestMapping("/batchLairage")
     public R batchLairage(@RequestBody YearPigBaseEntity yearPigBase){
 
@@ -103,14 +105,21 @@ 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();
     }
 

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

@@ -0,0 +1,17 @@
+package com.huimv.management.dao;
+
+import com.huimv.management.entity.BreedParentsEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-17 13:44:45
+ */
+@Mapper
+public interface BreedParentsDao extends BaseMapper<BreedParentsEntity> {
+	
+}

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

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

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

@@ -3,6 +3,7 @@ package com.huimv.management.dao;
 import com.huimv.management.entity.YearPigBaseEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * 年猪基本
@@ -14,6 +15,8 @@ import org.apache.ibatis.annotations.Mapper;
  * mp提供了两套接口，分别是Mapper CRUD接口和Service CRUD接口。并且mp还提供了条件构造器Wrapper，可以方便地组装SQL语句中的WHERE条件。
  */
 @Mapper
+@Repository
 public interface YearPigBaseDao extends BaseMapper<YearPigBaseEntity> {
-	
+
+    void such(Integer[] ids);
 }

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

@@ -0,0 +1,96 @@
+package com.huimv.management.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-17 13:44:45
+ */
+@Data
+@TableName("breed_parents")
+public class BreedParentsEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 耳标号
+	 */
+	private String eartagNo;
+	/**
+	 * 牧场id
+	 */
+	private Integer farmId;
+	/**
+	 * 类型 1：种公猪，2：母猪，3：后备母猪
+	 */
+	private Integer type;
+	/**
+	 * 性别  1：公猪 2：母猪
+	 */
+	private Integer gender;
+	/**
+	 * 出生日期
+	 */
+	private Date birthDate;
+	/**
+	 * 血统(种类)
+	 */
+	private String blood;
+	/**
+	 * 原产地(来源)
+	 */
+	private String origin;
+	/**
+	 * 备注
+	 */
+	private String remark;
+	/**
+	 * 产仔窝数
+	 */
+	private Integer batchNp;
+	/**
+	 * 产仔总数量
+	 */
+	private Integer pigletTotal;
+	/**
+	 * PSY
+	 */
+	private Float psy;
+	/**
+	 * 数据是否有效
+	 */
+	private Integer effective;
+	/**
+	 * 后备字段
+	 */
+	private String field1;
+	/**
+	 * 后备字段
+	 */
+	private String field2;
+	/**
+	 * 后备字段
+	 */
+	private String field3;
+	/**
+	 * 后备字段
+	 */
+	private String field4;
+	/**
+	 * 后备字段
+	 */
+	private String field5;
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.management.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.management.entity.BreedParentsEntity;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-17 13:44:45
+ */
+public interface BreedParentsService extends IService<BreedParentsEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

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

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

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

@@ -21,5 +21,7 @@ public interface PigstyService extends IService<PigstyEntity> {
     List findAll();
 
     Integer delete(Integer[] ids);
+
+    List findAllByFarmId(Integer id);
 }
 

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

@@ -19,5 +19,7 @@ public interface UnitService extends IService<UnitEntity> {
     PageUtils queryPage(Map<String, Object> params);
 
     List findAll();
+
+    List findAllByFarmId(Integer id);
 }
 

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

@@ -18,5 +18,7 @@ public interface YearPigBaseService extends IService<YearPigBaseEntity> {
     PageUtils queryPage(Map<String, Object> params);
 
     void batchLairage(String[] eartags,Integer periodId);
+
+    void such(Integer[] ids);
 }
 

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

@@ -0,0 +1,33 @@
+package com.huimv.management.service.impl;
+
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.Query;
+
+import com.huimv.management.dao.BreedParentsDao;
+import com.huimv.management.entity.BreedParentsEntity;
+import com.huimv.management.service.BreedParentsService;
+
+
+@Service("breedParentsService")
+public class BreedParentsServiceImpl extends ServiceImpl<BreedParentsDao, BreedParentsEntity> implements BreedParentsService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        String farmId = (String)params.get("farmId");
+
+        QueryWrapper<BreedParentsEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_id",farmId);
+        IPage<BreedParentsEntity> page = this.page(
+                new Query<BreedParentsEntity>().getPage(params),
+                wrapper
+        );
+
+        return new PageUtils(page);
+    }
+
+}

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

@@ -1,12 +1,14 @@
 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.PeriodEntity;
 import com.huimv.management.entity.PeriodEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -30,6 +32,9 @@ 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");
+        lambdaQuery.eq(StringUtils.isNotBlank(farmId),PeriodEntity::getPigstyId,farmId);
+
         String keywords = (String) params.get("keywords");
         //没有参数
         if (keywords == null || keywords.equals("")){
@@ -37,6 +42,7 @@ public class PeriodServiceImpl extends ServiceImpl<PeriodDao, PeriodEntity> impl
                     new Query<PeriodEntity>().getPage(params),
                     new QueryWrapper<PeriodEntity>()
             );
+
             return new PageUtils(page);
         }
 
@@ -56,4 +62,16 @@ public class PeriodServiceImpl extends ServiceImpl<PeriodDao, PeriodEntity> impl
         return pastureEntities;
     }
 
+    @Override
+    public List findAllByFarmId(Integer id) {
+        LambdaQueryWrapper<PeriodEntity> lambdaQuery = Wrappers.lambdaQuery();
+        List<PeriodEntity> periodEntities = new ArrayList<>();
+        if (id != null){
+             lambdaQuery.eq(PeriodEntity::getPigstyId, id);
+            periodEntities = periodDao.selectList(lambdaQuery);
+        }
+
+        return periodEntities;
+    }
+
 }

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

@@ -76,6 +76,13 @@ public class PigstyServiceImpl extends ServiceImpl<PigstyDao, PigstyEntity> impl
        return 1;
     }
 
+    @Override
+    public List findAllByFarmId(Integer id) {
+        LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(PigstyEntity::getFarmId,id);
+        return  pigstyDao.selectList(lambdaQuery);
+    }
+
    /* @Override
     public PageUtils queryPage(Map<String, Object> params) {
 

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

@@ -65,4 +65,12 @@ public class UnitServiceImpl extends ServiceImpl<UnitDao, UnitEntity> implements
         return pastureEntities;
     }
 
+    @Override
+    public List findAllByFarmId(Integer id) {
+        LambdaQueryWrapper<UnitEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(UnitEntity::getPigstyId,id);
+        List<UnitEntity> pastureEntities = unitDao.selectList(lambdaQuery);
+        return pastureEntities;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.Map;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,6 +21,9 @@ 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) {
 //
@@ -115,4 +119,9 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         }
     }
 
+    @Override
+    public void such(Integer[] ids) {
+        pigBaseDao.such(ids);
+    }
+
 }

huimv-smart-management/src/main/resources/mapper/management/BreedParentsDao.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.huimv.management.dao.BreedParentsDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.management.entity.BreedParentsEntity" id="breedParentsMap">
+        <result property="id" column="id"/>
+        <result property="eartagNo" column="eartag_no"/>
+        <result property="type" column="type"/>
+        <result property="gender" column="gender"/>
+        <result property="birthDate" column="birth_date"/>
+        <result property="blood" column="blood"/>
+        <result property="origin" column="origin"/>
+        <result property="remark" column="remark"/>
+        <result property="batchNp" column="batch_np"/>
+        <result property="pigletTotal" column="piglet_total"/>
+        <result property="psy" column="psy"/>
+        <result property="effective" column="effective"/>
+        <result property="field1" column="field_1"/>
+        <result property="field2" column="field_2"/>
+        <result property="field3" column="field_3"/>
+        <result property="field4" column="field_4"/>
+        <result property="field5" column="field_5"/>
+    </resultMap>
+
+
+</mapper>

huimv-smart-management/src/main/resources/mapper/management/YearPigBaseDao.xml

@@ -23,5 +23,13 @@
         <result property="gmtModified" column="gmt_modified"/>
     </resultMap>
 
+  <update id="such">
+      update mgt_year_pig_base set out_fence_status=1 ,out_fence_time = now()
+      where id in
+      <foreach collection="ids" item="item" separator="," open="(" close=")">
+          #{item}
+      </foreach>
+  </update>
+
 
 </mapper>