新建读取该设备和耳标下的耳标流水数据

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/entity/EartagDeviceEartagCountEntity.java

@@ -0,0 +1,92 @@
+package com.huimv.eartag2.common.dao.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Date;
+
+@Entity
+@Table(name = "eartag_device_eartag_count")
+public class EartagDeviceEartagCountEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "device_code")
+    private String deviceCode;
+
+    @Column(name = "earmark")
+    private String earmark;
+
+    @Column(name = "total")
+    private Integer total;
+
+    @Column(name = "create_date")
+    private Date createDate;
+
+    @Column(name = "farm_id")
+    private String farmId;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setEarmark(String earmark) {
+        this.earmark = earmark;
+    }
+
+    public String getEarmark() {
+        return earmark;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setFarmId(String farmId) {
+        this.farmId = farmId;
+    }
+
+    public String getFarmId() {
+        return farmId;
+    }
+
+    @Override
+    public String toString() {
+        return "EartagDeviceEartagCountEntity{" +
+                "id=" + id + '\'' +
+                "deviceCode=" + deviceCode + '\'' +
+                "earmark=" + earmark + '\'' +
+                "total=" + total + '\'' +
+                "createDate=" + createDate + '\'' +
+                "farmId=" + farmId + '\'' +
+                '}';
+    }
+}

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/repo/EartagDataRepo.java

@@ -5,8 +5,18 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
+
 public interface EartagDataRepo extends JpaRepository<EartagDataEntity, Integer>, JpaSpecificationExecutor<EartagDataEntity> {
     //--查询最新到耳标记录
     @Query(nativeQuery = true,value = "SELECT * FROM eartag_data WHERE device=?1 ORDER BY id DESC LIMIT 1")
     EartagDataEntity getLastEartagData(String deviceCode);
+
+    //
+    @Query(nativeQuery = true,value = "SELECT * FROM eartag_data WHERE device=?1 AND earmark=?2 AND DATE_FORMAT(add_time,'%Y-%m-%d')=DATE_FORMAT(?3,'%Y-%m-%d') ORDER BY id DESC")
+    List<EartagDataEntity> getEartagFlowByDeviceCodeAndEarmarkAndToday(String deviceCode, String earmark, String todayDateText);
+
+    //
+    @Query(nativeQuery = true,value = "SELECT * FROM eartag_data WHERE earmark=?1 AND DATE_FORMAT(add_time,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY id DESC")
+    List<EartagDataEntity> getEartagFlowByEarmarkAndToday(String earmark, String todayDateText);
 }

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/repo/EartagDeviceEartagCountRepo.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.common.dao.repo;
+
+import com.huimv.eartag2.common.dao.entity.EartagDeviceEartagCountEntity;
+import com.huimv.eartag2.common.dao.entity.EartagEartagOnlineEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface EartagDeviceEartagCountRepo extends JpaRepository<EartagDeviceEartagCountEntity, Integer>, JpaSpecificationExecutor<EartagDeviceEartagCountEntity> {
+
+    //
+    @Query(nativeQuery = true,value = "SELECT * FROM eartag_device_eartag_count WHERE device_code=?1 AND DATE_FORMAT(create_date,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d')")
+    List<EartagDeviceEartagCountEntity> getOnlineEartagByDeviceCode(String deviceCode, String todayDateText);
+}

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/repo/EartagEartagOnlineRepo.java

@@ -5,6 +5,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
+
 public interface EartagEartagOnlineRepo extends JpaRepository<EartagEartagOnlineEntity, Integer>, JpaSpecificationExecutor<EartagEartagOnlineEntity> {
 
     /**
@@ -19,4 +21,7 @@ public interface EartagEartagOnlineRepo extends JpaRepository<EartagEartagOnline
      */
     @Query(nativeQuery = true,value = "SELECT * FROM eartag_eartag_online WHERE earmark=?1 AND DATE_FORMAT(add_date,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') AND farm_id=?3")
     EartagEartagOnlineEntity getOneByEarmarkAndFarmId(String earmark, String todayDateText, String farmId);
+
+
+
 }

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/repo/EartagEartagRegisterRepo.java

@@ -14,4 +14,7 @@ public interface EartagEartagRegisterRepo extends JpaRepository<EartagEartagRegi
 
     @Query(nativeQuery = true,value = "SELECT * FROM eartag_eartag_register WHERE farm_id=?2 AND earmark=?1")
     EartagEartagRegisterEntity getOneByEarmark(String earmark, String farmId);
