【feat】查询打耳标流水

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagEartagRegister2Controller.java

@@ -0,0 +1,26 @@
+package com.huimv.eartag2.manage2.controller;
+
+
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.service.IEartagEartagRegisterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-04
+ */
+@RestController
+@RequestMapping("/eartagRegister2")
+public class EartagEartagRegister2Controller {
+
+}

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagRegisterController.java

@@ -1,6 +1,7 @@
 package com.huimv.eartag2.manage2.controller;
 
 import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.service.IEartagEartagRegister2Service;
 import com.huimv.eartag2.manage2.service.IEartagEartagRegisterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,8 +23,12 @@ import java.util.Map;
 @RequestMapping("/eartagRegister")
 public class EartagRegisterController {
     @Autowired
-    private IEartagEartagRegisterService eartagRegisterService;
+    private IEartagEartagRegister2Service eartagRegisterService;
 
+   /* @RequestMapping("/listFarmUnitEartagData")
+    public Result listFarmUnitEartagData(@RequestBody Map<String, String> params){
+        return eartagRegisterService.listFarmUnitEartagData(params);
+    }*/
     @RequestMapping("/listFarmUnitEartagData")
     public Result listFarmUnitEartagData(@RequestBody Map<String, String> params){
         return eartagRegisterService.listFarmUnitEartagData(params);

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/EartagEartagRegister2Mapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.manage2.mapper;
+
+import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-04
+ */
+public interface EartagEartagRegister2Mapper extends BaseMapper<EartagEartagRegister2> {
+
+}

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/xml/EartagEartagRegister2Mapper.xml

@@ -0,0 +1,45 @@
+<?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.eartag2.manage2.mapper.EartagEartagRegister2Mapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagEartagRegister2">
+        <id column="id" property="id" />
+        <result column="earmark" property="earmark" />
+        <result column="first_time" property="firstTime" />
+        <result column="last_time" property="lastTime" />
+        <result column="first_device" property="firstDevice" />
+        <result column="belong_device" property="belongDevice" />
+        <result column="last_device" property="lastDevice" />
+        <result column="register_time" property="registerTime" />
+        <result column="register_type" property="registerType" />
+        <result column="remark" property="remark" />
+        <result column="farm_id" property="farmId" />
+        <result column="active_status" property="activeStatus" />
+        <result column="active_time" property="activeTime" />
+        <result column="live_status" property="liveStatus" />
+        <result column="create_date" property="createDate" />
+        <result column="bat" property="bat" />
+        <result column="reboot_times" property="rebootTimes" />
+        <result column="on_day_age" property="onDayAge" />
+        <result column="day_age" property="dayAge" />
+        <result column="stage_code" property="stageCode" />
+        <result column="stage_name" property="stageName" />
+        <result column="pigpen_id" property="pigpenId" />
+        <result column="pigpen_name" property="pigpenName" />
+        <result column="unit_id" property="unitId" />
+        <result column="unit_name" property="unitName" />
+        <result column="act_range" property="actRange" />
+        <result column="ear_temp1" property="earTemp1" />
+        <result column="env_temp1" property="envTemp1" />
+        <result column="act" property="act" />
+        <result column="signal1" property="signal1" />
+        <result column="other" property="other" />
+        <result column="ask_time" property="askTime" />
+        <result column="env_abnormal" property="envAbnormal" />
+        <result column="ear_abnormal" property="earAbnormal" />
+        <result column="view_code" property="viewCode" />
+        <result column="rfid_id" property="rfidId" />
+    </resultMap>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagEartagRegister2.java

@@ -0,0 +1,109 @@
+package com.huimv.eartag2.manage2.pojo;
+
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("eartag_eartag_register2")
+public class EartagEartagRegister2 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String earmark;
+
+    private LocalDateTime firstTime;
+
+    private LocalDateTime lastTime;
+
+    private String firstDevice;
+
+    private String belongDevice;
+
+    private String lastDevice;
+
+    private LocalDateTime registerTime;
+
+    private Integer registerType;
+
+    private String remark;
+
+    private String farmId;
+
+    private Integer activeStatus;
+
+    private LocalDateTime activeTime;
+
+    private Integer liveStatus;
+
+    private LocalDate createDate;
+
+    private Integer bat;
+
+    private Integer rebootTimes;
+
+    private Integer onDayAge;
+
+    private Integer dayAge;
+
+    private String stageCode;
+
+    private String stageName;
+
+    private Integer pigpenId;
+
+    private String pigpenName;
+
+    private Integer unitId;
+
+    private String unitName;
+
+    private Integer actRange;
+
+    private Float earTemp1;
+
+    private Float envTemp1;
+
+    private Integer act;
+
+    private Integer signal1;
+
+    private String other;
+
+    private String askTime;
+
+    private Integer envAbnormal;
+
+    private Integer earAbnormal;
+
+    /**
+     * 可视码
+     */
+    private String viewCode;
+
+    /**
+     * RFID id号
+     */
+    private String rfidId;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/IEartagEartagRegister2Service.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag2.manage2.service;
+
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-04
+ */
+public interface IEartagEartagRegister2Service extends IService<EartagEartagRegister2> {
+
+    Result listFarmUnitEartagData(Map<String, String> params);
+}

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagEartagRegister2ServiceImpl.java

@@ -0,0 +1,75 @@
+package com.huimv.eartag2.manage2.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.pojo.EartagEartagRegister;
+import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
+import com.huimv.eartag2.manage2.mapper.EartagEartagRegister2Mapper;
+import com.huimv.eartag2.manage2.service.IEartagEartagRegister2Service;
+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-08-04
+ */
+@Service
+public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRegister2Mapper, EartagEartagRegister2> implements IEartagEartagRegister2Service {
+
+    @Override
+    public Result listFarmUnitEartagData(Map<String, String> params) {
+        String pageSize = params.get("pageSize");
+        String pageNo = params.get("pageNo");
+        String unitId = params.get("unitId");
+        String deviceCode = params.get("deviceCode");
+        String farmId = params.get("farmId");
+        String earmark = params.get("earmark");
+        if (StringUtils.isBlank(pageNo)){
+            pageNo="1";
+        }
+        if (StringUtils.isBlank(pageSize)){
+            pageSize="20";
+        }
+
+        Float maxEarTemp = 0F;
+        Float minEarTemp = 100F;
+        QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
+        //设备
+        wrapper.like(StringUtils.isNotBlank(deviceCode),"belong_device",deviceCode);
+        wrapper.eq("farm_id",farmId);
+        wrapper.eq(StringUtils.isNotBlank(unitId),"unit_id",unitId);
+        wrapper.eq(StringUtils.isNotBlank(earmark),"earmark",earmark);
+        Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
+        for (EartagEartagRegister2 record : page.getRecords()) {
+            Float earTemp1 = record.getEarTemp1();
+            maxEarTemp = Math.max(earTemp1,maxEarTemp);
+            minEarTemp = Math.min(earTemp1,minEarTemp);
+        }
+
+        Map map = new HashMap();
+        long allCount = this.count(wrapper);
+        //在线
+        wrapper.eq("active_status", 1);
+        long onCount = this.count(wrapper);
+
+        map.put("countOff",allCount-onCount);
+        map.put("countOn",onCount);
+        map.put("countAll",allCount);
+        map.put("maxEarTemp",maxEarTemp);
+        map.put("minEarTemp",minEarTemp);
+        map.put("page",page);
+
+        return new Result(ResultCode.SUCCESS,map);
+
+    }
+}

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagEartagRegisterServiceImpl.java

@@ -82,9 +82,11 @@ public class EartagEartagRegisterServiceImpl extends ServiceImpl<EartagEartagReg
             eartagDeviceRegisterVo.setEnvTemp(eartagData.getEnvTemp1());
             eartagDeviceRegisterVo.setSignal(eartagData.getSignal1());
             EartagDeviceRegister deviceRegister = eartagDeviceRegisterMapper.selectOne(new QueryWrapper<EartagDeviceRegister>().eq("device_code", record.getBelongDevice()));
+            if (ObjectUtil.isNotEmpty(deviceRegister)){
+                eartagDeviceRegisterVo.setStage(deviceRegister.getStage());
+                eartagDeviceRegisterVo.setChipId(deviceRegister.getChipId());
+            }
 
-            eartagDeviceRegisterVo.setStage(deviceRegister.getStage());
-            eartagDeviceRegisterVo.setChipId(deviceRegister.getChipId());
 
             maxEarTemp = Math.max(earTemp1,maxEarTemp);
             minEarTemp = Math.min(earTemp1,minEarTemp);