增加单个耳标在线记录图表

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

@@ -74,12 +74,19 @@ public class EartagController {
     @RequestMapping(value = "/listEartagFlowByEarmarkAndTodayInPager",method = RequestMethod.GET)
     public Result listEartagFlowByEarmarkAndTodayInPager(@RequestParam(value = "earmark",required = true) String earmark,
                                                          @RequestParam(value = "pageNo",required = true) Integer pageNo,
-                                                         @RequestParam(value = "pageSize",required = true) Integer pageSize){
+                                                         @RequestParam(value = "pageSize",required = true) Integer pageSize,
+                                                         @RequestParam(value = "createDate",required = false) String createDate,
+                                                         @RequestParam(value = "deviceCode",required = false) String deviceCode) throws ParseException {
         log.info("<listEartagFlowByEarmarkAndTodayInPager> 输入参数 earmark>>"+earmark);
         log.info("<listEartagFlowByEarmarkAndTodayInPager> 输入参数 pageNo>>"+pageNo);
         log.info("<listEartagFlowByEarmarkAndTodayInPager> 输入参数 pageSize>>"+pageSize);
+        log.info("<listEartagFlowByEarmarkAndTodayInPager> 输入参数 createDate>>"+createDate);
+        log.info("<listEartagFlowByEarmarkAndTodayInPager> 输入参数 deviceCode>>"+deviceCode);
+        if(createDate == null){
+            createDate = new DateUtil().getTodayDateText();
+        }
         //
-        return eartagService.listEartagFlowByEarmarkAndTodayInPager(earmark,pageNo,pageSize);
+        return eartagService.listEartagFlowByEarmarkAndTodayInPager(earmark,pageNo,pageSize,createDate,deviceCode);
     }
 
     /**

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

@@ -20,7 +20,7 @@ public interface IEartagService {
     Result listEartagOnlineStatusByEarmarkAndDate(String earmark, Integer pastDays) throws ParseException;
 
     //带分页查询耳标流水
-    Result listEartagFlowByEarmarkAndTodayInPager(String earmark, Integer pageNo, Integer pageSize);
+    Result listEartagFlowByEarmarkAndTodayInPager(String earmark, Integer pageNo, Integer pageSize, String createDate, String deviceCode);
 
     //带分页查询耳标流水
     Result listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager(String earmark, String deviceCode, Integer pageNo, Integer pageSize);

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

@@ -304,20 +304,24 @@ public class DeviceServiceImpl implements IDeviceService {
         Specification<EartagDeviceOnlineEntity> sf = (Specification<EartagDeviceOnlineEntity>) (root, criteriaQuery, criteriaBuilder) -> {
             //
             List<Predicate> predList = new ArrayList<>();
-            if (null != farmId) {
+            //
+            if (null != farmId && farmId.trim().length()>0) {
                 predList.add(criteriaBuilder.equal(root.get("farmId").as(String.class), farmId));
             }
-            if (null != deviceCode) {
+            //
+            if (null != deviceCode && deviceCode.trim().length()>0) {
                 predList.add(criteriaBuilder.equal(root.get("deviceCode").as(String.class), deviceCode));
             }
-            if (null != addDate) {
+            //
+            if (null != addDate && addDate.trim().length()>0) {
                 try {
                     predList.add(criteriaBuilder.equal(root.get("addDate").as(Date.class), new Date(dateUtil.parseDateTextToLong(addDate))));
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
             }
-            if (null != alias) {
+            //
+            if (null != alias && alias.trim().length()>0) {
                 predList.add(criteriaBuilder.equal(root.get("alias").as(String.class), alias));
             }
             Predicate[] pred = new Predicate[predList.size()];

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

@@ -366,18 +366,30 @@ public class EartagServiceImpl implements IEartagService {
      * @Time : 20:19
      */
     @Override
-    public Result listEartagFlowByEarmarkAndTodayInPager(String earmark, Integer pageNo, Integer pageSize) {
+    public Result listEartagFlowByEarmarkAndTodayInPager(String earmark, Integer pageNo, Integer pageSize, String createDate, String deviceCode) {
         //
         Specification<EartagDataEntity> sf = (Specification<EartagDataEntity>) (root, criteriaQuery, criteriaBuilder) -> {
             //
             List<Predicate> predList = new ArrayList<>();
-            if (null != earmark) {
+            //earmark
+            if (null != earmark && earmark.trim().length()>0) {
                 predList.add(criteriaBuilder.equal(root.get("earmark").as(String.class), earmark));
             }
+            //createDate
+            if (null != createDate && createDate.trim().length()>0) {
+                try {
+                    predList.add(criteriaBuilder.equal(root.get("createDate").as(Date.class), new Date(new DateUtil().parseDateTextToLong(createDate))));
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            }
+            //deviceCode
+            if (null != deviceCode && deviceCode.trim().length()>0) {
+                predList.add(criteriaBuilder.equal(root.get("device").as(String.class), deviceCode));
+            }
             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();