+
+    @Query(nativeQuery = true,value = "SELECT * FROM eartag_eartag_register WHERE earmark=?1 LIMIT 1")
+    EartagEartagRegisterEntity getEartagByEarmark(String earmark);
 }

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/utils/BizConst.java

@@ -42,5 +42,12 @@ public class BizConst {
     public final static Integer CODE_DEVICE_REGISTER_NO_EXIST = 10002;
     public final static String MSG_DEVICE_REGISTER_NO_EXIST = "该设备的注册信息不存在.";
 
+    public final static Integer CODE_DEVICE_EARTAG_COUNT_NO_EXIST = 10003;
+    public final static String MSG_DEVICE_EARTAG_COUNT_NO_EXIST = "该设备下暂无任何耳标上传数据.";
 
+    public final static Integer CODE_EARTAG_REGISTER_NO_EXIST = 10004;
+    public final static String MSG_EARTAG_REGISTER_NO_EXIST = "该耳标暂无任何注册信息.";
+
+    public final static Integer CODE_EARTAG_FLOW_NO_EXIST = 10005;
+    public final static String MSG_EARTAG_FLOW_NO_EXIST = "该耳标当天暂无任何流水信息.";
 }

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/controller/DeviceController.java

@@ -152,4 +152,21 @@ public class DeviceController {
         return deviceService.listDeviceOnlineStatusByDeviceCode(deviceCode,pastDays);
     }
 
+    /**
+     * @Method      : listEartagOnlineCountByDeviceCode
+     * @Description : 
+     * @Params      : [deviceCode]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/7       
+     * @Time        : 18:11
+     */
+    @RequestMapping(value = "/listDeviceEartagOnlineCountByDeviceCode",method = RequestMethod.GET)
+    public Result listDeviceEartagOnlineCountByDeviceCode(@RequestParam(value = "deviceCode",required = true) String deviceCode) throws ParseException {
+        log.info("<listEartagOnlineCountByDeviceCode>输入参数 deviceCode>>"+deviceCode);
+        //查询设备关联的在线耳标统计
+        return deviceService.listDeviceEartagOnlineCountByDeviceCode(deviceCode);
+    }
+
 }

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/controller/EartagController.java

@@ -0,0 +1,81 @@
+package com.huimv.eartag2.manage.controller;
+
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage.service.IEartagService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@RestController
+@RequestMapping(value = "/eartag")
+@Slf4j
+public class EartagController {
+    @Autowired
+    private IEartagService eartagService;
+
+    /**
+     * @Method      : getEartagRegisterByEarmark
+     * @Description : 读取耳标注册信息
+     * @Params      : [earmark]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/7       
+     * @Time        : 18:39
+     */
+    @RequestMapping(value = "/getEartagRegisterByEarmark",method = RequestMethod.GET)
+    public Result getEartagRegisterByEarmark(@RequestParam(value = "earmark",required = true) String earmark){
+        log.info("<getEartagRegisterByEarmark> 输入参数earmark>>"+earmark);
+        //
+        return eartagService.getEartagRegisterByEarmark(earmark);
+    }
+
+    /**
+     * @Method      : getEartagFlowByEarmarkAndToday
+     * @Description :读取耳标今天所有耳标流水
+     * @Params      : [earmark]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/7       
+     * @Time        : 18:41
+     */
+    @RequestMapping(value = "/listEartagFlowByEarmarkAndToday",method = RequestMethod.GET)
+    public Result listEartagFlowByEarmarkAndToday(@RequestParam(value = "earmark",required = true) String earmark) throws ParseException {
+        log.info("<listEartagFlowByEarmarkAndToday> 输入参数 earmark>>"+earmark);
+        //
+        return eartagService.listEartagFlowByEarmarkAndToday(earmark);
+    }
+
+    /**
+     * @Method      : listEartagFlowByDeviceCodeAndEarmarkAndToday
+     * @Description : 读取设备下和该耳标今天所有耳标流水
+     * @Params      : [earmark, deviceCode]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/7       
+     * @Time        : 18:56
+     */
+    @RequestMapping(value = "/listEartagFlowByDeviceCodeAndEarmarkAndToday",method = RequestMethod.GET)
+    public Result listEartagFlowByDeviceCodeAndEarmarkAndToday(@RequestParam(value = "earmark",required = true) String earmark,@RequestParam(value = "deviceCode",required = true) String deviceCode) throws ParseException {
+        log.info("<listEartagFlowByDeviceCodeAndEarmarkAndToday> 输入参数 earmark>>"+earmark);
+        log.info("<listEartagFlowByDeviceCodeAndEarmarkAndToday> 输入参数 deviceCode>"+deviceCode);
+        //
+        return eartagService.listEartagFlowByDeviceCodeAndEarmarkAndToday(earmark,deviceCode);
+    }
+
+}

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/IDeviceService.java

