接口全部完成

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

@@ -150,14 +150,19 @@ public class EartagController {
     @RequestMapping(value = "/listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager",method = RequestMethod.GET)
     public Result listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager(@RequestParam(value = "earmark",required = true) String earmark,
                                                                       @RequestParam(value = "deviceCode",required = true) String deviceCode,
+                                                                      @RequestParam(value = "createDate",required = true) String createDate,
                                                                       @RequestParam(value = "pageNo",required = true) Integer pageNo,
                                                                       @RequestParam(value = "pageSize",required = true) Integer pageSize) throws ParseException {
         log.info("<listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager> 输入参数 earmark>>"+earmark);
         log.info("<listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager> 输入参数 deviceCode>"+deviceCode);
+        log.info("<listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager> 输入参数 createDate>"+createDate);
         log.info("<listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager> 输入参数 pageNo>>"+pageNo);
         log.info("<listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager> 输入参数 pageSize>>"+pageSize);
+        if(createDate == null){
+            createDate = new DateUtil().getTodayDateText();
+        }
         //
-        return eartagService.listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager(earmark,deviceCode,pageNo,pageSize);
+        return eartagService.listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager(earmark,deviceCode,createDate,pageNo,pageSize);
     }
 
     /**
@@ -278,7 +283,7 @@ public class EartagController {
 
     /**
      * @Method      : listAllEartagRegister
-     * @Description : 展示所有耳标列表
+     * @Description : 展示所有耳标注册列表
      * @Params      : [farmId]
      * @Return      : com.huimv.eartag2.common.utils.Result
      * 
@@ -309,6 +314,16 @@ public class EartagController {
         return eartagService.listAllEartagRegister(farmId,earmark,activeStatus,liveStatus,registerType,startDate,endDate,pageNo,pageSize);
     }
 
+    /**
+     * @Method      : listAllEartagFlow
+     * @Description : 展示所有流水列表
+     * @Params      : [farmId, createDate, deviceCode, earmark, pageNo, pageSize]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/11       
+     * @Time        : 20:29
+     */
     @RequestMapping(value = "/listAllEartagFlow",method = RequestMethod.GET)
     public Result listAllEartagFlow(@RequestParam(value = "farmId",required = true) String farmId,
                                         @RequestParam(value = "createDate",required = false) String createDate,

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

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

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

@@ -408,19 +408,27 @@ public class EartagServiceImpl implements IEartagService {
      * @Time : 20:37
      */
     @Override
-    public Result listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager(String earmark, String deviceCode, Integer pageNo, Integer pageSize) {
+    public Result listEartagFlowByDeviceCodeAndEarmarkAndTodayInPager(String earmark, String deviceCode, String createDate, Integer pageNo, Integer pageSize) {
         //
         Specification<EartagDataEntity> sf = (Specification<EartagDataEntity>) (root, criteriaQuery, criteriaBuilder) -> {
             //
             List<Predicate> predList = new ArrayList<>();
             //earmark
-            if (null != earmark) {
+            if (null != earmark && earmark.trim().length()>0) {
                 predList.add(criteriaBuilder.equal(root.get("earmark").as(String.class), earmark));
             }
-            //
-            if (null != deviceCode) {
+            //deviceCode
+            if (null != deviceCode  && deviceCode.trim().length()>0) {
                 predList.add(criteriaBuilder.equal(root.get("device").as(String.class), deviceCode));
             }
+            //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();
+                }
+            }
             Predicate[] pred = new Predicate[predList.size()];
             Predicate and = criteriaBuilder.and(predList.toArray(pred));
             criteriaQuery.where(and);