耳标在线页面功能全部完成

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

@@ -13,4 +13,8 @@ public interface EartagDeviceEartagCountRepo extends JpaRepository<EartagDeviceE
     //
     @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);
+
+    //
+    @Query(nativeQuery = true,value = "SELECT * FROM eartag_device_eartag_count WHERE earmark=?1 AND DATE_FORMAT(create_date,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d')")
+    List<EartagDeviceEartagCountEntity> getOnlineEartagDeviceByEarmarkAndAddDate(String earmark, String addDate);
 }

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

@@ -34,4 +34,20 @@ public interface EartagEartagOnlineRepo extends JpaRepository<EartagEartagOnline
      */
     @Query(nativeQuery = true,value = "SELECT * FROM eartag_eartag_online WHERE earmark=?1 AND add_date BETWEEN DATE_FORMAT(?2,'%Y-%m-%d') AND DATE_FORMAT(?3,'%Y-%m-%d') ORDER BY add_date ASC")
     List<EartagEartagOnlineEntity> getEartagOnlineByEarmarkAndDate(String earmark, String startDateText, String todayDateText);
+
+    /**
+     * @Method      : getEartagOnlineByFarmIdAndDate
+     * @Description : 
+     * @Params      : [farmId, addDate]
+     * @Return      : java.util.List<com.huimv.eartag2.common.dao.entity.EartagEartagOnlineEntity>
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/10       
+     * @Time        : 21:58
+     */
+    @Query(nativeQuery = true,value = "SELECT * FROM eartag_eartag_online WHERE farm_id=?1 AND DATE_FORMAT(add_date,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY add_date ASC")
+    List<EartagEartagOnlineEntity> getEartagOnlineByFarmIdAndDate(String farmId, String addDate);
+
+//    @Query(nativeQuery = true,value = "SELECT * FROM eartag_eartag_online WHERE farm_id=?1 AND add_date = DATE_FORMAT(,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY add_date ASC")
+//    List<EartagEartagOnlineEntity> getEartagOnlineByEarmarkAndStartDateAndEndDate(String earmark, String todayDateText, String startDateText);
 }

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

@@ -55,5 +55,6 @@ public class BizConst {
     public final static String MSG_EARTAG_ONLINE_NO_EXIST = "该耳标暂无在线统计信息.";
 
     public final static Integer CODE_ENVTEMP_FLOW_NO_EXIST = 10007;
-    public final static String MSG_ENVTEMP_FLOW_NO_EXIST = "该耳标暂无在线统计信息.";
+    public final static String MSG_ENVTEMP_FLOW_NO_EXIST = "该设备暂无温度流水信息.";
+
 }

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

@@ -330,25 +330,5 @@ public class DeviceController {
         return deviceService.listHeartbeatByDeviceCodeAndDateInPager(deviceCode,addDate,pageNo,pageSize);
     }
 
-    /**
-     * @Method      : listEartagOnlineAllStatus
-     * @Description : 前N天耳标在线状态
-     * @Params      : [farmId, days]
-     * @Return      : com.huimv.eartag2.common.utils.Result
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2022/3/10       
-     * @Time        : 20:43
-     */
-    @RequestMapping(value = "/listEartagOnlineAllStatus",method = RequestMethod.GET)
-    public Result listEartagOnlineAllStatus(@RequestParam(value = "farmId",required = true) String farmId,@RequestParam(value = "days",required = true) Integer days) throws ParseException {
-        log.info("<listEartagOnlineAllStatus>输入参数 farmId>>"+farmId);
-        log.info("<listEartagOnlineAllStatus>输入参数 days>>"+days);
-        if(days == null){
-            //默认7天数据
-            days = 7;
-        }
-        //
-        return deviceService.listEartagOnlineAllStatus(farmId,days);
-    }
+
 }

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

@@ -189,4 +189,76 @@ public class EartagController {
         return eartagService.listEartagOnlineStatusByEarmarkAndDate(earmark,pastDays);
     }
 
