增加耳标模糊查询

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

@@ -264,6 +264,7 @@ public class EartagController {
     @RequestMapping(value = "/listOnlineEartagCount",method = RequestMethod.GET)
     public Result listEartagOnlineCount(@RequestParam(value = "farmId",required = true) String farmId,
                                         @RequestParam(value = "addDate",required = false) String addDate,
+                                        @RequestParam(value = "earmark",required = false) String earmark,
                                         @RequestParam(value = "pageNo",required = true) Integer pageNo,
                                         @RequestParam(value = "pageSize",required = true) Integer pageSize,
                                         @RequestParam(value = "showMode",required = true) Integer showMode) throws ParseException {
@@ -272,11 +273,12 @@ public class EartagController {
         log.info("<listOnlineEartagCount>输入参数 pageNo>>"+pageNo);
         log.info("<listOnlineEartagCount>输入参数 pageSize>>"+pageSize);
         log.info("<listOnlineEartagCount>输入参数 showMode>>"+showMode);
+        log.info("<listOnlineEartagCount>输入参数 earmark>>"+earmark);
         if(addDate == null || addDate.trim().length() == 0){
             addDate = new DateUtil().getTodayDateText();
         }
         //
-        return eartagService.listOnlineEartagCount(farmId,addDate,pageNo,pageSize,showMode);
+        return eartagService.listOnlineEartagCount(farmId,addDate,pageNo,pageSize,showMode,earmark);
     }
 
     @RequestMapping(value = "/listOnlineEartagCount2",method = RequestMethod.GET)

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

@@ -32,7 +32,7 @@ public interface IEartagService {
     Result listEartagOnlineAllStatus(String farmId, Integer days) throws ParseException;
 
     //展示在线耳标列表
-    Result listOnlineEartagCount(String farmId, String addDate, Integer pageNo, Integer pageSize, Integer showMode) throws ParseException;
+    Result listOnlineEartagCount(String farmId, String addDate, Integer pageNo, Integer pageSize, Integer showMode, String earmark) throws ParseException;
 
     //获取该耳边前N天历史记录
 //    Result getEartagOnlineCountByEarmark(String earmark, Integer days) throws ParseException;

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

@@ -377,10 +377,10 @@ public class EartagServiceImpl implements IEartagService {
      * @Time : 21:52
      */
     @Override
-    public Result listOnlineEartagCount(String farmId, String addDate, Integer pageNo, Integer pageSize, Integer showMode) throws ParseException {
+    public Result listOnlineEartagCount(String farmId, String addDate, Integer pageNo, Integer pageSize, Integer showMode, String earmark) throws ParseException {
         if (showMode == 1) {
             //
-            return listEartagOnlineInRecords(farmId, addDate, pageNo, pageSize);
+            return listEartagOnlineInRecords(farmId, addDate,earmark, pageNo, pageSize);
         } else {
             //
             return getEartagOnlineInChart(farmId, addDate);
@@ -423,7 +423,7 @@ public class EartagServiceImpl implements IEartagService {
      * @Date : 2022/3/10
      * @Time : 21:54
      */
-    private Result listEartagOnlineInRecords(String farmId, String addDate, Integer pageNo, Integer pageSize) throws ParseException {
+    private Result listEartagOnlineInRecords(String farmId, String addDate, String earmark, Integer pageNo, Integer pageSize) throws ParseException {
         System.out.println("# addDate>>" + addDate);
         System.out.println("# farmId>>" + farmId);
         System.out.println("# pageNo>>" + pageNo);
@@ -436,6 +436,10 @@ public class EartagServiceImpl implements IEartagService {
                 predList.add(criteriaBuilder.equal(root.get("farmId").as(String.class), farmId));
             }
             //
+            if (null != earmark && earmark.trim().length() > 0) {
+                predList.add(criteriaBuilder.like(root.get("earmark").as(String.class), "%"+earmark+"%"));
+            }
+            //
             if (null != addDate && addDate.trim().length() > 0) {
                 try {
                     predList.add(criteriaBuilder.equal(root.get("addDate").as(Date.class), new Date(new DateUtil().parseDateTextToLong(addDate))));