主要有基站注册--数据上传--数据处理--修改温度--反馈等功能

huimv-smart-incubator/README.md

@@ -0,0 +1,4 @@
+#目前遗留的问题
+##1.设备与基站的绑定没有
+##2.基站的注册没有与前端对接
+##3.

huimv-smart-incubator/huimv-smart-incubator-data/huimv-smart-incubator-data.iml

@@ -5,7 +5,9 @@
       <configuration>
         <setting name="validation-enabled" value="true" />
         <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="entityManagerFactory" />
+        </datasource-mapping>
         <naming-strategy-map />
       </configuration>
     </facet>
@@ -33,6 +35,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.3" level="project" />
@@ -127,8 +131,6 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.62" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
@@ -136,6 +138,6 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.50" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.0.Final" level="project" />
     <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.7" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.9" level="project" />
   </component>
 </module>

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/controller/AgeStageTempController.java

@@ -1,169 +0,0 @@
- package cim.huimv.incubator.controller;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
-
-import cim.huimv.incubator.entity.AgeStageTempEntity;
-import cim.huimv.incubator.mapper.AgeStageTempDao;
-import cim.huimv.incubator.result.R;
-import cim.huimv.incubator.service.AgeStageTempService;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.util.StringUtils;
-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;
-
-import javax.servlet.http.HttpServletRequest;
-
-
- /**
- * 
- *
- * @author yinhao
- * @version ${version}
- * @date 2021-08-11 18:05:50
- */
-@RestController
-@RequestMapping("management/agestagetemp")
-public class AgeStageTempController {
-    @Autowired
-    private AgeStageTempService ageStageTempService;
-
-
-     @Autowired
-     private AgeStageTempDao ageStageTempDao  ;
-    //修改温度设定
-
-
-     @RequestMapping("/updatevalue")
-     public R updatetemp(HttpServletRequest request,
-                                      @RequestParam(name = "temp") Double temp
-                                    ) throws IOException {
-
-         LambdaQueryWrapper<AgeStageTempEntity> wrapper1 = Wrappers.lambdaQuery();
-         wrapper1.eq(AgeStageTempEntity::getId, 1 );
-         AgeStageTempEntity ageStageTempEntity = ageStageTempDao.selectOne(wrapper1);
-         ageStageTempEntity.setTemp(temp);
-         ageStageTempService.updateById(ageStageTempEntity);
-         return R.ok().put("page",ageStageTempEntity );
-     }
-
-
-
-
-
-
-     @RequestMapping("/list001")
-     public void  list(HttpServletRequest request) {
-
-         for (int i = 1; i < 600  ;i++) {
-
-
-             AgeStageTempEntity ageStageTempEntity = new AgeStageTempEntity();
-             ageStageTempEntity.setAge(i);
-             ageStageTempEntity.setCreateTime(new Date());
-             ageStageTempEntity.setRemark("ceshi");
-             if (0<i&i<100){
-                 ageStageTempEntity.setTemp(24.5);
-                 ageStageTempEntity.setStage(1);
-                 ageStageTempService.save(ageStageTempEntity);
-             }
-             if (100<i&i<200){
-                 ageStageTempEntity.setTemp(25.5);
-                 ageStageTempEntity.setStage(2);
-                 ageStageTempService.save(ageStageTempEntity);
-             }
-             if (200<i &i<300){
-                 ageStageTempEntity.setTemp(26.5);
-                 ageStageTempEntity.setStage(3);
-                 ageStageTempService.save(ageStageTempEntity);
-             }
-             if (300<i&i<600){
-                 ageStageTempEntity.setTemp(27.5);
-                 ageStageTempEntity.setStage(4);
-                 ageStageTempService.save(ageStageTempEntity);
-             }
-
-
-         }
-
-
-
-
-
-
-     }
-
-
-
-
-
-
-
-
-
-
-
-    /**
-     * 列表
-     */
-    @RequestMapping("/list")
-    public R list(@RequestParam Map<String, Object> params){
-        PageUtils page = ageStageTempService.queryPage(params);
-
-        return R.ok().put("page", page);
-    }
-
-
-    /**
-     * 信息
-     */
-    @RequestMapping("/info/{id}")
-    public R info(@PathVariable("id") Integer id){
-		AgeStageTempEntity ageStageTemp = ageStageTempService.getById(id);
-
-        return R.ok().put("ageStageTemp", ageStageTemp);
-    }
-
-    /**
-     * 保存
-     */
-    @RequestMapping("/save")
-    public R save(@RequestBody AgeStageTempEntity ageStageTemp){
-		ageStageTempService.save(ageStageTemp);
-
-        return R.ok();
-    }
-
-    /**
-     * 修改
-     */
-    @RequestMapping("/update")
-    public R update(@RequestBody AgeStageTempEntity ageStageTemp){
-		ageStageTempService.updateById(ageStageTemp);
-
-        return R.ok();
-    }
-
-    /**
-     * 删除
-     */
-    @RequestMapping("/delete")
-    public R delete(@RequestBody Integer[] ids){
-		ageStageTempService.removeByIds(Arrays.asList(ids));
-
-        return R.ok();
-    }
-
-}

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/service/impl/EnvTempValueServiceImpl.java

@@ -1,35 +0,0 @@
-package cim.huimv.incubator.service.impl;
-
-import cim.huimv.incubator.entity.EnvTempValueEntity;
-import cim.huimv.incubator.mapper.EnvTempValueDao;
-import cim.huimv.incubator.service.EnvTempValueService;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
-import cim.huimv.incubator.socket.eartagrecive.util.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 18:05:50
- */
-@Service("envTempValueService")
-public class EnvTempValueServiceImpl extends ServiceImpl<EnvTempValueDao, EnvTempValueEntity> implements EnvTempValueService {
-
-    @Override
-    public PageUtils queryPage(Map<String, Object> params) {
-        IPage<EnvTempValueEntity> page = this.page(
-                new Query<EnvTempValueEntity>().getPage(params),
-                new QueryWrapper<EnvTempValueEntity>()
-        );
-
-        return new PageUtils(page);
-    }
-
-}

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/service/impl/IncubatorDataServiceImpl.java

@@ -1,144 +0,0 @@
-package cim.huimv.incubator.service.impl;
-
-import cim.huimv.incubator.entity.CollectorRegisterEntity;
-import cim.huimv.incubator.entity.IncubatorDataEntity;
-import cim.huimv.incubator.mapper.IncubatorDataDao;
-import cim.huimv.incubator.service.IncubatorDataService;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
-import cim.huimv.incubator.socket.eartagrecive.util.Query;
-import cim.huimv.incubator.socket.eartagrecive.util.StringUtilsWork;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-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 18:05:50
- */
-@Service("incubatorDataService")
-public class IncubatorDataServiceImpl extends ServiceImpl<IncubatorDataDao, IncubatorDataEntity> implements IncubatorDataService {
-
-    @Override
-    public PageUtils queryPage(Map<String, Object> params) {
-        IPage<IncubatorDataEntity> page = this.page(
-                new Query<IncubatorDataEntity>().getPage(params),
-                new QueryWrapper<IncubatorDataEntity>()
-        );
-
-        return new PageUtils(page);
-    }
-
-
-
-    @Override
-    public Map<String, Object> queryDetails(Map<String, Object> params) throws ParseException {
-
-        String starttime = (String) params.get("startTime");
-        String endtime = (String) params.get("endTime");
-        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        //格式化传入的时间
-        Date startTime = fmt.parse(starttime);
-        Date   endTime = fmt.parse(endtime);
-        System.out.println("yangdi"+starttime+endtime);
-        LambdaQueryWrapper<IncubatorDataEntity> lambdaQuery = Wrappers.lambdaQuery();
-        //时间
-        lambdaQuery.between(IncubatorDataEntity::getCreateTime,startTime, endTime);
-        List<IncubatorDataEntity> incubatorDataEntities = baseMapper.selectList(lambdaQuery);
-        //生成平均温度 -----如果刚刚转舍就没办法操作了---数据不会立马出来需要等
-        //这样，时间轴
-        Map<String ,Object>    map1 = new HashMap<>();
-        List<String> timeList = new ArrayList<>();
-        List<Double>  tempList = new ArrayList<>();
-        for (IncubatorDataEntity data : incubatorDataEntities) {
-            timeList.add(fmt.format(data.getCreateTime()));
-            tempList.add(data.getTempValue());
-            //sleeptime.add(data.getSleepStatus());    用来存睡眠状态了
-        }
-        map1.put("time",timeList);
-        map1.put("temp",tempList);
-        //对time循环--用contains来处理稍微快一点
-        //map1.put("averangeTemp",averange);
-        //关于耳标存在的位置的信息，这里需要做记录，如果发生位置迁移那么需要将位置迁移信息记录到一张表中
-        return map1;
-    }
-
-}
- /*   @Override
-    public PageUtils findByConditions(Map<String, Object> params) throws ParseException {
-        String farmID = (String) params.get("farmID");//牧场编码
-        String starttime = (String) params.get("starttime");//开始时间
-        String endtime = (String) params.get("endtime");//结束时间
-        String eartagNo = (String) params.get("eartagNo");//耳标号
-        String dayAge = (String) params.get("dayAge");//配标日龄
-        String highEartagTemp = (String) params.get("highEartagTemp");//耳标温度
-        String lowEartagTemp = (String) params.get("lowEartagTemp");//耳标温度
-        String highEnvTemp = (String) params.get("highEnvTemp");//环境温度
-        String lowEnvTemp = (String) params.get("lowEnvTemp");//环境温度
-        String deviceCode = (String) params.get("deviceCode");//采集器编码
-        String bat = (String) params.get("bat");//电量
-        String dayAge2 = (String) params.get("dayage2");//日龄
-
-        System.out.println("采集器+condition---"+deviceCode+"耳标号"+eartagNo);
-        //只要首页限制在第一页，其余的不需要的
-
-        LambdaQueryWrapper<IncubatorDataEntity> wrapper = Wrappers.lambdaQuery();
-
-        if(StringUtilsWork.isNotBlank(starttime)&StringUtilsWork.isNotBlank(endtime)) {
-            System.out.println(starttime+"***shijian**"+endtime);
-            DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            //格式化传入的时间
-            Date startTime = fmt.parse(starttime);
-            Date endTime = fmt.parse(endtime);
-            System.out.println("yangdi" + starttime + endtime);
-            //过滤时间
-            wrapper.between(IncubatorDataEntity::getCreateTime, startTime, endTime);
-        }
-
-        wrapper.orderByDesc( IncubatorDataEntity::getId );
-
-         List<IncubatorDataEntity> records;
-        IPage<IncubatorDataEntity>  page;
-
-       if(StringUtilsWork.isNotBlank(eartagNo)){
-            System.out.println("有耳标号，展示耳标所有数据");
-            page = this.page((new Query<IncubatorDataEntity>().getPage(params)),wrapper);
-            records = page.getRecords();  //获取信息
-
-        }else{
-            System.out.println("没有耳标号，展示最新");
-            wrapper.groupBy(EartagDataEntity::getEartagNo);
-            page = baseMapper.page(new Query<EartagDataEntity>().getPage(params), wrapper);
-            records = page.getRecords();  //获取信息
-        }
-
-
-    page = this.page((new Query<IncubatorDataEntity>().getPage(params)),wrapper);
-    records = page.getRecords();  //获取信息
-
-        //拼接栋舍信息在里面
-        for (IncubatorDataEntity record : records)
-
-        }
-        return  new PageUtils(page);
-    }
-*/
-
-
-
-
-
-

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/constant/ImportanteConfig.java