+    /**
+     * @Method      : listEartagOnlineAllStatus
+     * @Description : 前N天耳标在线状态
+     * @Params      : [farmId, days]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/10
+     * @Time        : 20:43
+     */
+    @RequestMapping(value = "/listEartagOnlineAllStatus",method = RequestMethod.GET)
+    public Result listEartagOnlineAllStatus(@RequestParam(value = "farmId",required = true) String farmId,@RequestParam(value = "days",required = true) Integer days) throws ParseException {
+        log.info("<listEartagOnlineAllStatus>输入参数 farmId>>"+farmId);
+        log.info("<listEartagOnlineAllStatus>输入参数 days>>"+days);
+        if(days == null){
+            //默认7天数据
+            days = 7;
+        }
+        //
+        return eartagService.listEartagOnlineAllStatus(farmId,days);
+    }
+
+    /**
+     * @Method      : listEartagOnlineCount
+     * @Description : 裂变展示某一天的在线记录
+     * @Params      : [farmId, addDate, pageNo, pageSize]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/10       
+     * @Time        : 21:50
+     */
+    @RequestMapping(value = "/listOnlineEartagCount",method = RequestMethod.GET)
+    public Result listEartagOnlineCount(@RequestParam(value = "farmId",required = true) String farmId,
+                                        @RequestParam(value = "date",required = false) String addDate,
+                                        @RequestParam(value = "pageNo",required = true) Integer pageNo,
+                                        @RequestParam(value = "pageSize",required = true) Integer pageSize,
+                                        @RequestParam(value = "showMode",required = true) Integer showMode) throws ParseException {
+        log.info("<listOnlineEartagCount>输入参数 farmId>>"+farmId);
+        log.info("<listOnlineEartagCount>输入参数 addDate>>"+addDate);
+        log.info("<listOnlineEartagCount>输入参数 pageNo>>"+pageNo);
+        log.info("<listOnlineEartagCount>输入参数 pageSize>>"+pageSize);
+        log.info("<listOnlineEartagCount>输入参数 showMode>>"+showMode);
+        if(addDate == null){
+            addDate = new DateUtil().getTodayDateText();
+        }
+        //
+        return eartagService.listOnlineEartagCount(farmId,addDate,pageNo,pageSize,showMode);
+    }
+
+    /**
+     * @Method      : getEartagDeviceByEarmarkAndAddDate
+     * @Description : 
+     * @Params      : [earmark, addDate]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/10       
+     * @Time        : 22:33
+     */
+    @RequestMapping(value = "/getEartagDeviceByEarmarkAndAddDate",method = RequestMethod.GET)
+    public Result getEartagDeviceByEarmarkAndAddDate(@RequestParam(value = "earmark",required = true) String earmark,
+                                                @RequestParam(value = "addDate",required = false) String addDate) throws ParseException {
+        log.info("<getEartagDeviceByEarmarkAndAddDate>输入参数 earmark>>"+earmark);
+        log.info("<getEartagDeviceByEarmarkAndAddDate>输入参数 addDate>>"+addDate);
+        if(addDate == null){
+            addDate = new DateUtil().getTodayDateText();
+        }
+        //
+        return eartagService.getEartagDeviceByEarmarkAndAddDate(earmark,addDate);
+    }
+
 }

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

@@ -44,6 +44,5 @@ public interface IDeviceService {
     //分页查询列表
     Result listDeviceRegisterInPager(String farmId, String deviceCode, String alias, String startDate, String endDate, Integer activeStatus, Integer liveStatus, Integer pageNo, Integer pageSize);
 
-    //前N天的耳标在线状态
-    Result listEartagOnlineAllStatus(String farmId, Integer days) throws ParseException;
+
 }

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

