更新了谱系部分

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

@@ -32,9 +32,6 @@ public class BaseFeedFormulaController {
     @Autowired
     private BaseFeedFormulaService baseFeedFormulaService;
 
-
-
-
     /**
      * 列表
      */
@@ -45,8 +42,6 @@ public class BaseFeedFormulaController {
     }
 
 
-
-
     /**
      * 信息
      */

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

@@ -0,0 +1,84 @@
+ 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.BreedFeedWeigheEntity;
+import com.huimv.management.service.BreedFeedWeigheService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.R;
+
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-17 13:27:04
+ */
+@Api(tags = "测定站数据上传表")
+@RestController
+@RequestMapping("management/breedfeedweighe")
+public class BreedFeedWeigheController {
+    @Autowired
+    private BreedFeedWeigheService breedFeedWeigheService;
+
+    /**
+     * 列表   可以做模糊查询
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = breedFeedWeigheService.queryPage(params);
+        return R.ok().put("page", page);
+    }
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		BreedFeedWeigheEntity breedFeedWeighe = breedFeedWeigheService.getById(id);
+
+        return R.ok().put("breedFeedWeighe", breedFeedWeighe);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody BreedFeedWeigheEntity breedFeedWeighe){
+		breedFeedWeigheService.save(breedFeedWeighe);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody BreedFeedWeigheEntity breedFeedWeighe){
+		breedFeedWeigheService.updateById(breedFeedWeighe);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		breedFeedWeigheService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

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.List;
 import java.util.Map;
 
 import io.swagger.annotations.Api;
@@ -43,6 +44,27 @@ public class YearPigBaseController {
     }
 
 
+
+
+    //查一只猪的三代
+    @RequestMapping("/listrelation")
+    public R listrelation(@RequestParam Map<String, Object> params){
+        //以当前猪耳标号为锚，查上下两代
+        List<Map> maps = yearPigBaseService.queryPageByRelationship(params);
+        return R.ok().put("page", maps);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * 信息
      */

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

@@ -3,6 +3,8 @@ 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.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 年猪基本
@@ -15,5 +17,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface YearPigBaseDao extends BaseMapper<YearPigBaseEntity> {
+
+
+
+    @Select("SELECT   *  FROM mgt_year_pig_base WHERE eartag =#{eartag} ORDER BY id DESC LIMIT 1")
+    YearPigBaseEntity  getPigeData(@Param("eartag") String eartag);
+
+
 	
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.management.entity.YearPigBaseEntity;
 
+import java.rmi.MarshalledObject;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,6 +19,19 @@ public interface YearPigBaseService extends IService<YearPigBaseEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 
+
+
+    //查一只猪的上下两代
+    List<Map> queryPageByRelationship(Map<String, Object> params);
+
+
+
+
+
+
+
+
+
     void batchLairage(String[] eartags,Integer periodId);
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/impl/BreedFeedWeigheServiceImpl.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 org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,11 +21,46 @@ public class BreedFeedWeigheServiceImpl extends ServiceImpl<BreedFeedWeigheDao,
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
+        LambdaQueryWrapper<BreedFeedWeigheEntity> lambdaQuery = Wrappers.lambdaQuery();
+
+//构建查询条件
+
+        //低频耳标号
+        String eartag = (String) params.get("eartag_no");
+        if (StringUtils.isNotEmpty(eartag)) {
+            lambdaQuery.like(BreedFeedWeigheEntity::getEartagNo,eartag);
+        }
+
+
+        //牧场名称
+        String sex = (String) params.get("farm_name");
+        if (StringUtils.isNotEmpty(sex)) {
+            lambdaQuery.eq(BreedFeedWeigheEntity::getFarmName,sex);
+        }
+
+
+        //品种
+        String breed = (String) params.get("pig_home_name");
+        if (StringUtils.isNotEmpty(breed)) {
+            lambdaQuery.eq(BreedFeedWeigheEntity::getPigHomeName,breed);
+        }
+
+
+        IPage<BreedFeedWeigheEntity> page = page(this.page(
+                new Query<BreedFeedWeigheEntity>().getPage(params)
+        ), lambdaQuery);
+
+
+
+
+
+       /*
         IPage<BreedFeedWeigheEntity> page = this.page(
                 new Query<BreedFeedWeigheEntity>().getPage(params),
                 new QueryWrapper<BreedFeedWeigheEntity>()
         );
-
+*/
         return new PageUtils(page);
     }
 

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

@@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.management.entity.YearPigBaseEntity;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -20,6 +24,18 @@ import com.huimv.management.service.YearPigBaseService;
 @Service("yearPigBaseService")
 public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigBaseEntity> implements YearPigBaseService {
 
+
+
+
+
+
+
+
+
+
+
+
+
 //    @Override
 //    public PageUtils queryPage(Map<String, Object> params) {
 //
@@ -45,6 +61,40 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
 
 
     @Override
+    public List<Map> queryPageByRelationship(Map<String, Object> params) {
+
+        String  eartag_no = "N92106";
+
+
+
+
+        Map  parentmap =   new HashMap();
+
+         parentmap.put("祖父",545);
+         parentmap.put("外公",545);
+
+
+
+
+
+        Map  grantparentmap =   new HashMap();
+        Map   childmap =   new HashMap();
+
+
+
+      List List1 = new ArrayList();
+      List1.add(childmap);
+
+        return List1;
+    }
+
+
+
+
+
+
+
+    @Override
     public PageUtils queryPage(Map<String, Object> params) {
 
         LambdaQueryWrapper<YearPigBaseEntity> lambdaQuery = Wrappers.lambdaQuery();
@@ -102,6 +152,7 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         ), lambdaQuery);
 
 
+
         return new PageUtils(page);
     }