@@ -1,14 +0,0 @@
-package cim.huimv.incubator.socket.eartagrecive.constant;
-
-/**
- * @Author Anchor
- * @Date 2021/7/30 13:47
- * //重要的参数配置，包括定时任务等
- * @Version 1.0.1
- */
-public class ImportanteConfig {
-
-
-
-
-}

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/service/impl/ReceivePackageSerivce.java

@@ -1,383 +0,0 @@
-package cim.huimv.incubator.socket.eartagrecive.service.impl;
-
-import cim.huimv.incubator.entity.AgeStageTempEntity;
-import cim.huimv.incubator.entity.EnvTempValueEntity;
-import cim.huimv.incubator.entity.IncubatorDataEntity;
-import cim.huimv.incubator.mapper.AgeStageTempDao;
-import cim.huimv.incubator.service.EnvTempValueService;
-import cim.huimv.incubator.service.IncubatorDataService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.util.Date;
-
-;
-
-/**
- * @Project : huimv.ql
- * @Package : com.huimv.biosafety.uface.controller
- * @Description : TODO
- * @Version : 1.0
- * @Author : ZhuoNing
- * @Create : 2020-12-25
- **/
-@Slf4j
-@Component
-public class ReceivePackageSerivce {
-
-@Autowired
-
-private IncubatorDataService incubatorDataService;
-    @Autowired
-
-    private EnvTempValueService envTempValueService ;
-
-    @Autowired
-
-    private AgeStageTempDao ageStageTempDao  ;
-
-
-
-
-
-
-
-    public String handleEartagData(String[] clientMessageArray) throws ParseException {
-      /*  log.info("开始添加耳标数据......");
-        String  head = clientMessageArray[0];           //命令头
-        String device_code = clientMessageArray[1];      //采集器ID
-        String eartag_no  = clientMessageArray[2];         //版本号
-        String bat = clientMessageArray[3];        //耳标号
-        String ear_temp = clientMessageArray[4];  //耳标帧序号
-        String env_temp = clientMessageArray[5];
-        int exercise = Integer.parseInt(clientMessageArray[6]);         //运动量
-        //重启次数
-        String rssi  = clientMessageArray[7];           //信号强度
-        String  time = clientMessageArray[8];           //采集时间
-        String prepare_field= clientMessageArray[9];    //耳标温度
-
-        String[] split = prepare_field.split("#");//1.0#1.0#9314   --耳标版本--网关版本--电阻值（用来计算环境温度）
-        String  check = clientMessageArray[10];          //校验码
-        String  tail  = clientMessageArray[11];          //命令尾
-        EartagDataEntity eartagDataEntity = new EartagDataEntity();
-
-        eartagDataEntity.setHead(head);   //命令头
-        eartagDataEntity.setDeviceCode(device_code); //采集器ID
-         eartagDataEntity.setVersion(split[0]);  //耳标版本
-         eartagDataEntity.setCommand(split[1]);  //网关版本
-
-        eartagDataEntity.setEartagNo(eartag_no);  //耳标号
-       // eartagDataEntity.setFrameSerialNo(Integer.parseInt(frame_serial_no));   //耳标帧序号
-        eartagDataEntity.setBat(Integer.parseInt(bat));   //电池 电量
-        DecimalFormat df = new DecimalFormat("####0.00");
-        double setEarTemp11 = Double.parseDouble(df.format(ln(Integer.parseInt(split[2]))));
-        eartagDataEntity.setEarTemp(Double.parseDouble( df.format( ln(Integer.parseInt(split[2]))))) ;  //ntc转环境温度
-        eartagDataEntity.setEnvTemp(  Double.parseDouble(new DecimalFormat("#,##0.00").format(( Double.parseDouble(env_temp)/100))));   //环境温度--转doubbo
-        //System.out.println( ln(Integer.parseInt(prepare_field)));//----25.001
-        System.out.println(Double.parseDouble(env_temp)/100);
-
-        eartagDataEntity.setExercise(exercise);//运动量
-       //eartagDataEntity.setRebootTimes(Integer.parseInt(reboot_times));  //重启次数
-        eartagDataEntity.setRssi(Integer.parseInt(rssi));//信号强度
-        eartagDataEntity.setTime( DateUtilsPublic.parseDateTime(DateUtilsPublic.buildDateTimeString(time)) ); //采集时间
-        eartagDataEntity.setPrepareField(prepare_field); //预留字段 4
-        eartagDataEntity.setChk(check); //校验码
-        eartagDataEntity.setTail(tail);//命令尾
-       //判断年猪表中是否有这一只耳标的数据   //栋舍这个字段在注册表中没有登记，在
-        LambdaQueryWrapper<CollectorRegisterEntity> wrapper1 = Wrappers.lambdaQuery();
-        wrapper1.eq(CollectorRegisterEntity::getDeviceCode, device_code );
-        CollectorRegisterEntity collectorRegisterEntity = collectorRegisterDao.selectOne(wrapper1);
-        if (collectorRegisterEntity==null){//设备没注册就不让他存，基础信息都没有
-            System.out.println("设备登记表中没有此设备信息，请先注册");
-            return "设备登记表中没有此设备信息，请先注册";
-        }
-
-       //查看这个耳标绑定的基站编码
-        LambdaQueryWrapper<EartagRegisterEntity> wrapper3 = Wrappers.lambdaQuery();
-        wrapper3.eq(EartagRegisterEntity::getEartagNo, eartag_no );
-        EartagRegisterEntity eartagRegisterEntity = eartagRegisterDao.selectOne(wrapper3);
-        System.out.println( "zhece xinxi "+eartagRegisterEntity+"ooo"+eartag_no+"ooo"+device_code);
-
-       // String deviceCode = eartagRegisterEntity.getDeviceCode();//---获取这个基站的编码
-       // System.out.println(deviceCode);
-
-        //wendu cha dayu 8
-      *//*  if(Double.parseDouble(env_temp)/100==0){
-            //与注册表不同，，不存
-            System.out.println("丢弃");
-            return "hm+6+0+6+end";
-        }*//*
-        System.out.println("存储");
-        //日龄
-        eartagDataEntity.setDayAge2(eartagRegisterEntity.getAge());
-        //上传设备发生了变化，      转舍信息进行存储
-        //在接受数据的时候加一条记录迁移信息的数据到一个新表中，方便查找
-        eartagDataEntity.setStage(collectorRegisterEntity.getStage()); //获取阶段
-        eartagDataEntity.setPigpen(String.valueOf(collectorRegisterEntity.getPigpenId())); //获取猪舍ID
-        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);
-        //返回的数据在这里为空--说明这个是第一次上传--需要存储一条device_code 为空的注册表
-       if(lastEarTagDate==null){//上一条为空，存转舍
-           LambdaQueryWrapper<EartagRegisterEntity> wrapper4 = Wrappers.lambdaQuery();
-           wrapper4.eq(EartagRegisterEntity::getEartagNo, eartag_no );
-           EartagRegisterEntity eartagRegisterEntity1 = eartagRegisterDao.selectOne(wrapper4);
-
-           MovePigpenEntity movePigpenEntity = new MovePigpenEntity();
-           movePigpenEntity.setDeviceCode(device_code);
-           movePigpenEntity.setEartagNo(eartag_no);
-           movePigpenEntity.setMoveDate(DateUtilsPublic.parseDateTime(DateUtilsPublic.buildDateTimeString(time)));
-           movePigpenEntity.setStage(collectorRegisterEntity.getStage());
-           movePigpenService.save(movePigpenEntity);
-           if(eartagRegisterEntity1==null){
-             //说明之前没有注册过--现在注册一下--设备ID的设置留给定时任务
-               EartagRegisterEntity eartagRegisterEntity2 = new EartagRegisterEntity();
-               eartagRegisterEntity2.setAge(0);
-               eartagRegisterEntity2.setDeviceCode(null);
-               eartagRegisterEntity2.setEartagNo(eartag_no);
-               eartagRegisterEntity2.setFarmCode(null);//定时任务获取到机器ID后处理
-               eartagRegisterEntity2.setPigpen( null);
-               eartagRegisterEntity2.setRegisterDate(new Date());
-               eartagRegisterEntity2.setStage(null);
-               eartagRegisterService.save(eartagRegisterEntity2);//存储一条还没有处理的数据
-           }
-
-           //第一次上传的数据----注册表肯定没有这只耳标的信息
-         *//*  eartagDataEntity.setDayAge (0);  //佩标日龄----默认值，第一次有数据上传就是默认值
-           eartagDataEntity.setDayAge2(50); //日龄----默认第50天佩戴耳标*//*
-           eartagDataEntity.setExercise(exercise);
-           eartagDataEntity.setSportGap(2);
-           eartagDataService.save(eartagDataEntity);
-           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");
-          return "hm+6+0+6+end";
-      }
-
-
-        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);//查到注册信息--有可能为空的
-            String deviceCode = eartagRegisterEntity1.getDeviceCode();
-            if ( StringUtilsWork.isNotBlank(deviceCode) ) {//如果耳标注册表的绑定机器ID为空就不存储转舍信息
-                System.out.println("之前=" + lastEarTagDate.getDeviceCode() + "现在" + device_code);
-                System.out.println(lastEarTagDate.getDeviceCode().equals(device_code));
-                 //上一阶段的
-                if(!lastEarTagDate.getStage().equals(collectorRegisterEntity.getStage())) {  //不相等，---判断阶段是否相同--阶段也不相同--增加转舍信息
-
-                    MovePigpenEntity movePigpenEntity = new MovePigpenEntity();
-                    movePigpenEntity.setDeviceCode(device_code);
-                    movePigpenEntity.setEartagNo(eartag_no);
-                    movePigpenEntity.setMoveDate(DateUtilsPublic.parseDateTime(DateUtilsPublic.buildDateTimeString(time)));
-                    movePigpenEntity.setStage(collectorRegisterEntity.getStage());
-                    movePigpenService.save(movePigpenEntity);
-                }
-            }*//*
-        }
-        Integer exercise1 = lastEarTagDate.getExercise();
-        eartagDataEntity.setSportGap(exercise - exercise1);//存储区间运动量
-        //获取当前时间的 “天”---判断天的情况
-        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());  //佩标日龄
-               eartagDataEntity.setDayAge2(lastEarTagDate.getDayAge2()); //日龄
-            }else {
-               //有数据，若 “日” 不相等是否应该增加一天
-               eartagDataEntity.setDayAge (lastEarTagDate.getDayAge()+1 );  //佩标日龄
-               eartagDataEntity.setDayAge2(lastEarTagDate.getDayAge2()+1 ); //日龄
-           }
-
-           //设置最后一次上传时间
-        collectorRegisterEntity.setLastTime(new Date());
-        collectorRegisterService.updateById(collectorRegisterEntity);
-
-        eartagDataService.save(eartagDataEntity);*/
-        return "hm+6+0+6+end";
-    }
-
-
-
-
-    public static void main(String[] args) {
-        DecimalFormat df = new DecimalFormat("####0.00");
-
-        System.out.println(df.format(23.00000));
-    }
-
-    public static  double getTwoDecimal(double num) {
-        DecimalFormat   dFormat = new DecimalFormat("#.00");
-        String yearString = dFormat.format(num);
-        return  Double.parseDouble(yearString);
-
-    }
-
-
-
-    public static  double  m1(double num ) {
-        BigDecimal bg = new BigDecimal(num);
-        return  bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-    }
-
-
-
-
-    public static String swapHex(String src) {
-        StringBuilder target = new StringBuilder();
-        for (int i = src.length() - 1; i > 0; i -= 2) {
-            target.append(src.substring(i - 1, i + 1));
-        }
-        return target.toString();
-    }
-    public static String numberFormater(double d) {
-        DecimalFormat nf = new DecimalFormat();
-        nf.setMaximumFractionDigits(2);
-        return nf.format(d);
-    }
-    public static double A = 0.00335396319311466;
-    public static double B = 0.000256376549039663;
-    public static double C = 0.00000248933580817244;
-    public static double D = 0.0000000753805242068686;
-    public static double E = -0.0000000204758173596178;
-
-    //保留一位小数
-    public static double changeDouble(Double dou) {
-        NumberFormat nf = new DecimalFormat("0.0 ");
-        dou = Double.parseDouble(nf.format(dou));
-        return dou;
-    }
-
-
-
-    //温度转换
-    public static double ln(int rv) {
-        int R_REF = 10000;
-        double ln = Math.log((double) rv / R_REF);
-        //保留一位小数
-        return changeDouble(1 / (A + B * ln + C * Math.pow(ln, 2) + D * Math.pow(ln, 3) + E * Math.pow(ln, 4)) - 273.15)+0.001;
-    }
-
-    public String handleEartagDampness(String[] clientMessageArray) throws ParseException {
-
-
-        //hm+9599+87021538+5+278+0+100+20210811172918+0+end
-
-        String header = clientMessageArray[0];//hm
-        String deviceId = clientMessageArray[1];//9599
-        String cmd = clientMessageArray[3];//5
-        String node_code = clientMessageArray[2];//87021538
-        String temp_value = clientMessageArray[4];//278
-        String night_rank = clientMessageArray[5];//0 暖光登记
-        String now_age = clientMessageArray[6];//当前日龄
-        String time = clientMessageArray[7]; //shijian 20210811172918
-        String checkCode = clientMessageArray[8]; //check
-        String tail = clientMessageArray[9]; //tail
-        IncubatorDataEntity incubatorDataEntity = new IncubatorDataEntity();
-
-        incubatorDataEntity.setCheckCode(checkCode);
-        incubatorDataEntity.setCmd(Integer.valueOf(cmd));
-        incubatorDataEntity.setCreateTime(new Date());
-        incubatorDataEntity.setDeviceCode(deviceId);
-        incubatorDataEntity.setHead(header);
-        incubatorDataEntity.setNowAge(Integer.valueOf(now_age));
-        incubatorDataEntity.setNightRank(Integer.valueOf(night_rank));
-        incubatorDataEntity.setNodeCode(node_code);
-        incubatorDataEntity.setRemark("ceshi");
-        incubatorDataEntity.setTempValue(Double.valueOf(temp_value)/10);
-        incubatorDataEntity.setTail(tail);
-        incubatorDataService.save(incubatorDataEntity);
-
-
-   //返回的数据做文章--温度的设置---查对应日龄的温度  100---用第一条来计算温度.修改的就是第一条温度
-        LambdaQueryWrapper<AgeStageTempEntity> wrapper1 = Wrappers.lambdaQuery();
-        wrapper1.eq(AgeStageTempEntity::getId, 1 );
-        System.out.println(now_age);
-        AgeStageTempEntity ageStageTempEntity = ageStageTempDao.selectOne(wrapper1);
-        System.out.println(ageStageTempEntity);
-         Integer a = (int) (ageStageTempEntity.getTemp()*10);
-
-        System.out.println("五号命令返回+"+"hm+5+"+node_code+"+0+5+"+a+"+6+end" );
-        return  "hm+5+"+node_code+"+0+5+"+a+"+6+end";
-    }
-
-
-
-
-
-    /**
-     * @Method : _handleEartagTemperature
-     * @Description : 处理网关温度
-     * @Params : [clientMessageArray]
-     * @Return : java.lang.String
-     * @Author : ZhuoNing
-     * @Date : 2021/1/15
-     * @Time : 17:46
-     */
-    public String handleEartagTemperature(String[] clientMessageArray) throws ParseException {
-        System.out.println("环境温度上传");
-
-
-
-        String header = clientMessageArray[0];
-        String device_code = clientMessageArray[1];
-        String cmd = clientMessageArray[2];
-        String serialNo = clientMessageArray[3];
-        String temp_value = clientMessageArray[4];
-        String timestamp = clientMessageArray[5];
-        String checkCode = clientMessageArray[6];
-        String tail = clientMessageArray[7];
-     //hm+158+3+1+289+20170208152300+6+end
-        EnvTempValueEntity envTempValueEntity = new EnvTempValueEntity();
-        envTempValueEntity.setCmd(Integer.valueOf(cmd));
-        envTempValueEntity.setChexk(checkCode);
-        envTempValueEntity.setHead(header);
-        envTempValueEntity.setDeviceCode(device_code);
-        envTempValueEntity.setCreateTime(new Date());
-        envTempValueEntity.setRemark("环境温度");
-        envTempValueEntity.setValue(String.valueOf(Double.valueOf(temp_value)/10));
-        envTempValueEntity.setSerious(serialNo);
-        envTempValueEntity.setTail(tail);
-        envTempValueService.save(envTempValueEntity);
-    return "hm+4+0+7+end";
-    }
-}

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/HuimvSmartincubatorDataAcquisitionApplication.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator;
+package com.huimv.incubator;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -20,18 +20,10 @@ public class HuimvSmartincubatorDataAcquisitionApplication {
         SpringApplication.run(HuimvSmartincubatorDataAcquisitionApplication.class, args);
     }
 
