Merge remote-tracking branch 'origin/master'

huimv-farm-eartag/src/main/java/com/huimv/eartag/HuimvEartagApplication.java

@@ -1,6 +1,7 @@
 package com.huimv.eartag;
 
 import com.huimv.eartag.server.EartagServer2;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ApplicationContext;
@@ -14,6 +15,7 @@ import org.springframework.context.ApplicationContext;
  * @Create : 2020-12-25
  **/
 @SpringBootApplication
+@MapperScan("com.huimv.eartag.mapper")
 public class HuimvEartagApplication {
     public static void main(String[] args) throws InterruptedException {
 //        SpringApplication.run(HuimvEartagApplication.class, args);

huimv-farm-eartag/src/main/java/com/huimv/eartag/controller/EartagDataController.java

@@ -0,0 +1,37 @@
+package com.huimv.eartag.controller;
+
+
+import com.huimv.common.utils.Result;
+import com.huimv.eartag.service.IEartagDataService;
+import com.huimv.eartag.service.IFeedEartagFlowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@RestController
+@RequestMapping("/eartagData")
+public class EartagDataController {
+    @Autowired
+    IEartagDataService eartagDataService;
+
+    @GetMapping("/getTemp")
+    public Result getTemp(@RequestParam(name = "earmark" ,required = false) String earmark) {
+        return eartagDataService.getTemp(earmark);
+    }
+
+    @GetMapping("/getAct")
+    public Result getAct(@RequestParam(name = "earmark" ,required = false) String earmark) {
+        return eartagDataService.getAct(earmark);
+    }
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/controller/FeedAncestryController.java

@@ -0,0 +1,56 @@
+package com.huimv.eartag.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.eartag.entity.FeedAncestry;
+import com.huimv.eartag.service.IFeedAncestryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 谱系管理 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@RestController
+@RequestMapping("/feedAncestry")
+public class FeedAncestryController {
+    @Autowired
+    IFeedAncestryService feedAncestryService;
+
+
+    @PostMapping("/add")
+    public Result add(@RequestBody FeedAncestry baseFace) {
+        feedAncestryService.save(baseFace);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(name = "id") String id) {
+
+        feedAncestryService.removeById(id);
+
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody  FeedAncestry baseFace) {
+
+        feedAncestryService.updateById(baseFace);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @GetMapping("/list")
+    public Result list( ) {
+
+        return new Result(ResultCode.SUCCESS, feedAncestryService.list());
+    }
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/controller/FeedBuildController.java

@@ -0,0 +1,55 @@
+package com.huimv.eartag.controller;
+
+
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.eartag.entity.FeedAncestry;
+import com.huimv.eartag.entity.FeedBuild;
+import com.huimv.eartag.service.IFeedAncestryService;
+import com.huimv.eartag.service.IFeedBuildService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 栋舍管理 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@RestController
+@RequestMapping("/feedBuild")
+public class FeedBuildController {
+    @Autowired
+    IFeedBuildService feedBuildService;
+
+
+    @PostMapping("/add")
+    public Result add(@RequestBody FeedBuild baseFace) {
+        feedBuildService.save(baseFace);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(name = "id") String id) {
+
+        feedBuildService.removeById(id);
+
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody  FeedBuild baseFace) {
+
+        feedBuildService.updateById(baseFace);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @GetMapping("/list")
+    public Result list( ) {
+
+        return new Result(ResultCode.SUCCESS, feedBuildService.list());
+    }
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/controller/FeedBuildCountController.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 栋舍统计数据 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@RestController
+@RequestMapping("/feedBuildCount")
+public class FeedBuildCountController {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/controller/FeedEartagFlowController.java

@@ -0,0 +1,28 @@
+package com.huimv.eartag.controller;
+
+
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.eartag.service.IFeedEartagFlowService;
+import com.huimv.eartag.service.IFeedEnvTempFlowService;
+import com.huimv.eartag.service.IFeedFowlRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 耳标流水数据表 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@RestController
+@RequestMapping("/feedEartagFlow")
+public class FeedEartagFlowController {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/controller/FeedEnvTempFlowController.java

@@ -0,0 +1,28 @@
+package com.huimv.eartag.controller;
+
+
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.eartag.entity.FeedEnvTempFlow;
+import com.huimv.eartag.entity.FeedStage;
+import com.huimv.eartag.service.IFeedEnvTempFlowService;
+import com.huimv.eartag.service.IFeedStageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 环境温度流水记录 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@RestController
+@RequestMapping("/feedEnvTempFlow")
+public class FeedEnvTempFlowController {
+
+
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/controller/FeedFowlRecordController.java

@@ -0,0 +1,55 @@
+package com.huimv.eartag.controller;
+
+
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.eartag.entity.FeedEnvTempFlow;
+import com.huimv.eartag.entity.FeedFowlRecord;
+import com.huimv.eartag.service.IFeedEnvTempFlowService;
+import com.huimv.eartag.service.IFeedFowlRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 牛只档案 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@RestController
+@RequestMapping("/feedFowlRecord")
+public class FeedFowlRecordController {
+    @Autowired
+    IFeedFowlRecordService feedFowlRecordService;
+
+
+    @PostMapping("/add")
+    public Result add(@RequestBody FeedFowlRecord baseFace) {
+        feedFowlRecordService.save(baseFace);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(name = "id") String id) {
+
+        feedFowlRecordService.removeById(id);
+
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody  FeedFowlRecord baseFace) {
+
+        feedFowlRecordService.updateById(baseFace);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @GetMapping("/list")
+    public Result list(@RequestParam(name = "bulidCode",required = false) String bulidCode) {
+
+        return new Result(ResultCode.SUCCESS, feedFowlRecordService.listAll(bulidCode));
+    }
+}

ss/src/main/java/com/huimv/video/controller/WarningInfoController.java

@@ -1,4 +1,4 @@
-package com.huimv.video.controller;
+package com.huimv.eartag.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -7,14 +7,14 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 存栏转舍记录 前端控制器
  * </p>
  *
  * @author author
- * @since 2022-03-21
+ * @since 2022-06-01
  */
 @RestController
-@RequestMapping("/warning-info")
-public class WarningInfoController {
+@RequestMapping("/feedMoveBuild")
+public class FeedMoveBuildController {
 
 }

huimv-farm-eartag/src/main/java/com/huimv/eartag/controller/FeedStageController.java

@@ -0,0 +1,55 @@
+package com.huimv.eartag.controller;
+
+
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.eartag.entity.FeedBuild;
+import com.huimv.eartag.entity.FeedStage;
+import com.huimv.eartag.service.IFeedBuildService;
+import com.huimv.eartag.service.IFeedStageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 阶段管理 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@RestController
+@RequestMapping("/feedStage")
+public class FeedStageController {
+    @Autowired
+    IFeedStageService feedStageService;
+
+
+    @PostMapping("/add")
+    public Result add(@RequestBody FeedStage baseFace) {
+        feedStageService.save(baseFace);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(name = "id") String id) {
+
+        feedStageService.removeById(id);
+
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody  FeedStage baseFace) {
+
+        feedStageService.updateById(baseFace);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @GetMapping("/list")
+    public Result list( ) {
+
+        return new Result(ResultCode.SUCCESS, feedStageService.list());
+    }
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/entity/EartagData.java

@@ -0,0 +1,74 @@
+package com.huimv.eartag.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("eartag_data")
+public class EartagData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String cmdHeader;
+
+    private String device;
+
+    private String earmark;
+
+    private Integer bat;
+
+    private Integer earTemp;
+
+    private Float earTemp1;
+
+    private Integer envTemp;
+
+    private Float envTemp1;
+
+    private Integer act;
+
+    private Integer act1;
+
+    private Integer signal1;
+
+    private String askTime;
+
+    private String other;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date addTime;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createDate;
+
+    private String farmId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date askDate;
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/entity/FeedAncestry.java

@@ -0,0 +1,56 @@
+package com.huimv.eartag.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 谱系管理
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("feed_ancestry")
+public class FeedAncestry implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 家禽编号
+     */
+    private String fowlCode;
+
+    /**
+     * 性别
+     */
+    private Integer fowlGender;
+
+    /**
+     * 品种
+     */
+    private String fowlType;
+
+    /**
+     * 父系编号
+     */
+    private String fatherCode;
+
+    /**
+     * 母系编号
+     */
+    private byte[] motherCode;
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/entity/FeedBuild.java

@@ -0,0 +1,40 @@
+package com.huimv.eartag.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 栋舍管理
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("feed_build")
+public class FeedBuild implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 逻辑主键
+     */
+    private String buildCode;
+
+    private String buildName;
+
+    private String stageCode;
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/entity/FeedBuildCount.java

@@ -0,0 +1,62 @@
+package com.huimv.eartag.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 栋舍统计数据
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("feed_build_count")
+public class FeedBuildCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String buildCode;
+
+    /**
+     * 1：雄性 2：雌性
+     */
+    private Integer fowlGender;
+
+    private String fowlType;
+
+    /**
+     * 最新环境温度
+     */
+    private Float envTemp;
+
+    /**
+     * 最新群体温度
+     */
+    private Float aveTemp;
+
+    /**
+     * 当天统计
+     */
+    private Integer abnormity;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date updateDate;
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/entity/FeedEartagFlow.java

@@ -0,0 +1,118 @@
+package com.huimv.eartag.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 耳标流水数据表
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("feed_eartag_flow")
+public class FeedEartagFlow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 命令头
+     */
+    private String cmdHeader;
+
+    /**
+     * 采集器ID
+     */
+    private String device;
+
+    /**
+     * 耳标号
+     */
+    private String earmark;
+
+    /**
+     * 电池电量
+     */
+    private Integer bat;
+
+    /**
+     * 耳标温度
+     */
+    private Integer earTemp;
+
+    /**
+     * 耳标温度
+     */
+    private Float earTemp1;
+
+    /**
+     * 环境温度
+     */
+    private Integer envTemp;
+
+    /**
+     * 环境温度
+     */
+    private Float envTemp1;
+
+    /**
+     * 运动量
+     */
+    private Integer act;
+
+    /**
+     * 信号强度
+     */
+    private Integer signal;
+
+    /**
+     * 采集时间
+     */
+    private String askTime;
+
+    /**
+     * 预留字段
+     */
+    private String other;
+
+    /**
+     * 入库时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date addTime;
+
+    /**
+     * 牧场id
+     */
+    private String farmId;
+
+    /**
+     * 创建日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createDate;
+
+    /**
+     * 采集日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date askDate;
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/entity/FeedEnvTempFlow.java

@@ -0,0 +1,59 @@
+package com.huimv.eartag.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 环境温度流水记录
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("feed_env_temp_flow")
+public class FeedEnvTempFlow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private String deviceCode;
+
+    /**
+     * 原始温度
+     */
+    private Integer temp1;
+
+    /**
+     * 处理后温度
+     */
+    private Float temp2;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date askTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date addTime;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date askDate;
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/entity/FeedFowlRecord.java

@@ -0,0 +1,102 @@
+package com.huimv.eartag.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 牛只档案
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("feed_fowl_record")
+public class FeedFowlRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 家禽编号
+     */
+    private String fowlCode;
+
+    /**
+     * 来源
+     */
+    private String source;
+
+    /**
+     * 父系编号
+     */
+    private String fatherCode;
+
+    /**
+     * 母系编号
+     */
+    private String motherCode;
+
+    /**
+     * 耳标号
+     */
+    private String earmark;
+
+    /**
+     * 打耳标日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date wearDate;
+
+    /**
+     * 打耳标日龄
+     */
+    private Integer birthDay;
+
+    /**
+     * 日龄
+     */
+    private Integer day;
+
+    /**
+     * 个体温度
+     */
+    private Float earTemp;
+
+    /**
+     * 群体温度
+     */
+    private Float aveTemp;
+
+    /**
+     * 环境温度
+     */
+    private Float envTemp;
+
+    /**
+     * 栋舍编号
+     */
+    private String buildCode;
+
+    /**
+     * 栋舍名称
+     */
+    private String buildName;
+    private Integer status;
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/entity/FeedMoveBuild.java

@@ -0,0 +1,44 @@
+package com.huimv.eartag.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 存栏转舍记录
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("feed_move_build")
+public class FeedMoveBuild implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String fowlCode;
+
+    private String buildCode;
+
+    private String buildName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date moveDate;
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/entity/FeedStage.java

@@ -0,0 +1,35 @@
+package com.huimv.eartag.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 阶段管理
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("feed_stage")
+public class FeedStage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String stageCode;
+
+    private String stageName;
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/entity/dto/EartagDataDto.java

@@ -0,0 +1,13 @@
+package com.huimv.eartag.entity.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+@Data
+public class EartagDataDto {
+
+    @JsonFormat(pattern = "MM-dd",timezone = "GMT+8")
+    private String time;
+    private String value;
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/mapper/EartagDataMapper.java

@@ -0,0 +1,24 @@
+package com.huimv.eartag.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.eartag.entity.EartagData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.eartag.entity.dto.EartagDataDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface EartagDataMapper extends BaseMapper<EartagData> {
+
+
+    List<EartagDataDto> getAct(@Param(Constants.WRAPPER) QueryWrapper<EartagData> wrapper);
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/mapper/FeedAncestryMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.mapper;
+
+import com.huimv.eartag.entity.FeedAncestry;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 谱系管理 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface FeedAncestryMapper extends BaseMapper<FeedAncestry> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/mapper/FeedBuildCountMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.mapper;
+
+import com.huimv.eartag.entity.FeedBuildCount;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 栋舍统计数据 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface FeedBuildCountMapper extends BaseMapper<FeedBuildCount> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/mapper/FeedBuildMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.mapper;
+
+import com.huimv.eartag.entity.FeedBuild;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 栋舍管理 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface FeedBuildMapper extends BaseMapper<FeedBuild> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/mapper/FeedEartagFlowMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.mapper;
+
+import com.huimv.eartag.entity.FeedEartagFlow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 耳标流水数据表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface FeedEartagFlowMapper extends BaseMapper<FeedEartagFlow> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/mapper/FeedEnvTempFlowMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.mapper;
+
+import com.huimv.eartag.entity.FeedEnvTempFlow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 环境温度流水记录 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface FeedEnvTempFlowMapper extends BaseMapper<FeedEnvTempFlow> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/mapper/FeedFowlRecordMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.mapper;
+
+import com.huimv.eartag.entity.FeedFowlRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 牛只档案 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface FeedFowlRecordMapper extends BaseMapper<FeedFowlRecord> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/mapper/FeedMoveBuildMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.mapper;
+
+import com.huimv.eartag.entity.FeedMoveBuild;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 存栏转舍记录 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface FeedMoveBuildMapper extends BaseMapper<FeedMoveBuild> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/mapper/FeedStageMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.mapper;
+
+import com.huimv.eartag.entity.FeedStage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 阶段管理 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface FeedStageMapper extends BaseMapper<FeedStage> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/IEartagDataService.java

@@ -0,0 +1,19 @@
+package com.huimv.eartag.service;
+
+import com.huimv.common.utils.Result;
+import com.huimv.eartag.entity.EartagData;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface IEartagDataService extends IService<EartagData> {
+    Result getTemp(String earmark);
+
+    Result getAct(String earmark);
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/IFeedAncestryService.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.service;
+
+import com.huimv.eartag.entity.FeedAncestry;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 谱系管理 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface IFeedAncestryService extends IService<FeedAncestry> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/IFeedBuildCountService.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.service;
+
+import com.huimv.eartag.entity.FeedBuildCount;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 栋舍统计数据 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface IFeedBuildCountService extends IService<FeedBuildCount> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/IFeedBuildService.java

@@ -0,0 +1,19 @@
+package com.huimv.eartag.service;
+
+import com.huimv.eartag.entity.FeedBuild;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 栋舍管理 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface IFeedBuildService extends IService<FeedBuild> {
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/IFeedEartagFlowService.java

@@ -0,0 +1,18 @@
+package com.huimv.eartag.service;
+
+import com.huimv.common.utils.Result;
+import com.huimv.eartag.entity.FeedEartagFlow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 耳标流水数据表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface IFeedEartagFlowService extends IService<FeedEartagFlow> {
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/IFeedEnvTempFlowService.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.service;
+
+import com.huimv.eartag.entity.FeedEnvTempFlow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 环境温度流水记录 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface IFeedEnvTempFlowService extends IService<FeedEnvTempFlow> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/IFeedFowlRecordService.java

@@ -0,0 +1,21 @@
+package com.huimv.eartag.service;
+
+import com.huimv.common.utils.Result;
+import com.huimv.eartag.entity.FeedFowlRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 牛只档案 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface IFeedFowlRecordService extends IService<FeedFowlRecord> {
+
+    Map listAll(String bulidCode);
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/IFeedMoveBuildService.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.service;
+
+import com.huimv.eartag.entity.FeedMoveBuild;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 存栏转舍记录 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface IFeedMoveBuildService extends IService<FeedMoveBuild> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/IFeedStageService.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag.service;
+
+import com.huimv.eartag.entity.FeedStage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 阶段管理 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+public interface IFeedStageService extends IService<FeedStage> {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/impl/EartagDataServiceImpl.java

@@ -0,0 +1,48 @@
+package com.huimv.eartag.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.eartag.dao.entity.EartagDataEntity;
+import com.huimv.eartag.entity.EartagData;
+import com.huimv.eartag.entity.dto.EartagDataDto;
+import com.huimv.eartag.mapper.EartagDataMapper;
+import com.huimv.eartag.service.IEartagDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Service
+public class EartagDataServiceImpl extends ServiceImpl<EartagDataMapper, EartagData> implements IEartagDataService {
+    @Autowired
+    EartagDataMapper eartagDataMapper;
+
+    @Override
+    public Result getTemp(String earmark) {
+
+        return new Result(ResultCode.SUCCESS,this.list(new QueryWrapper<EartagData>().ge("ask_time", DateUtil.beginOfDay(new Date()))));
+    }
+
+    @Override
+    public Result getAct(String earmark) {
+        Date date = new Date();
+        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
+        wrapper.eq("earmark",earmark);
+        wrapper.between("ask_time",DateUtil.beginOfDay(DateUtil.offsetDay(date,-7)),date);
+        wrapper.groupBy("`time`");
+        List<EartagDataDto> list =   eartagDataMapper.getAct(wrapper);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/impl/FeedAncestryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag.service.impl;
+
+import com.huimv.eartag.entity.FeedAncestry;
+import com.huimv.eartag.mapper.FeedAncestryMapper;
+import com.huimv.eartag.service.IFeedAncestryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 谱系管理 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Service
+public class FeedAncestryServiceImpl extends ServiceImpl<FeedAncestryMapper, FeedAncestry> implements IFeedAncestryService {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/impl/FeedBuildCountServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag.service.impl;
+
+import com.huimv.eartag.entity.FeedBuildCount;
+import com.huimv.eartag.mapper.FeedBuildCountMapper;
+import com.huimv.eartag.service.IFeedBuildCountService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 栋舍统计数据 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Service
+public class FeedBuildCountServiceImpl extends ServiceImpl<FeedBuildCountMapper, FeedBuildCount> implements IFeedBuildCountService {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/impl/FeedBuildServiceImpl.java

@@ -0,0 +1,24 @@
+package com.huimv.eartag.service.impl;
+
+import com.huimv.eartag.entity.FeedBuild;
+import com.huimv.eartag.mapper.FeedBuildMapper;
+import com.huimv.eartag.service.IFeedBuildService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * 栋舍管理 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Service
+public class FeedBuildServiceImpl extends ServiceImpl<FeedBuildMapper, FeedBuild> implements IFeedBuildService {
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/impl/FeedEartagFlowServiceImpl.java

@@ -0,0 +1,27 @@
+package com.huimv.eartag.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.eartag.dao.entity.EartagDataEntity;
+import com.huimv.eartag.entity.FeedEartagFlow;
+import com.huimv.eartag.mapper.FeedEartagFlowMapper;
+import com.huimv.eartag.service.IFeedEartagFlowService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 耳标流水数据表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Service
+public class FeedEartagFlowServiceImpl extends ServiceImpl<FeedEartagFlowMapper, FeedEartagFlow> implements IFeedEartagFlowService {
+
+
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/impl/FeedEnvTempFlowServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag.service.impl;
+
+import com.huimv.eartag.entity.FeedEnvTempFlow;
+import com.huimv.eartag.mapper.FeedEnvTempFlowMapper;
+import com.huimv.eartag.service.IFeedEnvTempFlowService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 环境温度流水记录 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Service
+public class FeedEnvTempFlowServiceImpl extends ServiceImpl<FeedEnvTempFlowMapper, FeedEnvTempFlow> implements IFeedEnvTempFlowService {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/impl/FeedFowlRecordServiceImpl.java

@@ -0,0 +1,56 @@
+package com.huimv.eartag.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.common.utils.Result;
+import com.huimv.eartag.entity.FeedBuild;
+import com.huimv.eartag.entity.FeedBuildCount;
+import com.huimv.eartag.entity.FeedFowlRecord;
+import com.huimv.eartag.mapper.FeedBuildCountMapper;
+import com.huimv.eartag.mapper.FeedBuildMapper;
+import com.huimv.eartag.mapper.FeedFowlRecordMapper;
+import com.huimv.eartag.service.IFeedFowlRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections.map.HashedMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 牛只档案 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Service
+public class FeedFowlRecordServiceImpl extends ServiceImpl<FeedFowlRecordMapper, FeedFowlRecord> implements IFeedFowlRecordService {
+
+
+
+    @Autowired
+    private FeedBuildCountMapper feedBuildCountMapper;
+
+    @Override
+    public Map listAll(String bulidCode) {
+        Map<String,Object> endMap = new HashedMap();
+
+        QueryWrapper<FeedFowlRecord> wrapper = new QueryWrapper<>();
+        if (StringUtils.isBlank(bulidCode)){
+            bulidCode="D001";
+        }
+
+        wrapper.eq("build_code",bulidCode);
+        endMap.put("list",this.list(wrapper));
+        QueryWrapper<FeedBuildCount> countQueryWrapper = new QueryWrapper<>();
+        countQueryWrapper.orderByDesc("update_date").eq("build_code",bulidCode).last("limit 1");
+        FeedBuildCount feedBuildCount = feedBuildCountMapper.selectOne(countQueryWrapper);
+        endMap.put("bulidCount",feedBuildCount);
+
+        return endMap;
+    }
+
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/impl/FeedMoveBuildServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag.service.impl;
+
+import com.huimv.eartag.entity.FeedMoveBuild;
+import com.huimv.eartag.mapper.FeedMoveBuildMapper;
+import com.huimv.eartag.service.IFeedMoveBuildService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 存栏转舍记录 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Service
+public class FeedMoveBuildServiceImpl extends ServiceImpl<FeedMoveBuildMapper, FeedMoveBuild> implements IFeedMoveBuildService {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/impl/FeedStageServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag.service.impl;
+
+import com.huimv.eartag.entity.FeedStage;
+import com.huimv.eartag.mapper.FeedStageMapper;
+import com.huimv.eartag.service.IFeedStageService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 阶段管理 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-06-01
+ */
+@Service
+public class FeedStageServiceImpl extends ServiceImpl<FeedStageMapper, FeedStage> implements IFeedStageService {
+
+}

huimv-farm-eartag/src/main/java/com/huimv/eartag/utils/MathUtil.java

@@ -52,7 +52,7 @@ public class MathUtil {
         NumberFormat numberFormat = NumberFormat.getInstance();
         // 设置精确到小数点后2位
         numberFormat.setMaximumFractionDigits(scale);
-        float temp2 = Float.parseFloat(new BigDecimal(temp).multiply(new BigDecimal(0.1)).toString());
+        float temp2 = Float.parseFloat(new BigDecimal(temp).multiply(new BigDecimal(0.01)).toString());
         return numberFormat.format(temp2);
     }
 

huimv-farm-eartag/src/main/resources/application-dev.yml

@@ -1,12 +1,12 @@
 server:
-  port: 8090
+  port: 8093
 
 spring:
   application:
     name: huimv-farm-eartag-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv_farm_eartag?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv_farm_eartag?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-farm-eartag/src/main/resources/com/huimv/eartag/mapper/EartagDataMapper.xml

@@ -0,0 +1,33 @@
+<?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.eartag.mapper.EartagDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag.entity.EartagData">
+        <id column="id" property="id" />
+        <result column="cmd_header" property="cmdHeader" />
+        <result column="device" property="device" />
+        <result column="earmark" property="earmark" />
+        <result column="bat" property="bat" />
+        <result column="ear_temp" property="earTemp" />
+        <result column="ear_temp1" property="earTemp1" />
+        <result column="env_temp" property="envTemp" />
+        <result column="env_temp1" property="envTemp1" />
+        <result column="act" property="act" />
+        <result column="act1" property="act1" />
+        <result column="signal1" property="signal1" />
+        <result column="ask_time" property="askTime" />
+        <result column="other" property="other" />
+        <result column="add_time" property="addTime" />
+        <result column="create_date" property="createDate" />
+        <result column="farm_id" property="farmId" />
+        <result column="ask_date" property="askDate" />
+    </resultMap>
+    <select id="getAct" resultType="com.huimv.eartag.entity.dto.EartagDataDto">
+
+    SELECT SUM(act1) `value` ,DATE_FORMAT(  ask_date, '%m-%d' ) `time` FROM `eartag_data`
+     ${ew.customSqlSegment}
+
+    </select>
+
+</mapper>

huimv-farm-eartag/src/main/resources/com/huimv/eartag/mapper/FeedAncestryMapper.xml

@@ -0,0 +1,15 @@
+<?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.eartag.mapper.FeedAncestryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag.entity.FeedAncestry">
+        <id column="id" property="id" />
+        <result column="fowl_code" property="fowlCode" />
+        <result column="fowl_gender" property="fowlGender" />
+        <result column="fowl_type" property="fowlType" />
+        <result column="father_code" property="fatherCode" />
+        <result column="mother_code" property="motherCode" />
+    </resultMap>
+
+</mapper>

huimv-farm-eartag/src/main/resources/com/huimv/eartag/mapper/FeedBuildCountMapper.xml

@@ -0,0 +1,17 @@
+<?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.eartag.mapper.FeedBuildCountMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag.entity.FeedBuildCount">
+        <id column="id" property="id" />
+        <result column="build_code" property="buildCode" />
+        <result column="fowl_gender" property="fowlGender" />
+        <result column="fowl_type" property="fowlType" />
+        <result column="env_temp" property="envTemp" />
+        <result column="ave_temp" property="aveTemp" />
+        <result column="abnormity" property="abnormity" />
+        <result column="update_date" property="updateDate" />
+    </resultMap>
+
+</mapper>

huimv-farm-eartag/src/main/resources/com/huimv/eartag/mapper/FeedBuildMapper.xml

@@ -0,0 +1,12 @@
+<?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.eartag.mapper.FeedBuildMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag.entity.FeedBuild">
+        <id column="id" property="id" />
+        <result column="build_code" property="buildCode" />
+        <result column="build_name" property="buildName" />
+    </resultMap>
+
+</mapper>

huimv-farm-eartag/src/main/resources/com/huimv/eartag/mapper/FeedEartagFlowMapper.xml

@@ -0,0 +1,26 @@
+<?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.eartag.mapper.FeedEartagFlowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag.entity.FeedEartagFlow">
+        <id column="id" property="id" />
+        <result column="cmd_header" property="cmdHeader" />
+        <result column="device" property="device" />
+        <result column="earmark" property="earmark" />
+        <result column="bat" property="bat" />
+        <result column="ear_temp" property="earTemp" />
+        <result column="ear_temp1" property="earTemp1" />
+        <result column="env_temp" property="envTemp" />
+        <result column="env_temp1" property="envTemp1" />
+        <result column="act" property="act" />
+        <result column="signal" property="signal" />
+        <result column="ask_time" property="askTime" />
+        <result column="other" property="other" />
+        <result column="add_time" property="addTime" />
+        <result column="farm_id" property="farmId" />
+        <result column="create_date" property="createDate" />
+        <result column="ask_date" property="askDate" />
+    </resultMap>
+
+</mapper>

huimv-farm-eartag/src/main/resources/com/huimv/eartag/mapper/FeedEnvTempFlowMapper.xml

@@ -0,0 +1,17 @@
+<?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.eartag.mapper.FeedEnvTempFlowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag.entity.FeedEnvTempFlow">
+        <result column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="temp1" property="temp1" />
+        <result column="temp2" property="temp2" />
+        <result column="ask_time" property="askTime" />
+        <result column="add_time" property="addTime" />
+        <result column="create_date" property="createDate" />
+        <result column="ask_date" property="askDate" />
+    </resultMap>
+
+</mapper>

huimv-farm-eartag/src/main/resources/com/huimv/eartag/mapper/FeedFowlRecordMapper.xml

@@ -0,0 +1,23 @@
+<?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.eartag.mapper.FeedFowlRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag.entity.FeedFowlRecord">
+        <id column="id" property="id" />
+        <result column="fowl_code" property="fowlCode" />
+        <result column="source" property="source" />
+        <result column="father_code" property="fatherCode" />
+        <result column="mother_code" property="motherCode" />
+        <result column="earmark" property="earmark" />
+        <result column="wear_date" property="wearDate" />
+        <result column="birth_day" property="birthDay" />
+        <result column="day" property="day" />
+        <result column="ear_temp" property="earTemp" />
+        <result column="ave_temp" property="aveTemp" />
+        <result column="env_temp" property="envTemp" />
+        <result column="build_code" property="buildCode" />
+        <result column="build_name" property="buildName" />
+    </resultMap>
+
+</mapper>

huimv-farm-eartag/src/main/resources/com/huimv/eartag/mapper/FeedMoveBuildMapper.xml

@@ -0,0 +1,14 @@
+<?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.eartag.mapper.FeedMoveBuildMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag.entity.FeedMoveBuild">
+        <id column="id" property="id" />
+        <result column="fowl_code" property="fowlCode" />
+        <result column="build_code" property="buildCode" />
+        <result column="build_name" property="buildName" />
+        <result column="move_date" property="moveDate" />
+    </resultMap>
+
+</mapper>

huimv-farm-eartag/src/main/resources/com/huimv/eartag/mapper/FeedStageMapper.xml

@@ -0,0 +1,12 @@
+<?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.eartag.mapper.FeedStageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag.entity.FeedStage">
+        <id column="id" property="id" />
+        <result column="stage_code" property="stageCode" />
+        <result column="stage_name" property="stageName" />
+    </resultMap>
+
+</mapper>

huimv-farm-environ/src/main/java/com/huimv/environ/HuimvEnvironApplication.java

@@ -16,7 +16,7 @@ import org.springframework.context.annotation.Import;
  * @Create : 2020-12-25
  **/
 @SpringBootApplication
-@MapperScan("com.huimv.environ.*.mapper")
+@MapperScan("com.huimv.environ.eco.mapper")
 @Import(InterceptorConfig.class)
 public class HuimvEnvironApplication {
     public static void main(String[] args) {

huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/BaseFloorController.java

@@ -25,7 +25,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/floor")
-public class BaseFloorController {
+public class  BaseFloorController {
 
     @Autowired
     private IBaseFloorService baseFloorService;

huimv-farm-environ/src/main/resources/com/huimv/environ/eco/mapper/ScreenGroupMapper.xml

@@ -11,8 +11,9 @@
                 ORDER BY create_time ASC
 
     </select>
-    <select id="listAllWaterAndPower" resultType="com.huimv.environ.eco.entity.dto.WaterAndPower">
 
+
+    <select id="listAllWaterAndPower" resultType="com.huimv.environ.eco.entity.dto.WaterAndPower">
           SELECT  ROUND(SUM(`increase_value`),2) water
         FROM   `sys_month_water`
         WHERE farm_id = #{farmId}

huimv-farm-gateway/src/main/resources/application-dev.yml

@@ -38,6 +38,12 @@ spring:
             - Path=/receiver/**
           filters:
             - StripPrefix=1
+        - id: eartag
+          uri: http://127.0.0.1:8093
+          predicates:
+            - Path=/eartag/**
+          filters:
+            - StripPrefix=1
 
 
 logging:

huimv-farm-produce/src/main/java/com/huimv/produce/warning/service/impl/BaseWarningInfoServiceImpl.java

@@ -233,7 +233,7 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
         }
 //        演示版
 //        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)),wrapper);
-        wrapper.last("limit 0,16");
+        wrapper.last("limit 0,9");
         return new Result(ResultCode.SUCCESS,this.list(wrapper));
     }
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/ClientController/ClientDoorController.java

@@ -47,7 +47,7 @@ public class ClientDoorController {
     }
 
 
-    //
+    //大门事件
     @RequestMapping("/ListDoorEvent")
     public R ListDoorEvent(@RequestBody Map<String, Object> params1) throws ClientException, ParseException {
         Integer farmId = (int) params1.get("farmId");
@@ -55,11 +55,16 @@ public class ClientDoorController {
             //返回为空数据
             return R.ok("当前牧场无设备").put("data", null);
         }
-        return R.ok("请求成功").put("data", getAllKindEventList(params1)).put("total", CountTimes(params1));
+
+        System.out.println("yuyuyuyuyuyu");
+        return R.ok("请求成功").put("data", getDoorEvent(params1)).put("total", CountTimes(params1));
     }
 
+
+
+
     //返回所有的事件 的集合  包括死猪和洗消和大门 --分页参数
-    public GeneralResponse getAllKindEventList(Map<String, Object> params1) throws ClientException {
+    public GeneralResponse getDoorEvent(Map<String, Object> params1) throws ClientException {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar c = Calendar.getInstance();
         Date date = new Date();
@@ -85,6 +90,7 @@ public class ClientDoorController {
         params.put("dbType", 0);
         params.put("deviceCategory", 1);
         String[] nodeCodeList = CommonConstant.DoorChannle;
+        System.out.println("liebiaodamememememmee"+nodeCodeList);
         params.put("nodeCodeList", nodeCodeList);
         // String URL = "/evo-apigw/evo-event/1.2.0/alarm-record/page"; //获取事件URL    post请求
         String URL = "/evo-apigw/evo-event/1.2.0/alarm-record/page";  //获取事件URL    post请求
@@ -96,13 +102,12 @@ public class ClientDoorController {
         generalRequest.header("Content-Type", " application/json");
         generalRequest.body(JSON.toJSONString(params));
         GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+        System.out.println("damen");
         return generalResponse;
     }
 
 
     public String CountTimes(Map<String, Object> params1) throws ClientException {
-
-
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar c = Calendar.getInstance();
         Date date = new Date();
@@ -126,7 +131,7 @@ public class ClientDoorController {
         params.put("dbType", 0);
         params.put("deviceCategory", 1);
         String[] nodeCodeList = CommonConstant.DoorChannle;
-
+        System.out.println(nodeCodeList+"大门                     列表");
         params.put("nodeCodeList", nodeCodeList);
         String URL = "/evo-apigw/evo-event/1.0.0/alarm-record/count-num";  //获取事件URL    post请求
         IClient iClient = new DefaultClient();
@@ -149,5 +154,4 @@ public class ClientDoorController {
         return jsonObject1.get("value").toString();
     }
 
-
 }

huimv-farm-video/src/main/java/com/huimv/video/video/controller/BaseFaceController.java

@@ -0,0 +1,67 @@
+package com.huimv.video.video.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.video.video.entity.BaseFace;
+import com.huimv.video.video.entity.BaseSpecificVideo;
+import com.huimv.video.video.entity.Camera;
+import com.huimv.video.video.service.IBaseFaceService;
+import com.huimv.video.video.service.IBaseSpecificVideoService;
+import com.huimv.video.video.service.ICameraService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-05-30
+ */
+@RestController
+@RequestMapping("/baseFace")
+public class BaseFaceController {
+    @Autowired
+    IBaseFaceService baseFaceService;
+
+
+    @PostMapping("/add")
+    public Result add(@RequestBody BaseFace baseFace) {
+        baseFaceService.save(baseFace);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(name = "id") String id) {
+
+        baseFaceService.removeById(id);
+
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody  BaseFace baseFace) {
+
+        baseFaceService.updateById(baseFace);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @GetMapping("/list")
+    public Result list(@RequestParam(name = "farmId") Integer farmId) {
+
+        return new Result(ResultCode.SUCCESS, baseFaceService.list(new QueryWrapper<BaseFace>().eq("farm_id", farmId)));
+    }
+
+    @GetMapping("/listAll")
+    public Result listAll() {
+
+        return new Result(ResultCode.SUCCESS, baseFaceService.list());
+    }
+
+
+
+}

ss/src/main/java/com/huimv/video/entity/WarningInfo.java

@@ -1,9 +1,8 @@
-package com.huimv.video.entity;
+package com.huimv.video.video.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,32 +14,24 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author author
- * @since 2022-03-21
+ * @since 2022-05-30
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("warning_info")
-public class WarningInfo implements Serializable {
+@TableName("base_face")
+public class BaseFace implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    private String lqid;
+    private String dataUrl;
 
-    private Integer humidity;
+    private String imgUrl;
 
-    private Boolean showStatus;
-
-    private Double temperature;
-
-    private String type;
-
-    private LocalDateTime uploadTime;
-
-    private Integer warningType;
+    private Integer farmId;
 
 
 }

huimv-farm-video/src/main/java/com/huimv/video/video/mapper/BaseFaceMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.video.video.mapper;
+
+import com.huimv.video.video.entity.BaseFace;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-05-30
+ */
+public interface BaseFaceMapper extends BaseMapper<BaseFace> {
+
+}

huimv-farm-video/src/main/java/com/huimv/video/video/service/IBaseFaceService.java

@@ -0,0 +1,16 @@
+package com.huimv.video.video.service;
+
+import com.huimv.video.video.entity.BaseFace;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-05-30
+ */
+public interface IBaseFaceService extends IService<BaseFace> {
+
+}

huimv-farm-video/src/main/java/com/huimv/video/video/service/impl/BaseFaceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.video.video.service.impl;
+
+import com.huimv.video.video.entity.BaseFace;
+import com.huimv.video.video.mapper.BaseFaceMapper;
+import com.huimv.video.video.service.IBaseFaceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-05-30
+ */
+@Service
+public class BaseFaceServiceImpl extends ServiceImpl<BaseFaceMapper, BaseFace> implements IBaseFaceService {
+
+}

huimv-farm-video/src/main/resources/mapper/WarningInfoMapper.xml

@@ -1,5 +0,0 @@
-<?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.video.mapper.WarningInfoMapper">
-
-</mapper>

ss/src/main/java/com/huimv/video/mapper/WarningInfoMapper.java

@@ -1,16 +0,0 @@
-package com.huimv.video.mapper;
-
-import com.huimv.video.entity.WarningInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author author
- * @since 2022-03-21
- */
-public interface WarningInfoMapper extends BaseMapper<WarningInfo> {
-
-}

ss/src/main/java/com/huimv/video/service/IWarningInfoService.java

@@ -1,16 +0,0 @@
-package com.huimv.video.service;
-
-import com.huimv.video.entity.WarningInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author author
- * @since 2022-03-21
- */
-public interface IWarningInfoService extends IService<WarningInfo> {
-
-}

ss/src/main/java/com/huimv/video/service/impl/WarningInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package com.huimv.video.service.impl;
-
-import com.huimv.video.entity.WarningInfo;
-import com.huimv.video.mapper.WarningInfoMapper;
-import com.huimv.video.service.IWarningInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author author
- * @since 2022-03-21
- */
-@Service
-public class WarningInfoServiceImpl extends ServiceImpl<WarningInfoMapper, WarningInfo> implements IWarningInfoService {
-
-}

ss/src/main/resources/mapper/WarningInfoMapper.xml

@@ -1,5 +0,0 @@
-<?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.video.mapper.WarningInfoMapper">
-
-</mapper>