app查询栋舍列表

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

@@ -1,6 +1,7 @@
  package com.huimv.manager.controller;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.huimv.manager.result.R;
 import com.huimv.manager.utils.PageUtils;
@@ -25,6 +26,7 @@ import com.huimv.manager.service.BasePigpenService;
 public class BasePigpenController {
     @Autowired
     private BasePigpenService basePigpenService;
+    private Map<String, Object> params;
 
     /**
      * 列表
@@ -32,7 +34,6 @@ public class BasePigpenController {
     @RequestMapping("/list")
     public R list(@RequestParam Map<String, Object> params){
         PageUtils page = basePigpenService.queryPage(params);
-
         return R.ok().put("page", page);
     }
 
@@ -52,7 +53,12 @@ public class BasePigpenController {
      */
     @RequestMapping("/save")
     public R save(@RequestBody BasePigpenEntity basePigpen){
-		basePigpenService.save(basePigpen);
+        String pigpenName = basePigpen.getPigpenName();
+        String[] split = pigpenName.split(",");
+        for (String s : split) {
+            basePigpen.setPigpenName(s);
+            basePigpenService.save(basePigpen);
+        }
 
         return R.ok();
     }
@@ -63,7 +69,6 @@ public class BasePigpenController {
     @RequestMapping("/update")
     public R update(@RequestBody BasePigpenEntity basePigpen){
 		basePigpenService.updateById(basePigpen);
-
         return R.ok();
     }
 
@@ -72,17 +77,17 @@ public class BasePigpenController {
      */
     @RequestMapping("/delete")
     public R delete(@RequestBody Integer[] ids){
-		basePigpenService.removeByIds(Arrays.asList(ids));
-
+        basePigpenService.delete(ids);
+        basePigpenService.removeByIds(Arrays.asList(ids));
         return R.ok();
     }
 
     @RequestMapping("/listAll")
-    public R countAll(){
+    public R listAll(){
         List endList = new ArrayList();
         List<BasePigpenEntity> list = basePigpenService.list();
         for (BasePigpenEntity basePigpenEntity : list) {
-            if (basePigpenEntity.getParentId() ==null){
+            if (basePigpenEntity.getParentId() ==0){
                 Map map =new HashMap();
                 map.put("id",basePigpenEntity.getId());
                 map.put("farmCode",basePigpenEntity.getFarmCode());
@@ -107,6 +112,7 @@ public class BasePigpenController {
                 map.put("parentId",basePigpenEntity.getParentId());
                 map.put("pigpenName",basePigpenEntity.getPigpenName());
                 map.put("type",basePigpenEntity.getType());
+//                map.put("children",getChildren(basePigpenEntity.getId(),list));
                 map.put("children",getChildren(basePigpenEntity.getId(),list));
                 endList.add(map);
             }
@@ -115,4 +121,36 @@ public class BasePigpenController {
     }
 
 
+
+    /*
+    *手机端获得列表
+    */
+    @RequestMapping("/appList")
+    public R appList(@RequestParam Map<String, Object> params){
+        PageUtils page = basePigpenService.appList(params);
+        return R.ok().put("page", page);
+    }
+
+    /*
+     *手机端获得栋舍数量
+     */
+    @RequestMapping("/appCountPigpen")
+    public R appCountPigpen(@RequestParam Map<String, Object> params){
+        Map list = basePigpenService.appCountPigpen(params);
+
+
+        return R.ok().put("page", list);
+    }
+
+
+    /*
+     *手机端温度曲线
+     */
+    @RequestMapping("/appTemp")
+    public R appTemp(@RequestParam Map<String, Object> params){
+        List list = basePigpenService.appTemp(params);
+
+
+        return R.ok().put("page", list);
+    }
 }

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

@@ -17,6 +17,7 @@ import com.huimv.manager.service.BaseRegionService;
 import com.huimv.manager.service.EartagDataService;
 import com.huimv.manager.utils.Query;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 
 import com.huimv.manager.service.CollectorRegisterService;
@@ -177,4 +178,11 @@ public class CollectorRegisterController {
     public R selectEveryStatusCollectors() {
         return collectorRegisterService.selectPcEveryStatusCollectors();
     }
+
+//    @GetMapping("/updateAcqStatus")
+    @Scheduled(cron = "0 0/10 * * * ?")
+    public void updateAcqStatus() {
+        List<CollectorRegisterEntity> list = collectorRegisterService.list();
+        collectorRegisterService.updateAcqStatus(list);
+    }
 }

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

@@ -0,0 +1,85 @@
+ package com.huimv.manager.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import com.huimv.manager.entity.DeviceTempEntity;
+import com.huimv.manager.result.R;
+import com.huimv.manager.service.DeviceTempService;
+import com.huimv.manager.utils.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 17:22:28
+ */
+@RestController
+@RequestMapping("management/devicetemp")
+public class DeviceTempController {
+    @Autowired
+    private DeviceTempService deviceTempService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = deviceTempService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		DeviceTempEntity deviceTemp = deviceTempService.getById(id);
+
+        return R.ok().put("deviceTemp", deviceTemp);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody DeviceTempEntity deviceTemp){
+		deviceTempService.save(deviceTemp);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody DeviceTempEntity deviceTemp){
+		deviceTempService.updateById(deviceTemp);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		deviceTempService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/entity/BasePigpenEntity.java

@@ -2,9 +2,12 @@ package com.huimv.manager.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 栋舍表
@@ -36,6 +39,36 @@ public class BasePigpenEntity implements Serializable {
      */
     private Integer type;
 
+
+    /**
+     * 牧场编号
+     */
     private String farmCode;
 
+    /**
+     * 猪舍温度
+     */
+    private Double pigpenTemp;
+
+    /**
+     * 异常状态 1.正常 2.异常
+     */
+    private Integer tempAnomaly;
+
+
+    private Object children;
+
+    /**
+     * 阶段
+     */
+    private Integer stage;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GTM+8")
+    private Date creatTime;
+
+
+
 }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/entity/DeviceTempEntity.java

@@ -0,0 +1,60 @@
+package com.huimv.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 17:22:28
+ */
+@Data
+@TableName("device_temp")
+public class DeviceTempEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String header;
+	/**
+	 * 
+	 */
+	private String deviceCode;
+	/**
+	 * 
+	 */
+	private Integer cmd;
+	/**
+	 * 
+	 */
+	private Integer serialNo;
+	/**
+	 * 
+	 */
+	private Double tempValue;
+	/**
+	 * 
+	 */
+	private Date createDate;
+	/**
+	 * 
+	 */
+	private Integer checkCode;
+	/**
+	 * 
+	 */
+	private String tail;
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/entity/vo/PigpenVo.java

@@ -0,0 +1,26 @@
+package com.huimv.manager.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.manager.entity.vo
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/8/11 0011 15:17
+ **/
+@Data
+public class PigpenVo {
+
+    private String pigpenName;
+
+    private Double pigpenTemp;
+
+    private Integer tempAnomaly;
+
+    private Integer stage;
+
+    private Integer countPig;
+
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/mapper/CollectorRegisterDao.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.manager.entity.vo.CollectorRegisterVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 /**
  * 
@@ -17,6 +18,7 @@ import org.apache.ibatis.annotations.Param;
  * @date 2021-07-24 16:29:33
  */
 @Mapper
+@Repository
 public interface CollectorRegisterDao extends BaseMapper<CollectorRegisterEntity> {
 
     IPage<CollectorRegisterVo> page(@Param("page")IPage page,@Param(Constants.WRAPPER) QueryWrapper<CollectorRegisterEntity> wrapper);

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/mapper/DeviceTempDao.java

@@ -0,0 +1,19 @@
+package com.huimv.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.manager.entity.DeviceTempEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 17:22:28
+ */
+@Mapper
+@Repository
+public interface DeviceTempDao extends BaseMapper<DeviceTempEntity> {
+	
+}

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.manager.entity.BasePigpenEntity;
 
 import com.huimv.manager.utils.PageUtils;
+
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,5 +19,13 @@ import java.util.Map;
 public interface BasePigpenService extends IService<BasePigpenEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    Map appCountPigpen(Map<String, Object> params);
+
+    PageUtils appList(Map<String, Object> params);
+
+    void delete(Integer[] ids);
+
+    List appTemp(Map<String, Object> params);
 }
 

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

@@ -24,5 +24,8 @@ public interface CollectorRegisterService extends IService<CollectorRegisterEnti
     R selectEveryStatusCollectors(String farmCode);
 
     R selectPcEveryStatusCollectors();
+
+
+    void updateAcqStatus(List<CollectorRegisterEntity> list);
 }
 

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

@@ -0,0 +1,20 @@
+package com.huimv.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.manager.entity.DeviceTempEntity;
+import com.huimv.manager.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 17:22:28
+ */
+public interface DeviceTempService extends IService<DeviceTempEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

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

@@ -1,10 +1,25 @@
 package com.huimv.manager.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.manager.entity.CollectorRegisterEntity;
+import com.huimv.manager.entity.DeviceTempEntity;
+import com.huimv.manager.entity.PigBasicInformationEntity;
+import com.huimv.manager.entity.vo.PigpenVo;
 import com.huimv.manager.mapper.BasePigpenDao;
+import com.huimv.manager.mapper.CollectorRegisterDao;
+import com.huimv.manager.mapper.DeviceTempDao;
+import com.huimv.manager.mapper.PigBasicInformationDao;
+import com.huimv.manager.result.RRException;
 import com.huimv.manager.utils.PageUtils;
 import com.huimv.manager.utils.Query;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.Map;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -23,14 +38,151 @@ import com.huimv.manager.service.BasePigpenService;
 @Service("basePigpenService")
 public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenDao, BasePigpenEntity> implements BasePigpenService {
 
+    @Autowired
+    private CollectorRegisterDao collectorRegisterDao;
+
+    @Autowired
+    private DeviceTempDao deviceTempDao;
+
+    @Autowired
+    private PigBasicInformationDao pigBasicInformationDao;
+
+
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+        String farmCode = (String)params.get("farmCode");
+        String createStartTime = (String)params.get("createStartTime");
+        String createEndTime = (String)params.get("createEndTime");
+        String stage = (String)params.get("stage");
+        String name = (String)params.get("name");
+
+        QueryWrapper<BasePigpenEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
+        wrapper.eq("type",1);
+        wrapper.le(StringUtils.isNotBlank(createEndTime),"creat_time",createEndTime);
+        wrapper.ge(StringUtils.isNotBlank(createStartTime),"creat_time",createStartTime);
+        if (StringUtils.isNotBlank(stage)){
+            wrapper.eq("stage",Integer.parseInt(stage));
+        }
+
+        wrapper.like(StringUtils.isNotBlank(name),"name",name);
+
+
         IPage<BasePigpenEntity> page = this.page(
                 new Query<BasePigpenEntity>().getPage(params),
-                new QueryWrapper<BasePigpenEntity>()
+                wrapper
         );
 
+        for (BasePigpenEntity record : page.getRecords()) {
+            Integer id = record.getId();
+            wrapper.clear();
+            wrapper.eq("parent_id",id);
+            record.setChildren(baseMapper.selectList(wrapper));
+        }
+
+
         return new PageUtils(page);
     }
 
+    @Override
+    public PageUtils appList(Map<String, Object> params) {
+        String farmCode = (String)params.get("farmCode");
+        String stage = (String)params.get("stage");
+        QueryWrapper<BasePigpenEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
+        wrapper.eq("type",2);
+        if (StringUtils.isNotBlank(stage)){
+            wrapper.eq("stage",Integer.parseInt(stage));
+        }
+
+        IPage<BasePigpenEntity> page = this.page(
+                new Query<BasePigpenEntity>().getPage(params),
+                wrapper
+        );
+
+
+        List<PigpenVo> pigpenVos = new ArrayList<>();
+        QueryWrapper<PigBasicInformationEntity> pigBasicInformationEntityQueryWrapper = new QueryWrapper<>();
+        for (BasePigpenEntity record : page.getRecords()) {
+            Integer id = record.getId();
+            Integer parentId = record.getParentId();
+            pigBasicInformationEntityQueryWrapper.eq("unit_id",id);
+            Integer countPig = pigBasicInformationDao.selectCount(pigBasicInformationEntityQueryWrapper);
+            PigpenVo pigpenVo = new PigpenVo();
+            BasePigpenEntity basePigpenEntity = baseMapper.selectById(parentId);
+
+            pigpenVo.setPigpenName(basePigpenEntity.getPigpenName()+record.getPigpenName());
+            pigpenVo.setPigpenTemp(record.getPigpenTemp());
+            pigpenVo.setStage(record.getStage());
+            pigpenVo.setTempAnomaly(record.getTempAnomaly());
+
+
+            pigpenVo.setCountPig(countPig);
+            pigpenVos.add(pigpenVo);
+
+        }
+
+        IPage<PigpenVo> page1 = new Page();
+        page1.setRecords(pigpenVos);
+
+
+        return new PageUtils(page1);
+
+    }
+
+    @Override
+    public Map appCountPigpen(Map<String, Object> params) {
+        String farmCode = (String)params.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            throw new RRException("请选择牧场");
+        }
+
+        QueryWrapper<BasePigpenEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_code",farmCode);
+        List<BasePigpenEntity> basePigpenEntities = baseMapper.selectList(wrapper);
+        long pigpen = basePigpenEntities.stream()
+                .filter(o -> o.getType() == 1).count();
+        long unit = basePigpenEntities.stream()
+                .filter(o -> o.getType() == 2).count();
+        Map map = new HashMap();
+        map.put("pigpen",pigpen);
+        map.put("unit",unit);
+        return  map;
+
+
+    }
+
+
+    @Override
+    public void delete(Integer[] ids) {
+        QueryWrapper<BasePigpenEntity> wrapper = new QueryWrapper<>();
+        wrapper.in("parent_id",ids);
+        baseMapper.delete(wrapper);
+    }
+
+
+    @Override
+    public List appTemp(Map<String, Object> params) {
+
+        String unitId = (String)params.get("unitId");
+        String createStartDate =(String)params.get("createStartDate");
+        String createEndDate =(String)params.get("createEndDate");
+
+
+        QueryWrapper<CollectorRegisterEntity> collectorRegisterEntityQueryWrapper = new QueryWrapper<>();
+        collectorRegisterEntityQueryWrapper.eq("unit_id",unitId);
+        List<CollectorRegisterEntity> collectorRegisterEntities = collectorRegisterDao.selectList(collectorRegisterEntityQueryWrapper);
+        if (collectorRegisterEntities == null || collectorRegisterEntities.size() == 0){
+            throw new RRException("该栋舍下没有传感器");
+        }
+        String deviceCode = collectorRegisterEntities.get(0).getDeviceCode();
+        QueryWrapper<DeviceTempEntity> deviceTempEntityQueryWrapper = new QueryWrapper<>();
+        deviceTempEntityQueryWrapper.eq("device_code",deviceCode);
+        deviceTempEntityQueryWrapper.le("device_code",createEndDate);
+        deviceTempEntityQueryWrapper.ge("device_code",createStartDate);
+
+
+        return  deviceTempDao.selectList(deviceTempEntityQueryWrapper);
+    }
 }

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

@@ -1,11 +1,14 @@
 package com.huimv.manager.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.manager.entity.BaseRegionEntity;
+import com.huimv.manager.entity.EartagDataEntity;
 import com.huimv.manager.entity.vo.CollectorRegisterVo;
 import com.huimv.manager.mapper.BaseRegionDao;
 import com.huimv.manager.mapper.CollectorRegisterDao;
+import com.huimv.manager.mapper.EartagDataDao;
 import com.huimv.manager.result.R;
 import com.huimv.manager.result.RRException;
 import com.huimv.manager.utils.Constant;
@@ -13,10 +16,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -55,10 +55,12 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
 
         wrapper.like(StringUtils.isNotBlank(deviceCode),"register.device_code",deviceCode);
         if(StringUtils.isNotBlank(countyName)){
-            wrapper.like("register.county_name",countyName).or().like("register.county_code",countyName);
+//            wrapper.like("register.county_name",countyName).or().like("register.county_code",countyName);
+            wrapper.apply("(register.county_name LIKE '%"+countyName+"%' OR register.county_code LIKE '%"+countyName+"%')");
         }
         if (StringUtils.isNotBlank(farmName)){
-            wrapper.like("register.farm_name",farmName).or().like("register.farm_code",farmName);
+//            wrapper.like("register.farm_name",farmName).or().like("register.farm_code",farmName);
+            wrapper.apply("(register.farm_name LIKE '%"+farmName+"%' OR register.farm_name LIKE '%"+farmName+"%')");
         }
 
 
@@ -85,7 +87,7 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
         }
 
 
-        wrapper.apply("register.del_status  = 1");
+//        wrapper.apply("register.del_status  = 1");
 
         String sortord = (String)params.get("sortord");
         wrapper.orderByDesc(StringUtils.isNotBlank(sortord),sortord);
@@ -173,4 +175,23 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
 
         return R.ok().put("data", map);
     }
+
+
+    @Autowired
+    private EartagDataDao eartagDataDao;
+    @Override
+    public void updateAcqStatus(List<CollectorRegisterEntity> list) {
+        for (CollectorRegisterEntity collectorRegisterEntity : list) {
+            String deviceCode = collectorRegisterEntity.getDeviceCode();
+            QueryWrapper<EartagDataEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq("",deviceCode);
+            Date now = new Date();
+            wrapper.ge("time", DateUtil.offsetMinute(now,-10));
+            Integer integer = eartagDataDao.selectCount(wrapper);
+            if (integer == 0){
+                collectorRegisterEntity.setAcqStatus(2);
+                baseMapper.updateById(collectorRegisterEntity);
+            }
+        }
+    }
 }

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

@@ -0,0 +1,34 @@
+package com.huimv.manager.service.impl;
+
+import com.huimv.manager.entity.DeviceTempEntity;
+import com.huimv.manager.mapper.DeviceTempDao;
+import com.huimv.manager.service.DeviceTempService;
+import com.huimv.manager.utils.PageUtils;
+import com.huimv.manager.utils.Query;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 17:22:28
+ */
+@Service("deviceTempService")
+public class DeviceTempServiceImpl extends ServiceImpl<DeviceTempDao, DeviceTempEntity> implements DeviceTempService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<DeviceTempEntity> page = this.page(
+                new Query<DeviceTempEntity>().getPage(params),
+                new QueryWrapper<DeviceTempEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

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

@@ -117,8 +117,8 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             QueryWrapper<EartagDataEntity> wrapper = new QueryWrapper<>();
             wrapper.eq("farm_code", farmCode);
             wrapper.ge("time", DateUtil.beginOfDay(now));
-
-            wrapper.apply("id IN (SELECT MAX(id) from  eartag_data group by eartag_no)");
+//            wrapper.groupBy(" eartag_no");
+            wrapper.apply("id IN (SELECT MAX(id) from  eartag_data where time >='"+DateUtil.beginOfDay(now)+"' group by eartag_no)");
             List<EartagDataEntity> eartagDataEntities = baseMapper.selectList(wrapper);
 
 
@@ -126,14 +126,14 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             wrapper.clear();
             wrapper.eq("farm_code", farmCode);
 
+            wrapper.le("time", DateUtil.beginOfDay(now));
             wrapper.ge("time", DateUtil.offsetDay(DateUtil.beginOfDay(now), -1));
-
-            wrapper.apply("id IN (SELECT MAX(id) from  eartag_data group by eartag_no)");
+//            wrapper.groupBy(" eartag_no");
+            wrapper.apply("id IN (SELECT MAX(id) from  eartag_data where  time <='"+ DateUtil.beginOfDay(now)+"' AND time >= '"+DateUtil.offsetDay(DateUtil.beginOfDay(now), -1)+"' group by eartag_no)");
             List<EartagDataEntity> yesterdayEartagDataEntities = baseMapper.selectList(wrapper);
 
 
 
-
             Integer allSow =0;
 
             List<String> sowEartagDataEntities =new ArrayList<>();
@@ -161,6 +161,7 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
 
             //拷贝
             List sowEartagDataEntities1 = ObjectUtil.cloneByStream(sowEartagDataEntities);
+            List yesterdayEartagDataEntities1 = ObjectUtil.cloneByStream(yesterdayEartagDataEntities);
 
             //得到新增
             sowEartagDataEntities.removeAll(sowYesterdayEartagDataEntities);

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/CollectorRegisterDao.xml

@@ -51,7 +51,7 @@
         join base_pigpen pigpen on pigpen.id = register.pigpen_id
         join base_pigpen unit on unit.id = register.unit_id
 
-      ${ew.customSqlSegment}
+      ${ew.customSqlSegment}     AND register.del_status = 1
     </select>
 
 

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/DeviceTempDao.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.huimv.manager.mapper.DeviceTempDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.manager.entity.DeviceTempEntity" id="deviceTempMap">
+        <result property="id" column="id"/>
+        <result property="header" column="header"/>
+        <result property="deviceCode" column="device_code"/>
+        <result property="cmd" column="cmd"/>
+        <result property="serialNo" column="serial_no"/>
+        <result property="tempValue" column="temp_value"/>
+        <result property="createDate" column="create_date"/>
+        <result property="checkCode" column="check_code"/>
+        <result property="tail" column="tail"/>
+    </resultMap>
+
+
+</mapper>