@@ -22,4 +22,7 @@ public interface IDeviceService {
 
     //查询设备在线状态
     Result listDeviceOnlineStatusByDeviceCode(String deviceCode, Integer pastDays) throws ParseException;
+
+    //查询设备关联的在线耳标统计
+    Result listDeviceEartagOnlineCountByDeviceCode(String deviceCode) throws ParseException;
 }

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/IEartagService.java

@@ -0,0 +1,15 @@
+package com.huimv.eartag2.manage.service;
+
+import com.huimv.eartag2.common.utils.Result;
+
+import java.text.ParseException;
+
+public interface IEartagService {
+    //
+    Result getEartagRegisterByEarmark(String earmark);
+
+    //根据耳标号读取今天所有流水
+    Result listEartagFlowByEarmarkAndToday(String earmark) throws ParseException;
+
+    Result listEartagFlowByDeviceCodeAndEarmarkAndToday(String earmark, String deviceCode) throws ParseException;
+}

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/impl/DeviceServiceImpl.java

@@ -3,13 +3,8 @@ package com.huimv.eartag2.manage.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.huimv.eartag2.common.dao.entity.EartagDeviceOnlineEntity;
-import com.huimv.eartag2.common.dao.entity.EartagDeviceRegisterEntity;
-import com.huimv.eartag2.common.dao.entity.EartarFarmAllStatusEntity;
-import com.huimv.eartag2.common.dao.repo.EartagDeviceOnlineRepo;
-import com.huimv.eartag2.common.dao.repo.EartagDeviceRegisterRepo;
-import com.huimv.eartag2.common.dao.repo.EartagEartagRegisterRepo;
-import com.huimv.eartag2.common.dao.repo.EartarFarmAllStatusRepo;
+import com.huimv.eartag2.common.dao.entity.*;
+import com.huimv.eartag2.common.dao.repo.*;
 //import com.huimv.eartag2.common.service.IDevice;
 import com.huimv.eartag2.common.utils.BizConst;
 import com.huimv.eartag2.common.utils.DateUtil;
