【feat】查询打耳标流水

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/HuimvManageApplication.java

@@ -22,7 +22,7 @@ import org.springframework.web.client.RestTemplate;
 @SpringBootApplication
 @EnableScheduling
 @MapperScan("com.huimv.eartag2.manage2.mapper")
-@Import(InterceptorConfig.class)
+//@Import(InterceptorConfig.class)
 public class HuimvManageApplication {
     public static void main(String[] args) throws InterruptedException {
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagEartagRegister2ServiceImpl.java

@@ -34,6 +34,7 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         String deviceCode = params.get("deviceCode");
         String farmId = params.get("farmId");
         String earmark = params.get("earmark");
+        String liveStatus = params.get("liveStatus");
         if (StringUtils.isBlank(pageNo)){
             pageNo="1";
         }
@@ -48,6 +49,7 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         wrapper.eq("farm_id",farmId);
         wrapper.eq(StringUtils.isNotBlank(unitId),"unit_id",unitId);
         wrapper.like(StringUtils.isNotBlank(earmark),"earmark",earmark);
+        wrapper.eq(StringUtils.isNotBlank(liveStatus),"live_status",liveStatus);
         wrapper.orderByDesc("ask_time");
         Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
         for (EartagEartagRegister2 record : page.getRecords()) {
@@ -59,6 +61,8 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         Map map = new HashMap();
         long allCount = this.count(wrapper);
         //在线
+        wrapper.clear();
+
         wrapper.eq("live_status", 1);
         long onCount = this.count(wrapper);
         map.put("countOff",allCount-onCount);

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

@@ -1,12 +1,9 @@
 package com.huimv.eartag2.manage2.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.huimv.eartag2.common.dao.entity.SysBaseConfigEntity;
-import com.huimv.eartag2.common.dao.repo.SysBaseConfigEntityRepo;
 import com.huimv.eartag2.manage2.mapper.BasePigpenMapper;
 import com.huimv.eartag2.manage2.mapper.EartagEartagRegister2Mapper;
 import com.huimv.eartag2.manage2.mapper.EartagOnlineStatusMapper;
-import com.huimv.eartag2.manage2.mapper.SysBaseConfigMapper;
 import com.huimv.eartag2.manage2.pojo.BasePigpen;
 import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
 import com.huimv.eartag2.manage2.pojo.EartagOnlineStatus;