增加APP查询接口

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

@@ -279,6 +279,16 @@ public class EartagController {
         return eartagService.listOnlineEartagCount(farmId,addDate,pageNo,pageSize,showMode);
     }
 
+    @RequestMapping(value = "/listOnlineEartagCount2",method = RequestMethod.GET)
+    public Result listOnlineEartagCount2() throws ParseException {
+        String addDate = new DateUtil().getTodayDateText();
+        String farmId = "101";
+        Integer pageNo = 1;
+        Integer pageSize   = 100;
+        Integer showMode = 1;
+        //
+        return eartagService.listEartagOnlineInRecords3(farmId,addDate,pageNo,pageSize,showMode);
+    }
     /**
      * @Method      : listEartagDeviceByEarmarkAndAddDate
      * @Description : 根据耳标和日期，查询关联设备记录
@@ -301,6 +311,17 @@ public class EartagController {
         return eartagService.listEartagDeviceByEarmarkAndAddDate(earmark,addDate);
     }
 
+    @RequestMapping(value = "/listEartag",method = RequestMethod.GET)
+    public Result listEartag()  {
+
+        return eartagService.listEartag();
+    }
+
+    @RequestMapping(value = "/listTemByEartag",method = RequestMethod.GET)
+    public Result listTemByEartag(@RequestParam(value = "earmark",required = true) String earmark)  {
+
+        return eartagService.listTemByEartag(earmark);
+    }
     /**
      * @Method      : listAllEartagRegister
      * @Description : 展示所有耳标注册列表

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

@@ -48,4 +48,11 @@ public interface IEartagService {
 
     //
     Result listManyEartagOnlineStatus(String farmId, Integer days) throws ParseException;
+
+
+    Result listEartag();
+
+    Result listTemByEartag(String earmark);
+
+    Result listEartagOnlineInRecords3(String farmId, String addDate, Integer pageNo, Integer pageSize, Integer showMode) throws ParseException;
 }

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

@@ -152,6 +152,85 @@ public class EartagServiceImpl implements IEartagService {
     }
 
     @Override
+    public Result listEartag() {
+//        farmAllStatusRepo.listEartag();
+        List<EartagEartagRegisterEntity> list = eartagRegisterRepo.listEartag();
+        System.out.println("list.size>>"+list.size());
+        return new Result(ResultCode.SUCCESS, list);
+    }
+
+    @Override
+    public Result listTemByEartag(String earmark) {
+        List<EartagDataEntity> list = eartagDataRepo.listTemByEartag(earmark);
+        return new Result(ResultCode.SUCCESS, list);
+    }
+
+    @Override
+    public Result listEartagOnlineInRecords3(String farmId, String addDate, Integer pageNo, Integer pageSize, Integer showMode) throws ParseException {
+        System.out.println("# addDate>>" + addDate);
+        System.out.println("# farmId>>" + farmId);
+        System.out.println("# pageNo>>" + pageNo);
+        System.out.println("# pageSize>>" + 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);
+        Page<EartagEartagOnlineEntity> pageEartagOnline = eartagOnlineRepo.findAll(sf, pageable);
+//        JSONObject outDataJo = new JSONObject();
+//        outDataJo.put("pageable", pageEartagOnline.getPageable());
+//        outDataJo.put("last", pageEartagOnline.isLast());
+//        outDataJo.put("totalElements", pageEartagOnline.getTotalElements());
+//        outDataJo.put("totalPages", pageEartagOnline.getTotalPages());
+//        outDataJo.put("number", pageEartagOnline.getNumber());
+//        outDataJo.put("size", pageEartagOnline.getSize());
+//        outDataJo.put("sort", pageEartagOnline.getSort());
+//        outDataJo.put("numberOfElements", pageEartagOnline.getNumberOfElements());
+//        outDataJo.put("first", pageEartagOnline.isFirst());
+//        outDataJo.put("empty", pageEartagOnline.isEmpty());
+
+        List<EartagEartagOnlineEntity> eartagOnlineEntityList = pageEartagOnline.getContent();
+        JSONArray outJa = new JSONArray();
+//        outDataJo.put("content", outJa);
+        DateUtil dateUtil = new DateUtil();
+        for (EartagEartagOnlineEntity eartagOnlineEntity : eartagOnlineEntityList) {
+            JSONObject outJo = new JSONObject();
+            outJa.add(outJo);
+            outJo.put("id", eartagOnlineEntity.getId());
+            outJo.put("earmark", eartagOnlineEntity.getEarmark());
+            outJo.put("total", eartagOnlineEntity.getTotal());
+            outJo.put("firstTime", dateUtil.formatDatetimeText(eartagOnlineEntity.getFirstTime()));
+            outJo.put("lastTime", dateUtil.formatDatetimeText(eartagOnlineEntity.getLastTime()));
+            outJo.put("envTemp", eartagOnlineEntity.getEnvTemp());
+            outJo.put("eartagTemp", eartagOnlineEntity.getEartagTemp());
+            outJo.put("addDate", eartagOnlineEntity.getAddDate());
+            outJo.put("farmId", eartagOnlineEntity.getFarmId());
+        }
+
+        return new Result(ResultCode.SUCCESS, outJa);
+    }
+
+
+    @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) -> {
@@ -407,6 +486,7 @@ public class EartagServiceImpl implements IEartagService {
         return new Result(ResultCode.SUCCESS, outDataJo);
     }
 
+
     /**
      * @Method : listEartagOnlineAllStatus
      * @Description :