@@ -27,4 +27,16 @@ public interface IEartagService {
 
     //带分页查询耳标流水
     Result listEartagFlowByDeviceCodeAndEarmarkAndDateInPager(String earmark, String deviceCode, String addDate, Integer pageNo, Integer pageSize);
+
+    //前N天的耳标在线状态
+    Result listEartagOnlineAllStatus(String farmId, Integer days) throws ParseException;
+
+    //展示在线耳标列表
+    Result listOnlineEartagCount(String farmId, String addDate, Integer pageNo, Integer pageSize, Integer showMode) throws ParseException;
+
+    //获取该耳边前N天历史记录
+//    Result getEartagOnlineCountByEarmark(String earmark, Integer days) throws ParseException;
+
+    //通过耳标号和日期获取耳标关联设备信息
+    Result getEartagDeviceByEarmarkAndAddDate(String earmark, String addDate);
 }

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

@@ -58,32 +58,6 @@ public class DeviceServiceImpl implements IDeviceService {
     private EartagHeartbeatRepo heartbeatRepo;
 
 
-    /**
-     * @Method      : listEartagOnlineAllStatus
-     * @Description : 
-     * @Params      : [farmId, days]
-     * @Return      : com.huimv.eartag2.common.utils.Result
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2022/3/10       
-     * @Time        : 20:52
-     */
-    @Override
-    public Result listEartagOnlineAllStatus(String farmId, Integer days) throws ParseException {
-        DateUtil dateUtil = new DateUtil();
-        String pastDate = dateUtil.getPastDate(days);
-        String todayDate = dateUtil.getTodayDateText();
-        List<EartarFarmAllStatusEntity> FarmAllStatusEntityList = farmAllStatusRepo.getOneByFarmIdAndCreateDateAndPastDate(farmId, pastDate, todayDate);
-        JSONArray dataJa = new JSONArray();
-        for (EartarFarmAllStatusEntity farmAllStatusEntity : FarmAllStatusEntityList) {
-            JSONObject newJo = new JSONObject();
-            dataJa.add(newJo);
-            newJo.put("time", dateUtil.formatDateText(farmAllStatusEntity.getCreateDate()));
-            newJo.put("value", farmAllStatusEntity.getEartagOnline());
-            newJo.put("total", farmAllStatusEntity.getEartagTotal());
-        }
-        return new Result(ResultCode.SUCCESS, dataJa.toJSONString());
-    }
 
     /**
      * @Method      : listDeviceEnvtempByDeviceCode

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

@@ -1,12 +1,9 @@
 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.*;
-import com.huimv.eartag2.common.dao.repo.EartagDataRepo;
-import com.huimv.eartag2.common.dao.repo.EartagEartagOnlineRepo;
-import com.huimv.eartag2.common.dao.repo.EartagEartagRegisterRepo;
+import com.huimv.eartag2.common.dao.repo.*;
 import com.huimv.eartag2.common.utils.*;
 import com.huimv.eartag2.manage.service.IEartagService;
 import lombok.extern.slf4j.Slf4j;
@@ -40,27 +37,163 @@ public class EartagServiceImpl implements IEartagService {
     private EartagDataRepo eartagDataRepo;
     @Autowired
     private EartagEartagOnlineRepo eartagOnlineRepo;
+    @Autowired
+    private EartarFarmAllStatusRepo farmAllStatusRepo;
+    @Autowired
+    private EartagDeviceEartagCountRepo deviceEartagCountRepo;
+
 
     /**
-     * @Method      : listEartagOnlineStatusByEarmarkAndDate
-     * @Description : 显示耳标在线统计
-     * @Params      : [earmark, pastDays]
+     * @Method      : getEartagDeviceByEarmarkAndAddDate
+     * @Description : 
+     * @Params      : [earmark, addDate]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/10       
+     * @Time        : 22:39
+     */
+    @Override
+    public Result getEartagDeviceByEarmarkAndAddDate(String earmark, String addDate){
+        //
+        List<EartagDeviceEartagCountEntity> deviceEartagCountEntityList = deviceEartagCountRepo.getOnlineEartagDeviceByEarmarkAndAddDate(earmark,addDate);
+        if(deviceEartagCountEntityList != null){
+            return new Result(ResultCode.SUCCESS, JSONObject.toJSONString(deviceEartagCountEntityList));
+        }else{
+            return new Result(BizConst.CODE_DEVICE_EARTAG_COUNT_NO_EXIST, BizConst.MSG_DEVICE_EARTAG_COUNT_NO_EXIST, false);
+        }
+    }
+
+    /**
+     * @Method : listOnlineEartagCount
+     * @Description :
+     * @Params : [farmId, addDate, pageNo, pageSize]
+     * @Return : com.huimv.eartag2.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2022/3/10
+     * @Time : 21:52
+     */
+    @Override
+    public Result listOnlineEartagCount(String farmId, String addDate, Integer pageNo, Integer pageSize, Integer showMode) throws ParseException {
+        if (showMode == 1) {
+            //
+            return listEartagOnlineInRecords(farmId, addDate, pageNo, pageSize);
+        } else {
+            //
+            return getEartagOnlineInChart(farmId, addDate);
+        }
+
+    }
+
+    /**
+     * @Method      : getEartagOnlineInChart
+     * @Description : 
+     * @Params      : [farmId, addDate]
      * @Return      : com.huimv.eartag2.common.utils.Result
-     *
+     * 
      * @Author      : ZhuoNing
-     * @Date        : 2022/3/8
-     * @Time        : 18:30
+     * @Date        : 2022/3/10       
+     * @Time        : 22:03
+     */
+    private Result getEartagOnlineInChart(String farmId, String addDate) throws ParseException {
+        //
+        List<EartagEartagOnlineEntity> eartagOnlineEntityList = eartagOnlineRepo.getEartagOnlineByFarmIdAndDate(farmId, addDate);
+        if (eartagOnlineEntityList.size() > 0) {
+            JSONArray dataJa = new JSONArray();
+            for(EartagEartagOnlineEntity eartagOnlineEntity:eartagOnlineEntityList){
+                JSONObject newJo = new JSONObject();
+                newJo.put("time",eartagOnlineEntity.getEarmark());
+                newJo.put("value",eartagOnlineEntity.getTotal());
+                dataJa.add(newJo);
+            }
+            return new Result(ResultCode.SUCCESS,dataJa);
+        } else {
+            return new Result(BizConst.CODE_EARTAG_ONLINE_NO_EXIST,BizConst.MSG_EARTAG_ONLINE_NO_EXIST,false);
+        }
+    }
+
+    /**
+     * @Method : listEartagOnlineInRecords
+     * @Description :
+     * @Params : [farmId, addDate, pageNo, pageSize, showMode]
+     * @Return : com.huimv.eartag2.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2022/3/10
+     * @Time : 21:54
+     */
+    private Result listEartagOnlineInRecords(String farmId, String addDate, Integer pageNo, Integer pageSize) {
+        //
+        Specification<EartagEartagOnlineEntity> sf = (Specification<EartagEartagOnlineEntity>) (root, criteriaQuery, criteriaBuilder) -> {
+            //
+            List<Predicate> predList = new ArrayList<>();
+            if (null != farmId && farmId.trim().length() > 0) {
+                predList.add(criteriaBuilder.equal(root.get("farmId").as(String.class), farmId));
+            }
+            //
+            if (null != addDate && addDate.trim().length() > 0) {
+                try {
+                    predList.add(criteriaBuilder.equal(root.get("addDate").as(Date.class), new Date(new DateUtil().parseDateTextToLong(addDate))));
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            }
+            Predicate[] pred = new Predicate[predList.size()];
+            Predicate and = criteriaBuilder.and(predList.toArray(pred));
+            criteriaQuery.where(and);
+            //
+            List<Order> orders = new ArrayList<>();
+            orders.add(criteriaBuilder.desc(root.get("id")));
+            return criteriaQuery.orderBy(orders).getRestriction();
+        };
+        Pageable pageable = PageRequest.of(pageNo - 1, pageSize);
+        return new Result(ResultCode.SUCCESS, eartagOnlineRepo.findAll(sf, pageable));
+    }
+
+    /**
+     * @Method : listEartagOnlineAllStatus
+     * @Description :
+     * @Params : [farmId, days]
+     * @Return : com.huimv.eartag2.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2022/3/10
+     * @Time : 20:52
+     */
+    @Override
+    public Result listEartagOnlineAllStatus(String farmId, Integer days) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        String pastDate = dateUtil.getPastDate(days);
+        String todayDate = dateUtil.getTodayDateText();
+        List<EartarFarmAllStatusEntity> FarmAllStatusEntityList = farmAllStatusRepo.getOneByFarmIdAndCreateDateAndPastDate(farmId, pastDate, todayDate);
+        JSONArray dataJa = new JSONArray();
+        for (EartarFarmAllStatusEntity farmAllStatusEntity : FarmAllStatusEntityList) {
+            JSONObject newJo = new JSONObject();
+            dataJa.add(newJo);
+            newJo.put("time", dateUtil.formatDateText(farmAllStatusEntity.getCreateDate()));
+            newJo.put("value", farmAllStatusEntity.getEartagOnline());
+            newJo.put("total", farmAllStatusEntity.getEartagTotal());
+        }
+        return new Result(ResultCode.SUCCESS, dataJa.toJSONString());
+    }
+
+    /**
+     * @Method : listEartagOnlineStatusByEarmarkAndDate
+     * @Description : 显示耳标在线统计
+     * @Params : [earmark, pastDays]
+     * @Return : com.huimv.eartag2.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2022/3/8
+     * @Time : 18:30
      */
     @Override
     public Result listEartagOnlineStatusByEarmarkAndDate(String earmark, Integer pastDays) throws ParseException {
         DateUtil du = new DateUtil();
         String todayDateText = du.getTodayDateText();
         String startDateText = du.getPastDate(pastDays);
-        log.info("<listEartagOnlineStatusByEarmarkAndDate> startDateText>>"+startDateText);
-        log.info("<listEartagOnlineStatusByEarmarkAndDate> todayDateText>>"+todayDateText);
+        log.info("<listEartagOnlineStatusByEarmarkAndDate> startDateText>>" + startDateText);
+        log.info("<listEartagOnlineStatusByEarmarkAndDate> todayDateText>>" + todayDateText);
         //读取耳标在线统计记录
-        List<EartagEartagOnlineEntity> eartagOnlineEntityList = eartagOnlineRepo.getEartagOnlineByEarmarkAndDate(earmark,startDateText,todayDateText);
-        if(eartagOnlineEntityList.size()>0){
+        List<EartagEartagOnlineEntity> eartagOnlineEntityList = eartagOnlineRepo.getEartagOnlineByEarmarkAndDate(earmark, startDateText, todayDateText);
+        if (eartagOnlineEntityList.size() > 0) {
             JSONArray dataJa = new JSONArray();
             List<String> pastDateList = du.getPastIntervalsASC(pastDays);
             for (String pastDayDate : pastDateList) {
@@ -68,7 +201,7 @@ public class EartagServiceImpl implements IEartagService {
                 dataJa.add(newJo);
                 newJo.put("time", pastDayDate);
                 boolean ieFound = false;
-                for (EartagEartagOnlineEntity eartagOnlineEntity:eartagOnlineEntityList) {
+                for (EartagEartagOnlineEntity eartagOnlineEntity : eartagOnlineEntityList) {
                     int compareTo = du.parseDate(pastDayDate).compareTo(eartagOnlineEntity.getAddDate());
                     if (compareTo == 0) {
                         newJo.put("value", 1);
@@ -87,21 +220,20 @@ public class EartagServiceImpl implements IEartagService {
 //                eartagOnlineJo.put("addDate",du.formatDateText(eartagOnlineJo.getDate("addDate")));
 //                dataJa.add(eartagOnlineJo);
 //            }
-            return new Result(ResultCode.SUCCESS,dataJa);
-        }else{
-            return new Result(BizConst.CODE_EARTAG_ONLINE_NO_EXIST,BizConst.MSG_EARTAG_ONLINE_NO_EXIST,false);
+            return new Result(ResultCode.SUCCESS, dataJa);
+        } else {
+            return new Result(BizConst.CODE_EARTAG_ONLINE_NO_EXIST, BizConst.MSG_EARTAG_ONLINE_NO_EXIST, false);
         }
     }
 
     /**
-     * @Method      : getEartagRegisterByEarmarkInPager
+     * @Method : getEartagRegisterByEarmarkInPager
      * @Description : 分页查询耳标流水
-     * @Params      : [earmark, pageNo, pageSize]
-     * @Return      : com.huimv.eartag2.common.utils.Result
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2022/3/8       
-     * @Time        : 20:19
+     * @Params : [earmark, pageNo, pageSize]
+     * @Return : com.huimv.eartag2.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2022/3/8
+     * @Time : 20:19
      */
     @Override
     public Result listEartagFlowByEarmarkAndTodayInPager(String earmark, Integer pageNo, Integer pageSize) {
@@ -125,14 +257,13 @@ public class EartagServiceImpl implements IEartagService {
     }
 
     /**
-     * @Method      : listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager
-     * @Description : 
-     * @Params      : [earmark, deviceCode, pageNo, pageSize]
-     * @Return      : com.huimv.eartag2.common.utils.Result
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2022/3/8       
-     * @Time        : 20:37
+     * @Method : listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager
+     * @Description :
+     * @Params : [earmark, deviceCode, pageNo, pageSize]
+     * @Return : com.huimv.eartag2.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2022/3/8
+     * @Time : 20:37
      */
     @Override
     public Result listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager(String earmark, String deviceCode, Integer pageNo, Integer pageSize) {
@@ -161,14 +292,13 @@ public class EartagServiceImpl implements IEartagService {
     }
 
     /**
-     * @Method      : listEartagFlowByDeviceCodeAndEarmarkAndDateInPager
-     * @Description : 
-     * @Params      : [earmark, deviceCode, addDate, pageNo, pageSize]
-     * @Return      : com.huimv.eartag2.common.utils.Result
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2022/3/9       
-     * @Time        : 22:14
+     * @Method : listEartagFlowByDeviceCodeAndEarmarkAndDateInPager
+     * @Description :
+     * @Params : [earmark, deviceCode, addDate, pageNo, pageSize]
+     * @Return : com.huimv.eartag2.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2022/3/9
+     * @Time : 22:14
      */
     @Override
     public Result listEartagFlowByDeviceCodeAndEarmarkAndDateInPager(String earmark, String deviceCode, String addDate, Integer pageNo, Integer pageSize) {
@@ -177,15 +307,15 @@ public class EartagServiceImpl implements IEartagService {
             //
             List<Predicate> predList = new ArrayList<>();
             //earmark
-            if (null != earmark && earmark.trim().length()>0) {
+            if (null != earmark && earmark.trim().length() > 0) {
                 predList.add(criteriaBuilder.equal(root.get("earmark").as(String.class), earmark));
             }
             //
-            if (null != deviceCode && deviceCode.trim().length()>0) {
+            if (null != deviceCode && deviceCode.trim().length() > 0) {
                 predList.add(criteriaBuilder.equal(root.get("device").as(String.class), deviceCode));
             }
             //
-            if (null != addDate && addDate.trim().length()>0) {
+            if (null != addDate && addDate.trim().length() > 0) {
                 try {
                     predList.add(criteriaBuilder.equal(root.get("createDate").as(Date.class), new Date(new DateUtil().parseDateTextToLong(addDate))));
                 } catch (ParseException e) {
@@ -205,103 +335,99 @@ public class EartagServiceImpl implements IEartagService {
     }
 
     /**
-     * @Method      : listEartagOnlineCountByEarmarkAndDate
+     * @Method : listEartagOnlineCountByEarmarkAndDate
      * @Description : 显示耳标在线统计
-     * @Params      : [earmark, pastDays]
-     * @Return      : com.huimv.eartag2.common.utils.Result
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2022/3/8       
-     * @Time        : 18:30
+     * @Params : [earmark, pastDays]
+     * @Return : com.huimv.eartag2.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2022/3/8
+     * @Time : 18:30
      */
     @Override
     public Result listEartagOnlineCountByEarmarkAndDate(String earmark, Integer pastDays) throws ParseException {
         DateUtil du = new DateUtil();
         String todayDateText = du.getTodayDateText();
         String startDateText = du.getPastDate(pastDays);
-        log.info("<listEartagOnlineCountByEarmarkAndDate> startDateText>>"+startDateText);
-        log.info("<listEartagOnlineCountByEarmarkAndDate> todayDateText>>"+todayDateText);
+        log.info("<listEartagOnlineCountByEarmarkAndDate> startDateText>>" + startDateText);
+        log.info("<listEartagOnlineCountByEarmarkAndDate> todayDateText>>" + todayDateText);
         //读取耳标在线统计记录
-        List<EartagEartagOnlineEntity> eartagOnlineEntityList = eartagOnlineRepo.getEartagOnlineByEarmarkAndDate(earmark,startDateText,todayDateText);
-        if(eartagOnlineEntityList.size()>0){
+        List<EartagEartagOnlineEntity> eartagOnlineEntityList = eartagOnlineRepo.getEartagOnlineByEarmarkAndDate(earmark, startDateText, todayDateText);
+        if (eartagOnlineEntityList.size() > 0) {
             JSONArray dataJa = new JSONArray();
-            for(EartagEartagOnlineEntity eartagOnlineEntity:eartagOnlineEntityList){
+            for (EartagEartagOnlineEntity eartagOnlineEntity : eartagOnlineEntityList) {
                 JSONObject eartagOnlineJo = JSONUtil.convertEntityToJSONObject(eartagOnlineEntity);
-                eartagOnlineJo.put("firstTime",du.formatDatetimeText(eartagOnlineJo.getDate("firstTime")));
-                eartagOnlineJo.put("lastTime",du.formatDatetimeText(eartagOnlineJo.getDate("lastTime")));
-                eartagOnlineJo.put("addDate",du.formatDateText(eartagOnlineJo.getDate("addDate")));
+                eartagOnlineJo.put("firstTime", du.formatDatetimeText(eartagOnlineJo.getDate("firstTime")));
+                eartagOnlineJo.put("lastTime", du.formatDatetimeText(eartagOnlineJo.getDate("lastTime")));
+                eartagOnlineJo.put("addDate", du.formatDateText(eartagOnlineJo.getDate("addDate")));
                 dataJa.add(eartagOnlineJo);
             }
-            return new Result(ResultCode.SUCCESS,dataJa);
-        }else{
-            return new Result(BizConst.CODE_EARTAG_ONLINE_NO_EXIST,BizConst.MSG_EARTAG_ONLINE_NO_EXIST,false);
+            return new Result(ResultCode.SUCCESS, dataJa);
+        } else {
+            return new Result(BizConst.CODE_EARTAG_ONLINE_NO_EXIST, BizConst.MSG_EARTAG_ONLINE_NO_EXIST, false);
         }
     }
 
     /**
-     * @Method      : listEartagFlowByDeviceCodeAndEarmarkAndToday
+     * @Method : listEartagFlowByDeviceCodeAndEarmarkAndToday
      * @Description : 根据设备编码、耳标号和当天日期读取耳标流水数据
-     * @Params      : [earmark, deviceCode]
-     * @Return      : com.huimv.eartag2.common.utils.Result
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2022/3/7       
-     * @Time        : 18:46
+     * @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);
+        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
+     * @Method : listEartagFlowByEarmarkAndToday
      * @Description : 根据耳标号读取今天所有流水
-     * @Params      : [earmark]
-     * @Return      : com.huimv.eartag2.common.utils.Result
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2022/3/7       
-     * @Time        : 18:41
+     * @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);
+        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
+     * @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){
+        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);
+        } else {
+            return new Result(BizConst.CODE_EARTAG_REGISTER_NO_EXIST, BizConst.MSG_EARTAG_REGISTER_NO_EXIST, false);
         }
     }