修复51接口bug.

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

@@ -338,7 +338,7 @@ public class EartagController {
         if(createDate == null || createDate.trim().length() == 0){
             createDate = new DateUtil().getTodayDateText();
         }
-        //
+        //{}
         return eartagService.listAllEartagFlow(farmId,createDate,deviceCode,earmark,pageNo,pageSize);
     }
 

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

@@ -44,5 +44,5 @@ public interface IEartagService {
     Result listAllEartagRegister(String farmId, String earmark, Integer activeStatus, Integer liveStatus, Integer registerType, String startDate, String endDate, Integer pageNo, Integer pageSize) throws ParseException;
 
     //分页展示所有耳标流水列表
-    Result listAllEartagFlow(String farmId, String createDate, String deviceCode, String earmark, Integer pageNo, Integer pageSize);
+    Result listAllEartagFlow(String farmId, String createDate, String deviceCode, String earmark, Integer pageNo, Integer pageSize) throws ParseException;
 }

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

@@ -55,7 +55,7 @@ public class EartagServiceImpl implements IEartagService {
      * @Time        : 11:30
      */
     @Override
-    public Result listAllEartagFlow(String farmId, String createDate, String deviceCode, String earmark, Integer pageNo, Integer pageSize) {
+    public Result listAllEartagFlow(String farmId, String createDate, String deviceCode, String earmark, Integer pageNo, Integer pageSize) throws ParseException {
         //
         Specification<EartagDataEntity> sf = (Specification<EartagDataEntity>) (root, criteriaQuery, criteriaBuilder) -> {
             //
@@ -89,8 +89,47 @@ public class EartagServiceImpl implements IEartagService {
             return criteriaQuery.orderBy(orders).getRestriction();
         };
         Pageable pageable = PageRequest.of(pageNo - 1, pageSize);
-        Page<EartagDataEntity> eartagDataEntityPage = eartagDataRepo.findAll(sf, pageable);
-        return new Result(ResultCode.SUCCESS, eartagDataEntityPage);
+//        Page<EartagDataEntity> eartagDataEntityPage = eartagDataRepo.findAll(sf, pageable);
+//        return new Result(ResultCode.SUCCESS, eartagDataEntityPage);
+        Page<EartagDataEntity> pageEartagData = eartagDataRepo.findAll(sf, pageable);
+        JSONObject outDataJo = new JSONObject();
+        outDataJo.put("pageable",pageEartagData.getPageable());
+        outDataJo.put("last",pageEartagData.isLast());
+        outDataJo.put("totalElements",pageEartagData.getTotalElements());
+        outDataJo.put("totalPages",pageEartagData.getTotalPages());
+        outDataJo.put("number",pageEartagData.getNumber());
+        outDataJo.put("size",pageEartagData.getSize());
+        outDataJo.put("sort",pageEartagData.getSort());
+        outDataJo.put("numberOfElements",pageEartagData.getNumberOfElements());
+        outDataJo.put("first",pageEartagData.isFirst());
+        outDataJo.put("empty",pageEartagData.isEmpty());
+
+        List<EartagDataEntity> dataEntityList = pageEartagData.getContent();
+        JSONArray outJa = new JSONArray();
+        outDataJo.put("content",outJa);
+        DateUtil dateUtil = new DateUtil();
+        for(EartagDataEntity eartagDataEntity:dataEntityList) {
+            JSONObject outJo = new JSONObject();
+            outJa.add(outJo);
+            outJo.put("id", eartagDataEntity.getId());
+            outJo.put("cmdHeader", eartagDataEntity.getCmdHeader());
+            outJo.put("device", eartagDataEntity.getDevice());
+            outJo.put("earmark", eartagDataEntity.getEarmark());
+            outJo.put("bat", eartagDataEntity.getBat());
+            outJo.put("earTemp", eartagDataEntity.getEarTemp());
+            outJo.put("earTemp1", eartagDataEntity.getEarTemp1());
+            outJo.put("envTemp", eartagDataEntity.getEnvTemp());
+            outJo.put("envTemp1", eartagDataEntity.getEnvTemp1());
+            outJo.put("act", eartagDataEntity.getAct());
+            outJo.put("act1", eartagDataEntity.getAct1());
+            outJo.put("signal1", eartagDataEntity.getSignal1());
+            outJo.put("askTime", eartagDataEntity.getAskTime());
+            outJo.put("other", eartagDataEntity.getOther());
+            outJo.put("addTime", dateUtil.formatDatetimeText(eartagDataEntity.getAddTime()));
+            outJo.put("createDate", eartagDataEntity.getCreateDate());
+            outJo.put("farmId", eartagDataEntity.getFarmId());
+        }
+        return new Result(ResultCode.SUCCESS, outDataJo);
     }
 
     @Override