修复manage模块部分bug。

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

@@ -32,7 +32,7 @@ public interface EartagEartagOnlineRepo extends JpaRepository<EartagEartagOnline
      * @Date        : 2022/3/8       
      * @Time        : 18:43
      */
-    @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")
+    @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 DESC")
     List<EartagEartagOnlineEntity> getEartagOnlineByEarmarkAndDate(String earmark, String startDateText, String todayDateText);
 
     /**

huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/server/EartagServerHandler2.java

@@ -162,13 +162,13 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
                 //处理获取设备编码命令
                 //{读取设备编码}
                 String deviceCode = dataService.getDeviceCodeByChipId(idCode);
-                log.info("获取设备编码结果 芯片id>>" + idCode + " ,deviceCode>>" + deviceCode);
+                log.info("获取设备编码结果,芯片id>>" + idCode + " ,deviceCode>>" + deviceCode);
                 if (deviceCode != null) {
                     String answer = "hm+1+0+" + deviceCode + "+123+8+end";
                     log.info(">>返回命令1设备编码-应答数据>>" + answer);
                     ctx.writeAndFlush(Unpooled.copiedBuffer(answer.getBytes()));
                 } else {
-                    log.error("检测到未注册的非法采集器设备,已舍弃请求.");
+                    log.error("检测到未注册的采集器设备,已舍弃请求.");
                 }
             } else if (cmd.trim().equalsIgnoreCase("2")) {
                 System.out.println("==>命令2请求 askText>>" + askText);

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

@@ -26,6 +26,28 @@ public class EartagController {
     private IEartagService eartagService;
 
     /**
+     * @Method      : listEartagOnlineAllStatus
+     * @Description : 显示耳标前N天在线记录
+     * @Params      : [farmId, days]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/30       
+     * @Time        : 20:04
+     */
+    @RequestMapping(value = "/listManyEartagOnlineStatus",method = RequestMethod.GET)
+    public Result listManyEartagOnlineStatus(@RequestParam(value = "farmId",required = true) String farmId,@RequestParam(value = "days",required = true) Integer days) throws ParseException {
+        log.info("<listManyDaysAllStatus>输入参数 farmId>>"+farmId);
+        log.info("<listManyDaysAllStatus>输入参数 days>>"+days);
+        if(days == null){
+            //默认7天数据
+            days = 7;
+        }
+        //{}
+        return eartagService.listManyEartagOnlineStatus(farmId,days);
+    }
+    
+    /**
      * @Method      : getEartagRegisterByEarmark
      * @Description : 读取耳标注册信息，设备在线页面调用
      * @Params      : [earmark]

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

@@ -45,4 +45,7 @@ public interface IEartagService {
 
     //分页展示所有耳标流水列表
     Result listAllEartagFlow(String farmId, String createDate, String deviceCode, String earmark, Integer pageNo, Integer pageSize) throws ParseException;
+
+    //
+    Result listManyEartagOnlineStatus(String farmId, Integer days) throws ParseException;
 }

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

@@ -857,7 +857,6 @@ public class DeviceServiceImpl implements IDeviceService {
 
         //{从总状态缓存钟读取缓存数据}
         DateUtil dateUtil = new DateUtil();
-        MathUtil mathUtil = new MathUtil();
         Map farmAllStatusMap = cacheService.getFarmAllStatusByFarmId(farmId);
         if (farmAllStatusMap.size() > 0) {
             log.info("返回缓存数据.");

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

@@ -134,6 +134,25 @@ public class EartagServiceImpl implements IEartagService {
     }
 
     @Override
+    public Result listManyEartagOnlineStatus(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.getDeviceTotal());
+//            newJo.put("rate", farmAllStatusEntity.getDeviceRate());
+//            newJo.put("offline", farmAllStatusEntity.getDeviceOffline());
+        }
+        return new Result(ResultCode.SUCCESS, dataJa);
+    }
+
+    @Override
     public Result listAllEartagRegister(String farmId, String earmark, Integer activeStatus, Integer liveStatus, Integer registerType, String startDate, String endDate, Integer pageNo, Integer pageSize) throws ParseException {
         //
         Specification<EartagEartagRegisterEntity> sf = (Specification<EartagEartagRegisterEntity>) (root, criteriaQuery, criteriaBuilder) -> {