-
-
-
-    //**********************************************************************
     //运行在41服务器
-    //端口8021
-    //数据库在公司本地
-
-
-
-
-
+    //端口8211
+    //数据库在公司本地  192.168.1.7
+    //监听端口：  8899
 
 }
 

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/autoconfigure/MybatisPlusConfiguration.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.autoconfigure;
+package com.huimv.incubator.autoconfigure;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/com/huimv/incubator/controller/AgeStageTempController.java

@@ -0,0 +1,188 @@
+ package com.huimv.incubator.controller;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Map;
+
+import com.huimv.incubator.entity.AgeStageTempEntity;
+import com.huimv.incubator.mapper.AgeStageTempDao;
+import com.huimv.incubator.result.R;
+import com.huimv.incubator.service.AgeStageTempService;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+ /**
+ * //怎样去区分边界不越界--可能添加区间--可能减少区间--只设置最高区间，通过idwork不相同进行分段
+ *不能越界重复也不能为空
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 18:05:50
+ */
+
+@RestController
+@CrossOrigin
+@RequestMapping("management/agestagetemp")
+public class AgeStageTempController {
+    @Autowired
+    private AgeStageTempService ageStageTempService;
+
+
+     @Autowired
+     private AgeStageTempDao ageStageTempDao  ;
+    //修改温度设定
+     //涉及点不多，直接放在controller之中来解决问题
+     @RequestMapping("/updatevalue")
+     public R updatetemp(HttpServletRequest request,
+                                      @RequestParam(name = "temp") Double temp,
+                                      @RequestParam(name = "id") int id,
+                                      @RequestParam(name = "remark") String remark,
+                                      @RequestParam(name = "age") Integer age
+                                    ) throws IOException {
+
+
+         LambdaQueryWrapper<AgeStageTempEntity> wrapper11 = Wrappers.lambdaQuery();
+         wrapper11.eq(AgeStageTempEntity::getId , id );
+         AgeStageTempEntity ageStageTempEntity1 = ageStageTempDao.selectOne(wrapper11);
+
+         if(age<=0) { return R.error("添加的日龄不可小于0");}
+
+         //首先校验，不能出现age不连续
+         if (id == 1) {
+             //找id==2皆可以
+             LambdaQueryWrapper<AgeStageTempEntity> wrapper1 = Wrappers.lambdaQuery();
+             wrapper1.eq(AgeStageTempEntity::getId, 2);
+             AgeStageTempEntity ageStageTempEntity = ageStageTempDao.selectOne(wrapper1);
+             if (ageStageTempEntity.getAge() < age) {
+                 return R.error("添加的日龄参数不能大于下一阶段").put("page", ageStageTempEntity);
+
+             }
+             //都没有问题，调用修改方法
+             AgeStageTempEntity ageStageTempEntity2 = updateEntity(ageStageTempEntity1, temp, remark, age);
+
+             return R.ok().put("page", ageStageTempEntity2);
+         }
+
+         if(id ==8){
+             LambdaQueryWrapper<AgeStageTempEntity> wrapper1 = Wrappers.lambdaQuery();
+             wrapper1.eq(AgeStageTempEntity::getId, 7);
+             AgeStageTempEntity ageStageTempEntity = ageStageTempDao.selectOne(wrapper1);
+             if (ageStageTempEntity.getAge() > age) {
+                 return R.error("添加的日龄参数不能大于下一阶段").put("page", ageStageTempEntity);
+             }
+             //都没有问题，调用修改方法
+             AgeStageTempEntity ageStageTempEntity2 = updateEntity(ageStageTempEntity1, temp, remark, age);
+             return R.ok().put("page", ageStageTempEntity2);
+
+         }
+         //不是1   也不是7
+         LambdaQueryWrapper<AgeStageTempEntity> wrapper1 = Wrappers.lambdaQuery();
+         wrapper1.eq(AgeStageTempEntity::getId, id+1);
+         System.out.println("下一跳"+id+1);
+         AgeStageTempEntity BIggerAgeStageTempEntity = ageStageTempDao.selectOne(wrapper1);
+         LambdaQueryWrapper<AgeStageTempEntity> wrapper12 = Wrappers.lambdaQuery();
+         wrapper12.eq(AgeStageTempEntity::getId, id-1);
+         AgeStageTempEntity MinnerAgeStageTempEntity = ageStageTempDao.selectOne(wrapper12);
+         System.out.println("上一条"+(id-1));
+         if(MinnerAgeStageTempEntity.getAge()<age&age<BIggerAgeStageTempEntity.getAge() ){
+             AgeStageTempEntity ageStageTempEntity2 = updateEntity(ageStageTempEntity1, temp, remark, age);
+             return R.ok().put("page", ageStageTempEntity2);
+         }else {
+             return R.error("添加的日龄参数错误");
+         }
+     }
+
+
+
+
+ public  AgeStageTempEntity    updateEntity(AgeStageTempEntity  ageStageTempEntity1, Double temp, String remark , int age    ){
+     ageStageTempEntity1.setTemp(temp);
+     ageStageTempEntity1.setRemark(remark);
+     ageStageTempEntity1.setAge(age);
+     ageStageTempService.updateById(ageStageTempEntity1);
+     return  ageStageTempEntity1;
+ }
+
+
+     //对应的区间的温度---要防止区间冲突
+
+     @RequestMapping("/list001")
+     public void  list(HttpServletRequest request) {
+         for (int i = 1; i < 2000  ;i++) {
+             AgeStageTempEntity ageStageTempEntity = new AgeStageTempEntity();
+             ageStageTempEntity.setAge(i);
+             ageStageTempEntity.setCreateTime(new Date());
+             ageStageTempEntity.setRemark("ceshi");
+                 ageStageTempEntity.setTemp(24.5);
+                 ageStageTempEntity.setStage(1);
+                 ageStageTempService.updateById(ageStageTempEntity);
+                 //对象
+             LambdaUpdateWrapper<AgeStageTempEntity> updateWrapper = Wrappers.lambdaUpdate();
+             updateWrapper.eq(AgeStageTempEntity::getId , 1);
+             updateWrapper.set(AgeStageTempEntity::getId , 1);
+             ageStageTempDao.update(ageStageTempEntity ,updateWrapper);
+         }
+     }
+
+
+
+
+
+     /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = ageStageTempService.queryPage(params);
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		AgeStageTempEntity ageStageTemp = ageStageTempService.getById(id);
+
+        return R.ok().put("ageStageTemp", ageStageTemp);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody AgeStageTempEntity ageStageTemp){
+		ageStageTempService.save(ageStageTemp);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody AgeStageTempEntity ageStageTemp){
+		ageStageTempService.updateById(ageStageTemp);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		ageStageTempService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/controller/CollectorRegisterController.java

@@ -1,30 +1,24 @@
- package cim.huimv.incubator.controller;
+ package com.huimv.incubator.controller;
 
 import java.util.Arrays;
 import java.util.Map;
 
-import cim.huimv.incubator.entity.CollectorRegisterEntity;
-import cim.huimv.incubator.result.R;
-import cim.huimv.incubator.service.CollectorRegisterService;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.entity.CollectorRegisterEntity;
+import com.huimv.incubator.result.R;
+import com.huimv.incubator.service.CollectorRegisterService;
+import com.huimv.incubator.socket.eartagrecive.util.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;
+import org.springframework.web.bind.annotation.*;
 
 
-
-
-
-/**
- * 
- *
- * @author yinhao
- * @version ${version}
- * @date 2021-08-11 18:05:50
- */
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-11 18:05:50
+  */
+ @CrossOrigin
 @RestController
 @RequestMapping("management/collectorregister")
 public class CollectorRegisterController {

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/controller/EnvDampnessValueController.java

@@ -1,30 +1,24 @@
- package cim.huimv.incubator.controller;
+ package com.huimv.incubator.controller;
 
 import java.util.Arrays;
 import java.util.Map;
 
-import cim.huimv.incubator.entity.EnvDampnessValueEntity;
-import cim.huimv.incubator.result.R;
-import cim.huimv.incubator.service.EnvDampnessValueService;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.entity.EnvDampnessValueEntity;
+import com.huimv.incubator.result.R;
+import com.huimv.incubator.service.EnvDampnessValueService;
+import com.huimv.incubator.socket.eartagrecive.util.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;
+import org.springframework.web.bind.annotation.*;
 
 
-
-
-
-/**
- * 
- *
- * @author yinhao
- * @version ${version}
- * @date 2021-08-11 18:05:50
- */
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-11 18:05:50
+  */
+ @CrossOrigin
 @RestController
 @RequestMapping("management/envdampnessvalue")
 public class EnvDampnessValueController {

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/controller/EnvTempValueController.java

@@ -1,30 +1,25 @@
- package cim.huimv.incubator.controller;
+ package com.huimv.incubator.controller;
 
+import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Map;
 
-import cim.huimv.incubator.entity.EnvTempValueEntity;
-import cim.huimv.incubator.result.R;
-import cim.huimv.incubator.service.EnvTempValueService;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.entity.EnvTempValueEntity;
+import com.huimv.incubator.result.R;
+import com.huimv.incubator.service.EnvTempValueService;
+import com.huimv.incubator.socket.eartagrecive.util.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;
+import org.springframework.web.bind.annotation.*;
 
 
-
-
-
-/**
- * 
- *
- * @author yinhao
- * @version ${version}
- * @date 2021-08-11 18:05:50
- */
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-11 18:05:50
+  */
+ @CrossOrigin
 @RestController
 @RequestMapping("management/envtempvalue")
 public class EnvTempValueController {
@@ -62,6 +57,13 @@ public class EnvTempValueController {
         return R.ok();
     }
 
+    @RequestMapping("/list_deatils")
+    public R listDeatils(@RequestBody Map<String, Object> params) throws ParseException {
+        Map queryDetailsMap = envTempValueService.queryDetails(params);
+        return R.ok().put("page", queryDetailsMap);
+    }
+
+
     /**
      * 修改
      */

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/controller/IncubatorDataController.java

@@ -1,31 +1,25 @@
- package cim.huimv.incubator.controller;
+ package com.huimv.incubator.controller;
 
 import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Map;
 
-import cim.huimv.incubator.entity.IncubatorDataEntity;
-import cim.huimv.incubator.result.R;
-import cim.huimv.incubator.service.IncubatorDataService;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.entity.IncubatorDataEntity;
+import com.huimv.incubator.result.R;
+import com.huimv.incubator.service.IncubatorDataService;
+import com.huimv.incubator.socket.eartagrecive.util.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;
+import org.springframework.web.bind.annotation.*;
 
 
-
-
-
-/**
- * 
- *
- * @author yinhao
- * @version ${version}
- * @date 2021-08-11 18:05:50
- */
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-11 18:05:50
+  */
+ @CrossOrigin
 @RestController
 @RequestMapping("management/incubatordata")
 public class IncubatorDataController {
@@ -36,23 +30,20 @@ public class IncubatorDataController {
      * 列表
      */
     @RequestMapping("/list")
-    public R list(@RequestParam Map<String, Object> params){
+    public R list(@RequestBody Map<String, Object> params){
         PageUtils page = incubatorDataService.queryPage(params);
 
         return R.ok().put("page", page);
     }
 
     @RequestMapping("/list_deatils")
-    public R listDeatils(@RequestParam Map<String, Object> params) throws ParseException {
+    public R listDeatils(@RequestBody Map<String, Object> params) throws ParseException {
         Map queryDetailsMap = incubatorDataService.queryDetails(params);
         return R.ok().put("page", queryDetailsMap);
     }
 
 
-
-
-
-
+ /*
     //根据耳标电量查询
     @RequestMapping("/findByConditions")
     public R findByFarmId( @RequestParam Map<String, Object> params  ) throws ParseException {
@@ -60,12 +51,7 @@ public class IncubatorDataController {
 
         return R.ok().put("page", byConditions);
 
-    }
-
-
-
-
-
+    }*/
 
 
     /**
@@ -74,7 +60,6 @@ public class IncubatorDataController {
     @RequestMapping("/info/{id}")
     public R info(@PathVariable("id") Integer id){
 		IncubatorDataEntity incubatorData = incubatorDataService.getById(id);
-
         return R.ok().put("incubatorData", incubatorData);
     }
 
@@ -94,17 +79,16 @@ public class IncubatorDataController {
     @RequestMapping("/update")
     public R update(@RequestBody IncubatorDataEntity incubatorData){
 		incubatorDataService.updateById(incubatorData);
-
         return R.ok();
     }
 
+
     /**
      * 删除
      */
     @RequestMapping("/delete")
     public R delete(@RequestBody Integer[] ids){
 		incubatorDataService.removeByIds(Arrays.asList(ids));
-
         return R.ok();
     }
 

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/com/huimv/incubator/controller/IncubatorRegisterController.java

@@ -0,0 +1,79 @@
+ package com.huimv.incubator.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import com.huimv.incubator.entity.IncubatorRegisterEntity;
+import com.huimv.incubator.result.R;
+import com.huimv.incubator.service.IncubatorRegisterService;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-13 09:08:21
+  */
+ @CrossOrigin
+@RestController
+@RequestMapping("management/incubatorregister")
+public class IncubatorRegisterController {
+    @Autowired
+    private IncubatorRegisterService incubatorRegisterService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = incubatorRegisterService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		IncubatorRegisterEntity incubatorRegister = incubatorRegisterService.getById(id);
+
+        return R.ok().put("incubatorRegister", incubatorRegister);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody IncubatorRegisterEntity incubatorRegister){
+		incubatorRegisterService.save(incubatorRegister);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody IncubatorRegisterEntity incubatorRegister){
+		incubatorRegisterService.updateById(incubatorRegister);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		incubatorRegisterService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/controller/SetTempValueController.java

@@ -1,29 +1,25 @@
- package cim.huimv.incubator.controller;
+ package com.huimv.incubator.controller;
 
 import java.util.Arrays;
 import java.util.Map;
 
-import cim.huimv.incubator.entity.SetTempValueEntity;
-import cim.huimv.incubator.result.R;
-import cim.huimv.incubator.service.SetTempValueService;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.entity.SetTempValueEntity;
+import com.huimv.incubator.result.R;
+import com.huimv.incubator.service.SetTempValueService;
+import com.huimv.incubator.socket.eartagrecive.util.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;
+import org.springframework.web.bind.annotation.*;
 
 
-
-
-/**
+ /**
  * 
  *
  * @author yinhao
  * @version ${version}
  * @date 2021-08-11 18:05:50
  */
+ @CrossOrigin
+
 @RestController
 @RequestMapping("management/settempvalue")
 public class SetTempValueController {

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/entity/AgeStageTempEntity.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.entity;
+package com.huimv.incubator.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/entity/CollectorRegisterEntity.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.entity;
+package com.huimv.incubator.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -97,4 +97,6 @@ public class CollectorRegisterEntity implements Serializable {
 	 */
 	private Integer delStatus;
 
+
+
 }

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/entity/EnvDampnessValueEntity.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.entity;
+package com.huimv.incubator.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/entity/EnvTempValueEntity.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.entity;
+package com.huimv.incubator.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/entity/IncubatorDataEntity.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.entity;
+package com.huimv.incubator.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/com/huimv/incubator/entity/IncubatorRegisterEntity.java

@@ -0,0 +1,60 @@
+package com.huimv.incubator.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-13 09:08:21
+ */
+@Data
+@TableName("incubator_register")
+public class IncubatorRegisterEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 默认主键
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String nodeCode;
+	/**
+	 * 
+	 */
+	private Date registerDate;
+	/**
+	 * 
+	 */
+	private Integer age;
+	/**
+	 * 
+	 */
+	private String deviceCode;
+	/**
+	 * 
+	 */
+	private String farmCode;
+	/**
+	 * 
+	 */
+	private Integer stage;
+	/**
+	 * 
+	 */
+	private String pigpen;
+	/**
+	 * 
+	 */
+	private Date birthday;
+
+}

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/entity/SetTempValueEntity.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.entity;
+package com.huimv.incubator.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/mapper/AgeStageTempDao.java

@@ -1,7 +1,7 @@
-package cim.huimv.incubator.mapper;
+package com.huimv.incubator.mapper;
 
 
-import cim.huimv.incubator.entity.AgeStageTempEntity;
+import com.huimv.incubator.entity.AgeStageTempEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/mapper/CollectorRegisterDao.java

@@ -1,7 +1,7 @@
-package cim.huimv.incubator.mapper;
+package com.huimv.incubator.mapper;
 
 
-import cim.huimv.incubator.entity.CollectorRegisterEntity;
+import com.huimv.incubator.entity.CollectorRegisterEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/mapper/EnvDampnessValueDao.java

@@ -1,7 +1,7 @@
-package cim.huimv.incubator.mapper;
+package com.huimv.incubator.mapper;
 
 
-import cim.huimv.incubator.entity.EnvDampnessValueEntity;
+import com.huimv.incubator.entity.EnvDampnessValueEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/mapper/EnvTempValueDao.java

@@ -1,8 +1,10 @@
-package cim.huimv.incubator.mapper;
+package com.huimv.incubator.mapper;
 
-import cim.huimv.incubator.entity.EnvTempValueEntity;
+import com.huimv.incubator.entity.EnvTempValueEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * 
@@ -12,6 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2021-08-11 18:05:50
  */
 @Mapper
+@Repository
 public interface EnvTempValueDao extends BaseMapper<EnvTempValueEntity> {
 	
 }

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/mapper/IncubatorDataDao.java

@@ -1,9 +1,10 @@
-package cim.huimv.incubator.mapper;
+package com.huimv.incubator.mapper;
 
 
-import cim.huimv.incubator.entity.IncubatorDataEntity;
+import com.huimv.incubator.entity.IncubatorDataEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * 
@@ -13,6 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2021-08-11 18:05:50
  */
 @Mapper
+@Repository
 public interface IncubatorDataDao extends BaseMapper<IncubatorDataEntity> {
 	
 }

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/com/huimv/incubator/mapper/IncubatorRegisterDao.java

@@ -0,0 +1,20 @@
+package com.huimv.incubator.mapper;
+
+
+import com.huimv.incubator.entity.IncubatorRegisterEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-13 09:08:21
+ */
+@Mapper
+@Repository
+public interface IncubatorRegisterDao extends BaseMapper<IncubatorRegisterEntity> {
+	
+}

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/mapper/SetTempValueDao.java

@@ -1,7 +1,7 @@
-package cim.huimv.incubator.mapper;
+package com.huimv.incubator.mapper;
 
 
-import cim.huimv.incubator.entity.SetTempValueEntity;
+import com.huimv.incubator.entity.SetTempValueEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/result/R.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.result;
+package com.huimv.incubator.result;
 
 
 import java.util.HashMap;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/result/RRException.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.result;
+package com.huimv.incubator.result;
 
 public class RRException extends RuntimeException {
 	private static final long serialVersionUID = 1L;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/result/RRExceptionHandler.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package cim.huimv.incubator.result;
+package com.huimv.incubator.result;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/service/AgeStageTempService.java

@@ -1,7 +1,7 @@
-package cim.huimv.incubator.service;
+package com.huimv.incubator.service;
 
-import cim.huimv.incubator.entity.AgeStageTempEntity;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.entity.AgeStageTempEntity;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/service/CollectorRegisterService.java

@@ -1,7 +1,7 @@
-package cim.huimv.incubator.service;
+package com.huimv.incubator.service;
 
-import cim.huimv.incubator.entity.CollectorRegisterEntity;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.entity.CollectorRegisterEntity;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Map;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/service/EnvDampnessValueService.java

@@ -1,7 +1,7 @@
-package cim.huimv.incubator.service;
+package com.huimv.incubator.service;
 
-import cim.huimv.incubator.entity.EnvDampnessValueEntity;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.entity.EnvDampnessValueEntity;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Map;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/service/EnvTempValueService.java

@@ -1,9 +1,10 @@
-package cim.huimv.incubator.service;
+package com.huimv.incubator.service;
 
-import cim.huimv.incubator.entity.EnvTempValueEntity;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.entity.EnvTempValueEntity;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.text.ParseException;
 import java.util.Map;
 
 /**
@@ -18,5 +19,10 @@ public interface EnvTempValueService extends IService<EnvTempValueEntity> {
     default PageUtils queryPage(Map<String, Object> params) {
         return null;
     }
+
+    Map<String ,Object>    queryDetails( Map<String, Object> params) throws ParseException;
+
+
+
 }
 

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/service/IncubatorDataService.java

@@ -1,7 +1,7 @@
-package cim.huimv.incubator.service;
+package com.huimv.incubator.service;
 
-import cim.huimv.incubator.entity.IncubatorDataEntity;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.entity.IncubatorDataEntity;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/com/huimv/incubator/service/IncubatorRegisterService.java

@@ -0,0 +1,20 @@
+package com.huimv.incubator.service;
+
+import com.huimv.incubator.entity.IncubatorRegisterEntity;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-13 09:08:21
+ */
+public interface IncubatorRegisterService extends IService<IncubatorRegisterEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/service/SetTempValueService.java

@@ -1,7 +1,7 @@
-package cim.huimv.incubator.service;
+package com.huimv.incubator.service;
 
-import cim.huimv.incubator.entity.SetTempValueEntity;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.entity.SetTempValueEntity;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/service/impl/AgeStageTempServiceImpl.java

@@ -1,11 +1,11 @@
-package cim.huimv.incubator.service.impl;
+package com.huimv.incubator.service.impl;
 
-import cim.huimv.incubator.entity.AgeStageTempEntity;
-import cim.huimv.incubator.mapper.AgeStageTempDao;
-import cim.huimv.incubator.service.AgeStageTempService;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.entity.AgeStageTempEntity;
+import com.huimv.incubator.mapper.AgeStageTempDao;
+import com.huimv.incubator.service.AgeStageTempService;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
 
-import cim.huimv.incubator.socket.eartagrecive.util.Query;
+import com.huimv.incubator.socket.eartagrecive.util.Query;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/service/impl/CollectorRegisterServiceImpl.java

@@ -1,10 +1,10 @@
-package cim.huimv.incubator.service.impl;
+package com.huimv.incubator.service.impl;
 
-import cim.huimv.incubator.entity.CollectorRegisterEntity;
-import cim.huimv.incubator.mapper.CollectorRegisterDao;
-import cim.huimv.incubator.service.CollectorRegisterService;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
-import cim.huimv.incubator.socket.eartagrecive.util.Query;
+import com.huimv.incubator.entity.CollectorRegisterEntity;
+import com.huimv.incubator.mapper.CollectorRegisterDao;
+import com.huimv.incubator.service.CollectorRegisterService;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.socket.eartagrecive.util.Query;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,13 +22,15 @@ import java.util.Map;
 @Service("collectorRegisterService")
 public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterDao, CollectorRegisterEntity> implements CollectorRegisterService {
 
+    //用stage 存  age    //有一个问题  基站和日龄不相关的啊  注册维护一下耳标和基站的表
+
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<CollectorRegisterEntity> page = this.page(
                 new Query<CollectorRegisterEntity>().getPage(params),
                 new QueryWrapper<CollectorRegisterEntity>()
         );
-
         return new PageUtils(page);
     }
 

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/service/impl/EnvDampnessValueServiceImpl.java

@@ -1,10 +1,10 @@
-package cim.huimv.incubator.service.impl;
+package com.huimv.incubator.service.impl;
 
-import cim.huimv.incubator.entity.EnvDampnessValueEntity;
-import cim.huimv.incubator.mapper.EnvDampnessValueDao;
-import cim.huimv.incubator.service.EnvDampnessValueService;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
-import cim.huimv.incubator.socket.eartagrecive.util.Query;
+import com.huimv.incubator.entity.EnvDampnessValueEntity;
+import com.huimv.incubator.mapper.EnvDampnessValueDao;
+import com.huimv.incubator.service.EnvDampnessValueService;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.socket.eartagrecive.util.Query;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/com/huimv/incubator/service/impl/EnvTempValueServiceImpl.java

@@ -0,0 +1,79 @@
+package com.huimv.incubator.service.impl;
+
+import com.huimv.incubator.entity.EnvTempValueEntity;
+import com.huimv.incubator.mapper.EnvTempValueDao;
+import com.huimv.incubator.service.EnvTempValueService;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.socket.eartagrecive.util.Query;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.stereotype.Service;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+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 18:05:50
+ */
+@Service("envTempValueService")
+public class EnvTempValueServiceImpl extends ServiceImpl<EnvTempValueDao, EnvTempValueEntity> implements EnvTempValueService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<EnvTempValueEntity> page = this.page(
+                new Query<EnvTempValueEntity>().getPage(params),
+                new QueryWrapper<EnvTempValueEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+
+    @Override
+    public Map<String, Object> queryDetails(Map<String, Object> params) throws ParseException {
+
+        String starttime = (String) params.get("startTime");
+        String endtime = (String) params.get("endTime");
+        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //格式化传入的时间
+        Date startTime = fmt.parse(starttime);
+        Date   endTime = fmt.parse(endtime);
+        System.out.println("yangdi"+starttime+endtime);
+
+
+        LambdaQueryWrapper<EnvTempValueEntity> lambdaQuery = Wrappers.lambdaQuery();
+        //时间
+        lambdaQuery.between(EnvTempValueEntity::getCreateTime,startTime, endTime);
+        //分成两个字段---for开销太大
+        List<EnvTempValueEntity> envTempValueEntitylist = baseMapper.selectList(lambdaQuery);
+        //生成平均温度 -----如果刚刚转舍就没办法操作了---数据不会立马出来需要等
+        //这样，时间轴
+        Map<String ,Object>    map1 = new HashMap<>();
+        List<String> timeList = new ArrayList<>();
+        List<String>  tempList = new ArrayList<>();
+
+
+
+        for (EnvTempValueEntity data : envTempValueEntitylist) {
+            timeList.add(fmt.format(data.getCreateTime()));
+            tempList.add(data.getValue());
+
+        }
+        map1.put("time",timeList);
+        map1.put("Envtemp",tempList);
+        return map1;
+    }
+
+}
+

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/com/huimv/incubator/service/impl/IncubatorDataServiceImpl.java

@@ -0,0 +1,191 @@
+package com.huimv.incubator.service.impl;
+
+import com.huimv.incubator.entity.EnvDampnessValueEntity;
+import com.huimv.incubator.entity.EnvTempValueEntity;
+import com.huimv.incubator.entity.IncubatorDataEntity;
+import com.huimv.incubator.entity.IncubatorRegisterEntity;
+import com.huimv.incubator.mapper.EnvTempValueDao;
+import com.huimv.incubator.mapper.IncubatorDataDao;
+import com.huimv.incubator.mapper.IncubatorRegisterDao;
+import com.huimv.incubator.service.IncubatorDataService;
+import com.huimv.incubator.socket.eartagrecive.constant.PowerConstant;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.socket.eartagrecive.util.Query;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.reactive.context.ReactiveWebApplicationContext;
+import org.springframework.stereotype.Service;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import javax.xml.bind.SchemaOutputResolver;
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 18:05:50
+ */
+@Service("incubatorDataService")
+public class IncubatorDataServiceImpl extends ServiceImpl<IncubatorDataDao, IncubatorDataEntity> implements IncubatorDataService {
+
+    @Autowired
+    private IncubatorRegisterDao  incubatorRegisterDao  ;
+
+
+    @Autowired
+    private EnvTempValueDao  envTempValueDao    ;
+
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<IncubatorDataEntity> page = this.page(
+                new Query<IncubatorDataEntity>().getPage(params),
+                new QueryWrapper<IncubatorDataEntity>()
+        );
+        return new PageUtils(page);
+    }
+
+
+    @Override
+    public Map<String, Object> queryDetails(Map<String, Object> params) throws ParseException {
+        String starttime = (String) params.get("startTime");
+        String endtime = (String) params.get("endTime");
+        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String node_code="87021538";
+        //格式化传入的时间
+        Date startTime = fmt.parse(starttime);
+        Date   endTime = fmt.parse(endtime);
+        System.out.println("yangdi"+starttime+endtime);
+        LambdaQueryWrapper<IncubatorDataEntity> lambdaQuery = Wrappers.lambdaQuery();
+        //时间
+        lambdaQuery.between(IncubatorDataEntity::getCreateTime,startTime, endTime);
+        //分成两个字段---for开销太大
+        List<IncubatorDataEntity> incubatorDataEntities = baseMapper.selectList(lambdaQuery);
+        String device_code = incubatorDataEntities.get(0).getDeviceCode();
+        System.out.println();
+        //生成平均温度 -----如果刚刚转舍就没办法操作了---数据不会立马出来需要等
+        //这样，时间轴
+        Map<String ,Object>    map1 = new HashMap<>();
+        List<String> timeList = new ArrayList<>();
+        List<Double>  tempList = new ArrayList<>();
+        List<Integer>  ecletric = new ArrayList<>();
+        List<Integer>  beforeleconsum = new ArrayList<>();
+
+        Integer powerCost =0;
+        Integer beforPowerCost =0;
+        Integer counter=0 ;
+        for (IncubatorDataEntity data : incubatorDataEntities) {
+          //  System.out.println("countbefor"+counter);
+            counter++;
+         //   System.out.println("countarter"+counter);
+            if(counter!=0&counter!=1) {
+
+
+                       /* <==        Row: 14205, hm, 9599, 87021538, 5, 42.5, 6, 5, 2021-08-12 21:17:33, 0, end, ceshi
+                        <==        Row: 14206, hm, 9599, 87021538, 5, 42.5, 6, 5, 2021-08-12 21:17:46, 0, end, ceshi
+                        <==        Row: 14207, hm, 9599, 87021538, 5, 42.5, 6, 5, 2021-08-12 21:17:54, 0, end, ceshi
+                        <==        Row: 14208, hm, 9599, 87021538, 5, 42.5, 6, 5, 2021-08-12 21:18:03, 0, end, ceshi
+                        <==        Row: 14209, hm, 9599, 87021538, 5, 42.5, 6, 5, 2021-08-12 21:18:13, 0, end, ceshi
+                        <==        Row: 14210, hm, 9599, 87021538, 5, 42.5, 6, 5, 2021-08-12 21:18:23, 0, end, ceshi
+                */
+               // System.out.println("时间" + data.getCreateTime() + "****" + counter);
+                //  int i = data.getCreateTime() - incubatorDataEntities.get(counter).getCreateTime();
+
+               // System.out.println(incubatorDataEntities.get(counter-2));//14349    createTime=Thu Aug 12 21:45:39 CST 2021,
+               // System.out.println("xianzai"+data);//14350   createTime=Thu Aug 12 21:45:47 CST 2021
+
+                int timegap = calLastedTime( data.getCreateTime() , incubatorDataEntities.get(counter-2).getCreateTime()    );
+                 //功率
+                int getpower = getpower(data.getNightRank());
+                Integer  eletricconsum=timegap*getpower/60/60;
+                Integer beforeletricconsum= timegap*270/60/60;
+                powerCost+=eletricconsum;
+
+               // System.out.println("时间间隔="+timegap+"**"+powerCost+"**"+powerCost+"**"+powerCost);
+                beforPowerCost+=beforeletricconsum;
+                timeList.add(fmt.format(data.getCreateTime()));
+                tempList.add(data.getTempValue());
+                ecletric.add(powerCost);
+                beforeleconsum.add(beforPowerCost);
+            }
+        }
+
+
+        map1.put("time",timeList);
+        map1.put("temp",tempList);
+        map1.put("ecletric",ecletric);
+        map1.put("beforPowerCost",beforeleconsum);
+
+        LambdaQueryWrapper<EnvTempValueEntity> lambdaQuery2= Wrappers.lambdaQuery();
+        lambdaQuery2.eq(EnvTempValueEntity::getDeviceCode,device_code).orderByAsc( EnvTempValueEntity::getId ).last( "limit 1");
+        EnvTempValueEntity envTempValueEntity = envTempValueDao.selectOne(lambdaQuery2);
+        map1.put("envTemp",envTempValueEntity.getValue());
+
+        //注册信息
+        LambdaQueryWrapper<IncubatorRegisterEntity > lambdaQuery1 = Wrappers.lambdaQuery();
+        lambdaQuery1.eq(IncubatorRegisterEntity::getNodeCode,node_code);
+        IncubatorRegisterEntity incubatorRegisterEntity = incubatorRegisterDao.selectOne(lambdaQuery1);
+        map1.put("baseInfo",incubatorRegisterEntity);//
+
+        //计算耗电量---  功率*时间   挡位---时间---耗电
+        return map1;
+    }
+
+    public static int calLastedTime(Date startDate, Date endDate) {
+        long a = endDate.getTime();
+        long b = startDate.getTime();
+        int c = (int) ((b - a) / 1000);
+      //  System.out.println("时间秒数"+a+"**"+b);
+        return c;
+    }
+
+
+
+    public static int getpower( int  night) {
+        int power=0;
+        if (night == 0) {
+            power = PowerConstant.power_000;
+        } else if (night == 1) {
+            power = PowerConstant.power_001;
+        } else if (night == 2) {
+            power = PowerConstant.power_002;
+        } else if (night == 3) {
+            power = PowerConstant.power_003;
+        } else if (night == 4) {
+            power = PowerConstant.power_004;
+        } else if (night == 5) {
+            power = PowerConstant.power_005;
+        } else if (night == 6) {
+            power = PowerConstant.power_006;
+        }
+        return power;
+    }
+
+
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/com/huimv/incubator/service/impl/IncubatorRegisterServiceImpl.java

@@ -0,0 +1,34 @@
+package com.huimv.incubator.service.impl;
+
+import com.huimv.incubator.entity.IncubatorRegisterEntity;
+import com.huimv.incubator.mapper.IncubatorRegisterDao;
+import com.huimv.incubator.service.IncubatorRegisterService;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.socket.eartagrecive.util.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-13 09:08:21
+ */
+@Service("incubatorRegisterService")
+public class IncubatorRegisterServiceImpl extends ServiceImpl<IncubatorRegisterDao, IncubatorRegisterEntity> implements IncubatorRegisterService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<IncubatorRegisterEntity> page = this.page(
+                new Query<IncubatorRegisterEntity>().getPage(params),
+                new QueryWrapper<IncubatorRegisterEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/service/impl/SetTempValueServiceImpl.java

@@ -1,10 +1,10 @@
-package cim.huimv.incubator.service.impl;
+package com.huimv.incubator.service.impl;
 
-import cim.huimv.incubator.entity.SetTempValueEntity;
-import cim.huimv.incubator.mapper.SetTempValueDao;
-import cim.huimv.incubator.service.SetTempValueService;
-import cim.huimv.incubator.socket.eartagrecive.util.PageUtils;
-import cim.huimv.incubator.socket.eartagrecive.util.Query;
+import com.huimv.incubator.entity.SetTempValueEntity;
+import com.huimv.incubator.mapper.SetTempValueDao;
+import com.huimv.incubator.service.SetTempValueService;
+import com.huimv.incubator.socket.eartagrecive.util.PageUtils;
+import com.huimv.incubator.socket.eartagrecive.util.Query;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/Server.java

@@ -1,6 +1,6 @@
-package cim.huimv.incubator.socket;
+package com.huimv.incubator.socket;
 
-import cim.huimv.incubator.socket.eartagrecive.service.IClientDataPacketService;
+import com.huimv.incubator.socket.eartagrecive.service.IClientDataPacketService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/ServerThread.java

@@ -1,7 +1,7 @@
-package cim.huimv.incubator.socket;
+package com.huimv.incubator.socket;
 
 
-import cim.huimv.incubator.socket.eartagrecive.service.IClientDataPacketService;
+import com.huimv.incubator.socket.eartagrecive.service.IClientDataPacketService;
 
 import java.io.*;
 import java.net.Socket;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/com/huimv/incubator/socket/eartagrecive/constant/PowerConstant.java

@@ -0,0 +1,22 @@
+package com.huimv.incubator.socket.eartagrecive.constant;
+
+/**
+ * @Author Anchor
+ * @Date 2021/7/30 13:47
+ * //重要的参数配置，包括定时任务等
+ * @Version 1.0.1
+ */
+
+
+public class PowerConstant {
+
+    //配送管理（0 配送中，1 配送完成）
+    public static final int  power_000 = 0;
+    public static final int  power_001 = 124;
+    public static final int  power_002 = 175;
+    public static final int  power_003 = 216;
+    public static final int  power_004 = 251;
+    public static final int  power_005 = 270;
+    public static final int  power_006 = 275;
+
+}

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/com/huimv/incubator/socket/eartagrecive/constant/wate.java

@@ -0,0 +1,20 @@
+package com.huimv.incubator.socket.eartagrecive.constant;
+
+/**
+ * @Author Anchor
+ * @Date 2021/8/12 19:31
+ * @Version 1.0.1
+ */
+public class wate {
+
+
+
+
+
+
+
+
+
+
+
+}

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/service/IClientDataPacketService.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.socket.eartagrecive.service;
+package com.huimv.incubator.socket.eartagrecive.service;
 
 import java.text.ParseException;
 

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/service/impl/ClientDataPacketServiceImpl.java

@@ -1,7 +1,7 @@
-package cim.huimv.incubator.socket.eartagrecive.service.impl;
+package com.huimv.incubator.socket.eartagrecive.service.impl;
 
 
-import cim.huimv.incubator.socket.eartagrecive.service.IClientDataPacketService;
+import com.huimv.incubator.socket.eartagrecive.service.IClientDataPacketService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/com/huimv/incubator/socket/eartagrecive/service/impl/ReceivePackageSerivce.java

@@ -0,0 +1,222 @@
+package com.huimv.incubator.socket.eartagrecive.service.impl;
+
+import com.huimv.incubator.entity.AgeStageTempEntity;
+import com.huimv.incubator.entity.EnvTempValueEntity;
+import com.huimv.incubator.entity.IncubatorDataEntity;
+import com.huimv.incubator.entity.IncubatorRegisterEntity;
+import com.huimv.incubator.mapper.AgeStageTempDao;
+import com.huimv.incubator.mapper.IncubatorDataDao;
+import com.huimv.incubator.mapper.IncubatorRegisterDao;
+import com.huimv.incubator.service.EnvTempValueService;
+import com.huimv.incubator.service.IncubatorDataService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+import com.huimv.incubator.service.IncubatorRegisterService;
+import com.huimv.incubator.socket.eartagrecive.util.DateUtilsPublic;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.util.Date;
+
+;
+
+/**
+ * @Project : huimv.ql
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Slf4j
+@Component
+public class ReceivePackageSerivce {
+
+    @Autowired
+    private IncubatorDataService incubatorDataService;
+
+    @Autowired
+    private EnvTempValueService envTempValueService ;
+
+    @Autowired
+    private AgeStageTempDao ageStageTempDao  ;
+
+    @Autowired
+    private IncubatorDataDao incubatorDataDao   ;
+
+
+    @Autowired
+    private IncubatorRegisterDao  incubatorRegisterDao     ;
+
+    @Autowired
+    private IncubatorRegisterService incubatorRegisterService     ;
+
+
+
+
+    public String handleEartagDampness(String[] clientMessageArray) throws ParseException {
+
+
+        //hm+9599+87021538+5+278+0+100+20210811172918+0+end
+
+        String header = clientMessageArray[0];//hm
+        String deviceId = clientMessageArray[1];//9599
+        String cmd = clientMessageArray[3];//5
+        String node_code = clientMessageArray[2];//87021538
+        String temp_value = clientMessageArray[4];//278
+        String night_rank = clientMessageArray[5];//0 暖光登记
+        String now_age = clientMessageArray[6];//当前日龄
+        String time = clientMessageArray[7]; //shijian 20210811172918
+        String checkCode = clientMessageArray[8]; //check
+        String tail = clientMessageArray[9]; //tail
+        IncubatorDataEntity incubatorDataEntity = new IncubatorDataEntity();
+
+        incubatorDataEntity.setCheckCode(checkCode);
+        incubatorDataEntity.setCmd(Integer.valueOf(cmd));
+        incubatorDataEntity.setCreateTime(new Date());
+        incubatorDataEntity.setDeviceCode(deviceId);
+        incubatorDataEntity.setHead(header);
+        incubatorDataEntity.setNowAge(Integer.valueOf(now_age));
+        incubatorDataEntity.setNightRank(Integer.valueOf(night_rank));
+        incubatorDataEntity.setNodeCode(node_code);
+        incubatorDataEntity.setRemark("ceshi");
+        incubatorDataEntity.setTempValue(Double.valueOf(temp_value)/10);
+        incubatorDataEntity.setTail(tail);
+/*
+       //开始加判断。日期转换日龄+1
+        LambdaQueryWrapper<IncubatorDataEntity> wrapper11 = Wrappers.lambdaQuery();
+        //小于
+        wrapper11.eq(IncubatorDataEntity::getNodeCode,node_code).orderByAsc( IncubatorDataEntity::getId ).last( "limit 1");
+        IncubatorDataEntity incubatorDataEntity1 = incubatorDataDao.selectOne(wrapper11);
+        Boolean  daySame= DateUtilsPublic.dayIsSame(incubatorDataEntity1.getCreateTime(),new Date() );
+
+
+        if( !daySame ) {
+            //不相同  日龄+1
+            LambdaQueryWrapper<IncubatorRegisterEntity> wrapper13 = Wrappers.lambdaQuery();
+            wrapper13.eq(IncubatorRegisterEntity::getNodeCode, node_code).orderByAsc(IncubatorRegisterEntity::getId).last("limit 1");
+            IncubatorRegisterEntity incubatorRegisterEntity = incubatorRegisterDao.selectOne(wrapper13);
+            incubatorRegisterEntity.setAge(incubatorRegisterEntity.getAge() + 1);
+            incubatorRegisterService.updateById(incubatorRegisterEntity);
+        }*/
+
+        incubatorDataService.save(incubatorDataEntity);
+
+
+       // hm+9599+87021538+5+262+0+0+20210825093650+0+end
+
+
+   //返回的数据做文章--温度的设置---查对应日龄的温度  100---用第一条来计算温度.修改的就是第一条温度
+        //日龄应该是查对应的表给对应的温度
+        //大于
+      /*  LambdaQueryWrapper<AgeStageTempEntity> wrapper1 = Wrappers.lambdaQuery();
+        //小于
+        wrapper1.le(AgeStageTempEntity::getAge,now_age).orderByAsc( AgeStageTempEntity::getId ).last( "limit 1");
+        System.out.println(now_age);
+        AgeStageTempEntity ageStageTempEntity = ageStageTempDao.selectOne(wrapper1);
+
+        System.out.println(ageStageTempEntity);
+        Integer a = (int) (ageStageTempEntity.getTemp()*10);*/
+         //日龄应该是我给机器的啊，需要维护一张表---生日--对应参数
+      //  System.out.println("五号命令返回+"+"hm+5+"+node_code+"+0+5+"+a+"+6+end" );
+        return  "hm+5+"+node_code+"+0+5+"+455+"+6+end";
+
+    }
+
+
+
+    /**
+     * @Method : _handleEartagTemperature
+     * @Description : 处理网关温度
+     * @Params : [clientMessageArray]
+     * @Return : java.lang.String
+     * @Author : ZhuoNing
+     * @Date : 2021/1/15
+     * @Time : 17:46
+     */
+    public String handleEartagTemperature(String[] clientMessageArray) throws ParseException {
+        System.out.println("环境温度上传");
+
+        String header = clientMessageArray[0];
+        String device_code = clientMessageArray[1];
+        String cmd = clientMessageArray[2];
+        String serialNo = clientMessageArray[3];
+        String temp_value = clientMessageArray[4];
+        String timestamp = clientMessageArray[5];
+        String checkCode = clientMessageArray[6];
+        String tail = clientMessageArray[7];
+     //hm+158+3+1+289+20170208152300+6+end
+        EnvTempValueEntity envTempValueEntity = new EnvTempValueEntity();
+        envTempValueEntity.setCmd(Integer.valueOf(cmd));
+        envTempValueEntity.setChexk(checkCode);
+        envTempValueEntity.setHead(header);
+        envTempValueEntity.setDeviceCode(device_code);
+        envTempValueEntity.setCreateTime(new Date());
+        envTempValueEntity.setRemark("环境温度");
+        envTempValueEntity.setValue(String.valueOf(Double.valueOf(temp_value)/10));
+        envTempValueEntity.setSerious(serialNo);
+        envTempValueEntity.setTail(tail);
+        envTempValueService.save(envTempValueEntity);
+    return "hm+4+0+7+end";
+    }
+
+
+    public static void main(String[] args) {
+        DecimalFormat df = new DecimalFormat("####0.00");
+        System.out.println(df.format(23.00000));
+    }
+
+    public static  double getTwoDecimal(double num) {
+        DecimalFormat   dFormat = new DecimalFormat("#.00");
+        String yearString = dFormat.format(num);
+        return  Double.parseDouble(yearString);
+
+    }
+
+    public static  double  m1(double num ) {
+        BigDecimal bg = new BigDecimal(num);
+        return  bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+    }
+
+    public static String swapHex(String src) {
+        StringBuilder target = new StringBuilder();
+        for (int i = src.length() - 1; i > 0; i -= 2) {
+            target.append(src.substring(i - 1, i + 1));
+        }
+        return target.toString();
+    }
+    public static String numberFormater(double d) {
+        DecimalFormat nf = new DecimalFormat();
+        nf.setMaximumFractionDigits(2);
+        return nf.format(d);
+    }
+    public static double A = 0.00335396319311466;
+    public static double B = 0.000256376549039663;
+    public static double C = 0.00000248933580817244;
+    public static double D = 0.0000000753805242068686;
+    public static double E = -0.0000000204758173596178;
+
+    //保留一位小数
+    public static double changeDouble(Double dou) {
+        NumberFormat nf = new DecimalFormat("0.0 ");
+        dou = Double.parseDouble(nf.format(dou));
+        return dou;
+    }
+
+
+
+    //温度转换
+    public static double ln(int rv) {
+        int R_REF = 10000;
+        double ln = Math.log((double) rv / R_REF);
+        //保留一位小数
+        return changeDouble(1 / (A + B * ln + C * Math.pow(ln, 2) + D * Math.pow(ln, 3) + E * Math.pow(ln, 4)) - 273.15)+0.001;
+    }
+
+}

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/service/impl/SendPackageService.java

@@ -1,9 +1,9 @@
-package cim.huimv.incubator.socket.eartagrecive.service.impl;
+package com.huimv.incubator.socket.eartagrecive.service.impl;
 
 
-import cim.huimv.incubator.entity.CollectorRegisterEntity;
-import cim.huimv.incubator.mapper.CollectorRegisterDao;
-import cim.huimv.incubator.socket.eartagrecive.util.DateUtil;
+import com.huimv.incubator.entity.CollectorRegisterEntity;
+import com.huimv.incubator.mapper.CollectorRegisterDao;
+import com.huimv.incubator.socket.eartagrecive.util.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.beans.factory.annotation.Autowired;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/util/Constant.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package cim.huimv.incubator.socket.eartagrecive.util;
+package com.huimv.incubator.socket.eartagrecive.util;
 
 /**
  * 常量

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/util/DateUtil.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.socket.eartagrecive.util;
+package com.huimv.incubator.socket.eartagrecive.util;
 
 import java.text.DateFormat;
 import java.text.ParseException;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/util/DateUtilsPublic.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.socket.eartagrecive.util;
+package com.huimv.incubator.socket.eartagrecive.util;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -33,15 +33,13 @@ public class DateUtilsPublic {
 	}
 
 
-	public static void main(String[] args) {
-		int   a = Integer.parseInt(String .format("%td", new Date()));
-		System.out.println(a);
-
+	//计算两个时间之间的天数----毫秒到天之间的换算
+	private static long daysBetween(Date one, Date two) {
+		long difference =  (one.getTime()-two.getTime())/86400000;
+		return Math.abs(difference);
 	}
 
 
-
-
 //改一下，传进来date  处理完之后返回date
 	public static String addDateStringHour(String day, int hour) {
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -62,7 +60,6 @@ public class DateUtilsPublic {
 		cal = null;
 		return format.format(date);
 
-
 	}
 
 
@@ -244,6 +241,18 @@ public class DateUtilsPublic {
 		return endTime;
 	}
 
+	public static long getTimeGap(String oldTime,String newTime) throws ParseException {
+		SimpleDateFormat df = new SimpleDateFormat("YYYY/MM/dd HH:mm:ss.SSS");
+		long NTime =df.parse(newTime).getTime();
+		//从对象中拿到时间
+		long OTime = df.parse(oldTime).getTime();
+		long diff=(NTime-OTime);
+		return diff;
+	}
+
+
+
+
 
 	//判断日是否相同
 	public   static  Boolean  dayIsSame( Date date1 , Date  date2) {
@@ -254,6 +263,17 @@ public class DateUtilsPublic {
 	}
 
 
+	//判断日是否相同
+	public   static  Boolean    IsSame( Date date1 , Date  date2) {
+		int   a = Integer.parseInt(String .format("%td", date1));
+		int   b = Integer.parseInt(String .format("%td", date2));
+		Boolean result = a==b;
+		return result;
+	}
+
+
+
+
 
 
 }

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/util/PageUtils.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package cim.huimv.incubator.socket.eartagrecive.util;
+package com.huimv.incubator.socket.eartagrecive.util;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/util/Query.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package cim.huimv.incubator.socket.eartagrecive.util;
+package com.huimv.incubator.socket.eartagrecive.util;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/util/Result.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.socket.eartagrecive.util;
+package com.huimv.incubator.socket.eartagrecive.util;
 
 import java.io.Serializable;
 

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/util/SQLFilter.java

@@ -6,11 +6,11 @@
  * 版权所有，侵权必究！
  */
 
-package cim.huimv.incubator.socket.eartagrecive.util;
+package com.huimv.incubator.socket.eartagrecive.util;
 
 
 
-import cim.huimv.incubator.result.RRException;
+import com.huimv.incubator.result.RRException;
 import org.apache.commons.lang.StringUtils;
 
 /**

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/util/StatusCode.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.socket.eartagrecive.util;
+package com.huimv.incubator.socket.eartagrecive.util;
 
 /**
  * 返回码

huimv-smart-incubator/huimv-smart-incubator-data/src/main/java/cim/huimv/incubator/socket/eartagrecive/util/StringUtilsWork.java

@@ -1,4 +1,4 @@
-package cim.huimv.incubator.socket.eartagrecive.util;
+package com.huimv.incubator.socket.eartagrecive.util;
 
 /**
  * @Author Anchor

huimv-smart-incubator/huimv-smart-incubator-data/src/main/resources/application-dev.yml

@@ -18,7 +18,7 @@ spring:
       max-request-size: 1000MB
     # jackson时间格式化
   jackson:
-    time-zone: GMT+8
+    time-zone: GMT+80
     date-format: yyyy-MM-dd HH:mm:ss
   mvc:
     view:

huimv-smart-incubator/huimv-smart-incubator-data/src/main/resources/mapper/incubator/CollectorRegisterDao.xml

@@ -0,0 +1,38 @@
+<?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.incubator.mapper.CollectorRegisterDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+<!--    <resultMap type="com.huimv.incubator.entity.CollectorRegisterEntity" id="collectorRegisterMap">-->
+<!--        <result property="id" column="id"/>-->
+<!--        <result property="deviceCode" column="device_code"/>-->
+<!--        <result property="registeCode" column="registe_code"/>-->
+<!--        <result property="countyCode" column="county_code"/>-->
+<!--        <result property="countyName" column="county_name"/>-->
+<!--        <result property="farmCode" column="farm_code"/>-->
+<!--        <result property="farmName" column="farm_name"/>-->
+<!--        <result property="typeF" column="type_f"/>-->
+<!--        <result property="stage" column="stage"/>-->
+<!--        <result property="pigpenId" column="pigpen_id"/>-->
+<!--        <result property="unitId" column="unit_id"/>-->
+<!--        <result property="serverIp" column="server_ip"/>-->
+<!--        <result property="port" column="port"/>-->
+<!--        <result property="registerTime" column="register_time"/>-->
+<!--        <result property="lastTime" column="last_time"/>-->
+<!--        <result property="networkStatus" column="network_status"/>-->
+<!--        <result property="acqStatus" column="acq_status"/>-->
+<!--        <result property="canStatus" column="can_status"/>-->
+<!--        <result property="delStatus" column="del_status"/>-->
+<!--    </resultMap>-->
+
+
+    <select id="page" resultType="com.huimv.incubator.entity.CollectorRegisterEntity">
+       SELECT * FROM age_stage_temp  WHERE  age > 45 ORDER BY id   ASC   LIMIT 1
+    </select>
+
+
+
+
+
+</mapper>