根据行政编码查牧场

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/controller/BaseFarmInfoController.java

@@ -44,7 +44,7 @@ public class BaseFarmInfoController {
      public R findByCityCode(@RequestParam Map<String, Object> params){
          List list = baseFarmInfoService.findByCityCode(params);
 
-         return R.ok().put("page", list );
+         return R.ok().put("page", list);
      }
 
     /**

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/impl/BaseFarmInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.huimv.manager.mapper.BaseFarmInfoDao;
 import com.huimv.manager.service.BaseFarmInfoService;
 import com.huimv.manager.utils.PageUtils;
 import com.huimv.manager.utils.Query;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -24,6 +25,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service("baseFarmInfoService")
 public class BaseFarmInfoServiceImpl extends ServiceImpl<BaseFarmInfoDao, BaseFarmInfoEntity> implements BaseFarmInfoService {
 
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<BaseFarmInfoEntity> page = this.page(
@@ -38,8 +40,11 @@ public class BaseFarmInfoServiceImpl extends ServiceImpl<BaseFarmInfoDao, BaseFa
     public List findByCityCode(Map<String, Object> params) {
 
         String countyCode = (String)params.get("countyCode");
+        if ("330000".equals(countyCode)){
+            countyCode = null;
+        }
         QueryWrapper<BaseFarmInfoEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("county",countyCode).or().eq("city",countyCode);
+        wrapper.eq(StringUtils.isNotBlank(countyCode),"county",countyCode).or().eq(StringUtils.isNotBlank(countyCode),"city",countyCode);
        return baseMapper.selectList(wrapper);
     }
 }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/impl/EartagDataServiceImpl.java

@@ -297,7 +297,7 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
 
         String startTime = (String) params.get("startTime");
         String endTime = (String) params.get("endTime");
-        String deviceCode = (String) params.get("deviceCode");
+        String deviceCode = (String) params.get("countByDay");
 
 
         QueryWrapper<EartagDataEntity> wrapper = new QueryWrapper<>();