Sfoglia il codice sorgente

增加了采食记录的字段

yang 4 anni fa
parent
commit
8a85ef01e7

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

@@ -1,112 +0,0 @@
- package com.huimv.management.controller;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Map;
-
-import com.huimv.management.util.Result;
-import com.huimv.management.util.StatusCode;
-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;
-
-import javax.servlet.http.HttpServletRequest;
-
- /**
- * 
- *
- * @author yinhao
- * @email yinhao@163.com
- * @date 2021-06-15 09:49:14
- */
-
- @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();
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

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

@@ -44,6 +44,7 @@ public class HealthMedicalRecordController {
     }
 
 
+
     /**
      * 信息
      */
@@ -67,6 +68,8 @@ public class HealthMedicalRecordController {
         return R.ok();
     }
 
+
+
     /**
      * 修改
      */
@@ -77,6 +80,7 @@ public class HealthMedicalRecordController {
         return R.ok();
     }
 
+
     /**
      * 删除
      */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/dao/BreedFeedWeigheDao.java

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
  * 
  * @author yinhao
  * @email yinhao@163.com
- * @date 2021-06-15 09:49:14
+ * @date 2021-06-17 13:27:04
  */
 @Mapper
 public interface BreedFeedWeigheDao extends BaseMapper<BreedFeedWeigheEntity> {

+ 39 - 7
huimv-smart-management/src/main/java/com/huimv/management/entity/BreedFeedWeigheEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * 
  * @author yinhao
  * @email yinhao@163.com
- * @date 2021-06-15 09:49:14
+ * @date 2021-06-17 13:27:04
  */
 @Data
 @TableName("breed_feed_weighe")
@@ -20,29 +20,61 @@ public class BreedFeedWeigheEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 
+	 * 主键id
 	 */
 	@TableId
 	private Integer id;
 	/**
-	 * 
+	 * 低频耳标号
 	 */
 	private String eartagNo;
 	/**
-	 * 
+	 * 上传时间
 	 */
 	private Date date;
 	/**
-	 * 
+	 * 采食量
 	 */
 	private Float feedIntake;
 	/**
-	 * 
+	 * 当前重量
 	 */
 	private Float weight;
 	/**
-	 * 
+	 * 体重增加量
 	 */
 	private Float weightIncrease;
+	/**
+	 * 牧场id
+	 */
+	private Integer farmId;
+	/**
+	 * 牧场名称
+	 */
+	private String farmName;
+	/**
+	 * 猪舍id
+	 */
+	private Integer pigHomeId;
+	/**
+	 * 猪舍名称
+	 */
+	private String pigHomeName;
+	/**
+	 * 单元id
+	 */
+	private Integer unitId;
+	/**
+	 * 单元名称
+	 */
+	private String unitName;
+	/**
+	 * 备注
+	 */
+	private String remark;
+	/**
+	 * 备注2
+	 */
+	private String remark1;
 
 }

+ 1 - 9
huimv-smart-management/src/main/java/com/huimv/management/service/BreedFeedWeigheService.java

@@ -11,18 +11,10 @@ import java.util.Map;
  *
  * @author yinhao
  * @email yinhao@163.com
- * @date 2021-06-15 09:49:14
+ * @date 2021-06-17 13:27:04
  */
 public interface BreedFeedWeigheService extends IService<BreedFeedWeigheEntity> {
 
-
-
-
-
-
-
-
-
     PageUtils queryPage(Map<String, Object> params);
 }
 

+ 0 - 23
huimv-smart-management/src/main/java/com/huimv/management/service/impl/BreedFeedWeigheServiceImpl.java

@@ -1,8 +1,6 @@
 package com.huimv.management.service.impl;
 
 import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,11 +16,6 @@ import com.huimv.management.service.BreedFeedWeigheService;
 @Service("breedFeedWeigheService")
 public class BreedFeedWeigheServiceImpl extends ServiceImpl<BreedFeedWeigheDao, BreedFeedWeigheEntity> implements BreedFeedWeigheService {
 
-
-
-
-
-
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<BreedFeedWeigheEntity> page = this.page(
@@ -33,20 +26,4 @@ public class BreedFeedWeigheServiceImpl extends ServiceImpl<BreedFeedWeigheDao,
         return new PageUtils(page);
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 }