增加了猪只基础信息

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/HuimvSmartEartagDataAcquisitionApplication.java

@@ -20,3 +20,5 @@ public class HuimvSmartEartagDataAcquisitionApplication {
         SpringApplication.run(HuimvSmartEartagDataAcquisitionApplication.class, args);
     }
 }
+//j+112007239999996+133070300000011+89+0+3174+0+97+20210810105649+1.0#1.0#2528+0+end
+

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/controller/PigBasicInformationController.java

@@ -0,0 +1,84 @@
+ package com.huimv.acquisition.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import com.huimv.acquisition.entity.PigBasicInformationEntity;
+import com.huimv.acquisition.result.R;
+import com.huimv.acquisition.service.PigBasicInformationService;
+import com.huimv.acquisition.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:05:02
+ */
+@RestController
+@RequestMapping("management/pigbasicinformation")
+public class PigBasicInformationController {
+    @Autowired
+    private PigBasicInformationService pigBasicInformationService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = pigBasicInformationService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		PigBasicInformationEntity pigBasicInformation = pigBasicInformationService.getById(id);
+
+        return R.ok().put("pigBasicInformation", pigBasicInformation);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody PigBasicInformationEntity pigBasicInformation){
+		pigBasicInformationService.save(pigBasicInformation);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody PigBasicInformationEntity pigBasicInformation){
+		pigBasicInformationService.updateById(pigBasicInformation);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		pigBasicInformationService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/entity/PigBasicInformationEntity.java

@@ -0,0 +1,91 @@
+package com.huimv.acquisition.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:05:02
+ */
+@Data
+@TableName("pig_basic_information")
+public class PigBasicInformationEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 耳标号
+	 */
+	private String eartagNo;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
+	/**
+	 * 机器编码
+	 */
+	private String deviceCode;
+	/**
+	 * 猪的出生日期
+	 */
+	private Date birthDay;
+	/**
+	 * 佩标日期
+	 */
+	private Date wearTagTime;
+	/**
+	 * 牧场编号
+	 */
+	private String farmCode;
+	/**
+	 * 牧场名称
+	 */
+	private String farmName;
+	/**
+	 * 猪舍id
+	 */
+	private Integer penId;
+	/**
+	 * 猪舍名称
+	 */
+	private String penName;
+	/**
+	 * 单元id
+	 */
+	private Integer unitId;
+	/**
+	 * 单元名称
+	 */
+	private String unitName;
+	/**
+	 * 县id
+	 */
+	private Integer countyId;
+	/**
+	 * 县名称
+	 */
+	private String countyName;
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+
+	private Integer stage;
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/mapper/PigBasicInformationDao.java

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

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/PigBasicInformationService.java

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

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

@@ -10,8 +10,6 @@ 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;
-
-
 /**
  * 
  *
@@ -28,8 +26,6 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
                 new Query<CollectorRegisterEntity>().getPage(params),
                 new QueryWrapper<CollectorRegisterEntity>()
         );
-
         return new PageUtils(page);
     }
-
 }

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/impl/PigBasicInformationServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huimv.acquisition.service.impl;
+
+
+import com.huimv.acquisition.entity.PigBasicInformationEntity;
+import com.huimv.acquisition.mapper.PigBasicInformationDao;
+import com.huimv.acquisition.service.PigBasicInformationService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.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:05:02
+ */
+@Service("pigBasicInformationService")
+public class PigBasicInformationServiceImpl extends ServiceImpl<PigBasicInformationDao, PigBasicInformationEntity> implements PigBasicInformationService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<PigBasicInformationEntity> page = this.page(
+                new Query<PigBasicInformationEntity>().getPage(params),
+                new QueryWrapper<PigBasicInformationEntity>()
+        );
+        return new PageUtils(page);
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/ReceivePackageSerivce.java

@@ -6,10 +6,7 @@ import com.huimv.acquisition.entity.*;
 import com.huimv.acquisition.mapper.CollectorRegisterDao;
 import com.huimv.acquisition.mapper.EartagDataDao;
 import com.huimv.acquisition.mapper.EartagRegisterDao;
-import com.huimv.acquisition.service.DeviceTempService;
-import com.huimv.acquisition.service.EartagDataService;
-import com.huimv.acquisition.service.EartagRegisterService;
-import com.huimv.acquisition.service.MovePigpenService;
+import com.huimv.acquisition.service.*;
 import com.huimv.acquisition.socket.eartagrecive.util.DateUtil;
 import com.huimv.acquisition.socket.eartagrecive.util.DateUtilsPublic;
 import com.huimv.acquisition.socket.eartagrecive.util.StringUtilsWork;
@@ -53,6 +50,9 @@ public class ReceivePackageSerivce {
     @Autowired
     private DeviceTempService  deviceTempService;
 
+    @Autowired
+    private CollectorRegisterService  collectorRegisterService;
+
 
     public String handleEartagData(String[] clientMessageArray) throws ParseException {
         log.info("开始添加耳标数据......");
@@ -119,12 +119,9 @@ public class ReceivePackageSerivce {
             System.out.println("丢弃");
             return "hm+6+0+6+end";
         }*/
-
-
         System.out.println("存储");
         //日龄
         eartagDataEntity.setDayAge2(eartagRegisterEntity.getAge());
-
         //上传设备发生了变化，      转舍信息进行存储
         //在接受数据的时候加一条记录迁移信息的数据到一个新表中，方便查找
         eartagDataEntity.setStage(collectorRegisterEntity.getStage()); //获取阶段
@@ -132,6 +129,7 @@ public class ReceivePackageSerivce {
         eartagDataEntity.setFarmCode(collectorRegisterEntity.getFarmCode());//获取牧场编码
          //关于两个日龄的处理--不应该是直接增加，应该是判断上一条的“日”和当前是否相同 ，相同不增加，不相同增加
 
+
         LambdaQueryWrapper<EartagDataEntity> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(EartagDataEntity::getEartagNo, eartag_no ).orderByDesc( EartagDataEntity::getId ).last( "limit 1");
         EartagDataEntity   lastEarTagDate = eartagDataDao.selectOne(wrapper);
@@ -147,7 +145,6 @@ public class ReceivePackageSerivce {
            movePigpenEntity.setMoveDate(DateUtilsPublic.parseDateTime(DateUtilsPublic.buildDateTimeString(time)));
            movePigpenEntity.setStage(collectorRegisterEntity.getStage());
            movePigpenService.save(movePigpenEntity);
-
            if(eartagRegisterEntity1==null){
              //说明之前没有注册过--现在注册一下--设备ID的设置留给定时任务
                EartagRegisterEntity eartagRegisterEntity2 = new EartagRegisterEntity();
@@ -160,6 +157,7 @@ public class ReceivePackageSerivce {
                eartagRegisterEntity2.setStage(null);
                eartagRegisterService.save(eartagRegisterEntity2);//存储一条还没有处理的数据
            }
+
            //第一次上传的数据----注册表肯定没有这只耳标的信息
          /*  eartagDataEntity.setDayAge (0);  //佩标日龄----默认值，第一次有数据上传就是默认值
            eartagDataEntity.setDayAge2(50); //日龄----默认第50天佩戴耳标*/
@@ -169,14 +167,14 @@ public class ReceivePackageSerivce {
            return "hm+6+0+6+end";
      }
 
-
-
-
         if(!eartagRegisterEntity.getDeviceCode().equals(device_code) ){
             //与注册表不同，，不存
             System.out.println("丢弃");
             return "hm+6+0+6+end";
+
         }
+
+
       if( Double.parseDouble(new DecimalFormat("#,##0.00").format(( Double.parseDouble(env_temp)/100))) <1.0){
           //与注册表不同，，不存
           System.out.println("丢弃环境温度为0");
@@ -184,13 +182,17 @@ public class ReceivePackageSerivce {
       }
 
 
+        if( device_code.equals("112007239999996")){
+            //这个基站的数据不要了
+            System.out.println("丢弃环境温度为0");
+            return "hm+6+0+6+end";
+        }
 
-
+//202007239999123
 
         //上一条不为空---而且判断是存储注册表device-code
         //存储转舍信息--还要判断新的设备阶段和老的设备阶段是否相同，如果相同就不存储转舍信息
         if(!lastEarTagDate.getDeviceCode().equals(device_code)){
-
            /* LambdaQueryWrapper<EartagRegisterEntity> wrapper4 = Wrappers.lambdaQuery();
             wrapper4.eq(EartagRegisterEntity::getEartagNo, eartag_no );
             EartagRegisterEntity eartagRegisterEntity1 = eartagRegisterDao.selectOne(wrapper4);//查到注册信息--有可能为空的
@@ -215,8 +217,11 @@ public class ReceivePackageSerivce {
         //获取当前时间的 “天”---判断天的情况
         int dayNow= Integer.parseInt(String.format("%td", DateUtilsPublic.parseDateTime(DateUtilsPublic.buildDateTimeString(time))));   //当前上传数据的天
         int dayLastData= Integer.parseInt(String.format("%td",lastEarTagDate.getTime()));     //当前的天
-
         System.out.println("当天时间="+dayNow+"----上一条时间"+dayLastData);
+
+
+
+
            if( dayNow == dayLastData){
                //若相等，沿用上一条的日龄和配标日龄
                eartagDataEntity.setDayAge (lastEarTagDate.getDayAge());  //佩标日龄
@@ -227,7 +232,9 @@ public class ReceivePackageSerivce {
                eartagDataEntity.setDayAge2(lastEarTagDate.getDayAge2()+1 ); //日龄
            }
 
-
+           //设置最后一次上传时间
+        collectorRegisterEntity.setLastTime(new Date());
+        collectorRegisterService.updateById(collectorRegisterEntity);
 
         eartagDataService.save(eartagDataEntity);
         return "hm+6+0+6+end";