@@ -52,8 +47,44 @@ public class DeviceServiceImpl implements IDeviceService {
     private String deviceOnlineAccessMode;
     @Autowired
     private EartagDeviceOnlineRepo deviceOnlineRepo;
+    @Autowired
+    private EartagEartagOnlineRepo eartagOnlineRepo;
+    @Autowired
+    private EartagDeviceEartagCountRepo deviceEartagCountRepo;
 
+    /**
+     * @Method      : listDeviceEartagOnlineCountByDeviceCode
+     * @Description : 
+     * @Params      : [deviceCode]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/7       
+     * @Time        : 17:13
+     */
+    @Override
+    public Result listDeviceEartagOnlineCountByDeviceCode(String deviceCode) throws ParseException {
+        DateUtil du = new DateUtil();
+        String todayDateText = du.getTodayDateText();
+        //
+        List<EartagDeviceEartagCountEntity> deviceEartagCountEntityList = deviceEartagCountRepo.getOnlineEartagByDeviceCode(deviceCode,todayDateText);
+        if(deviceEartagCountEntityList.size()==0){
+            return new Result(BizConst.CODE_DEVICE_EARTAG_COUNT_NO_EXIST,BizConst.MSG_DEVICE_EARTAG_COUNT_NO_EXIST,false);
+        }else{
+            return new Result(ResultCode.SUCCESS,JSONObject.toJSONString(deviceEartagCountEntityList));
+        }
+    }
 
+    /**
+     * @Method      : listDeviceOnlineStatusByDeviceCode
+     * @Description : 列表在线设备关联在线耳标统计
+     * @Params      : [deviceCode, pastDays]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/7       
+     * @Time        : 17:13
+     */
     @Override
     public Result listDeviceOnlineStatusByDeviceCode(String deviceCode, Integer pastDays) throws ParseException {
         DateUtil du = new DateUtil();
@@ -66,7 +97,6 @@ public class DeviceServiceImpl implements IDeviceService {
             List<String> pastDateList = du.getPastIntervalsASC(pastDays);
             JSONArray dataJa = new JSONArray();
             for(String pastDayDate:pastDateList){
-                int compareInt = du.parseDate(pastDayDate).compareTo(du.getTodayDate());
                 JSONObject newJo = new JSONObject();
                 dataJa.add(newJo);
                 newJo.put("time",pastDayDate);
@@ -74,7 +104,6 @@ public class DeviceServiceImpl implements IDeviceService {
                 for(EartagDeviceOnlineEntity deviceOnlineEntity:deviceOnlineEntityList)
                 {
                     int compareTo = du.parseDate(pastDayDate).compareTo(deviceOnlineEntity.getAddDate());
-//                    System.out.println("compareTo>>"+compareTo+" "+du.formatDateText(deviceOnlineEntity.getAddDate()));
                     if(compareTo == 0){
                         newJo.put("value",1);
                         ieFound = true;
@@ -91,7 +120,7 @@ public class DeviceServiceImpl implements IDeviceService {
         }
     }
 
-    /**
+     /**
      * @Method      : listDeviceOnlineByDeviceCode
      * @Description : 查询单个设备N天在线记录
      * @Params      : [deviceCode]

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/impl/EartagServiceImpl.java

@@ -0,0 +1,102 @@
+package com.huimv.eartag2.manage.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.eartag2.common.dao.entity.EartagDataEntity;
+import com.huimv.eartag2.common.dao.entity.EartagEartagRegisterEntity;
+import com.huimv.eartag2.common.dao.repo.EartagDataRepo;
+import com.huimv.eartag2.common.dao.repo.EartagEartagRegisterRepo;
+import com.huimv.eartag2.common.utils.BizConst;
+import com.huimv.eartag2.common.utils.DateUtil;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage.service.IEartagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Service
+public class EartagServiceImpl implements IEartagService {
+    @Autowired
+    private EartagEartagRegisterRepo eartagRegisterRepo;
+    @Autowired
+    private EartagDataRepo eartagDataRepo;
+
+    /**
+     * @Method      : listEartagFlowByDeviceCodeAndEarmarkAndToday
+     * @Description : 根据设备编码、耳标号和当天日期读取耳标流水数据
+     * @Params      : [earmark, deviceCode]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/7       
+     * @Time        : 18:46
+     */
+    @Override
+    public Result listEartagFlowByDeviceCodeAndEarmarkAndToday(String earmark, String deviceCode) throws ParseException {
+        DateUtil du = new DateUtil();
+        String todayDateText = du.getTodayDateText();
+        //
+        List<EartagDataEntity> eartagDataEntityList = eartagDataRepo.getEartagFlowByDeviceCodeAndEarmarkAndToday(deviceCode,earmark,todayDateText);
+        if(eartagDataEntityList.size()>0){
+            return new Result(ResultCode.SUCCESS,JSONObject.toJSONString(eartagDataEntityList));
+        }else{
+            return new Result(BizConst.CODE_EARTAG_FLOW_NO_EXIST,BizConst.MSG_EARTAG_FLOW_NO_EXIST,false);
+        }
+    }
+
+    /**
+     * @Method      : listEartagFlowByEarmarkAndToday
+     * @Description : 根据耳标号读取今天所有流水
+     * @Params      : [earmark]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/7       
+     * @Time        : 18:41
+     */
+    @Override
+    public Result listEartagFlowByEarmarkAndToday(String earmark) throws ParseException {
+        DateUtil du = new DateUtil();
+        String todayDateText = du.getTodayDateText();
+        //
+        List<EartagDataEntity> eartagDataEntityList = eartagDataRepo.getEartagFlowByEarmarkAndToday(earmark,todayDateText);
+        if(eartagDataEntityList.size()>0){
+            return new Result(ResultCode.SUCCESS,JSONObject.toJSONString(eartagDataEntityList));
+        }else{
+            return new Result(BizConst.CODE_EARTAG_FLOW_NO_EXIST,BizConst.MSG_EARTAG_FLOW_NO_EXIST,false);
+        }
+    }
+
+    /**
+     * @Method      : getEartagRegisterByEarmark
+     * @Description : 
+     * @Params      : [earmark]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/7       
+     * @Time        : 18:41
+     */
+    @Override
+    public Result getEartagRegisterByEarmark(String earmark) {
+        //
+        EartagEartagRegisterEntity eartagRegisterEntity = eartagRegisterRepo.getEartagByEarmark(earmark);
+        if(eartagRegisterEntity != null){
+            return new Result(ResultCode.SUCCESS, JSONObject.toJSONString(eartagRegisterEntity));
+        }else{
+            return new Result(BizConst.CODE_EARTAG_REGISTER_NO_EXIST,BizConst.MSG_EARTAG_REGISTER_NO_EXIST,false);
+        }
+    }
+
+
+}