耳标平台

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

@@ -1,6 +1,10 @@
 package com.huimv.eartag2.eartag.service.impl;
 
+import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.Header;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.common.dao.entity.*;
@@ -1372,6 +1376,7 @@ public class EartagServiceImpl implements IEartagService {
 
         System.out.println("earmark--> " + earmark);
         if (eartagRegister2Entity == null) {
+            toEartag(earmark,farmId);
             //{新建耳标注册信息}
             newEartagRegister2(earmark, nowTimestamp, deviceCode, registerType, activeStatus, liveStatus, bat, todayDate, farmId, dataJo, stageCode, stageName, pigpenId, pigpenName, unitId, unitName, deviceRegisterEntity);
         } else {
@@ -1406,6 +1411,18 @@ public class EartagServiceImpl implements IEartagService {
         }
 
     }
+    public  void  toEartag(String eartag ,String farmId ){
+        if ("330110007".equals(farmId)){
+            JSONObject jsonObject2 = new JSONObject();
+            jsonObject2.put("farmId", farmId);
+            jsonObject2.put("earmark", eartag);
+            String body = HttpRequest.post("http://192.168.1.8:8011/admin/earmark/add").header(Header.CONTENT_TYPE, "application/json")
+                    .body(jsonObject2.toJSONString())
+                    .timeout(30 * 1000).execute().body();
+            System.out.println(body);
+        }
+
+    }
 
     /**
      * @Method : updateEartagRegister2

huimv-eartag2-eartag/src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: huimv-eartag2-eartag2
   profiles:
-    active: dev
+    active:
   cloud:
     nacos:
       config:

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

@@ -27,7 +27,7 @@ import org.springframework.web.client.RestTemplate;
 @MapperScan("com.huimv.eartag2.manage2.mapper")
 @EntityScan(value = "com.huimv.eartag2.common.dao.entity")
 @EnableJpaRepositories(basePackages = "com.huimv.eartag2.common.dao.repo")
-//@Import(InterceptorConfig.class)
+@Import(InterceptorConfig.class)
 public class HuimvManageApplication {
     public static void main(String[] args) throws InterruptedException {
 

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/BaseFarmController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.pojo.BaseFarm;
 import com.huimv.eartag2.manage2.pojo.EartagData;
+import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.service.BaseFarmService;
 import com.huimv.eartag2.manage2.service.IEartagData2Service;
 import org.springframework.beans.factory.annotation.Autowired;

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagData2Controller.java

@@ -3,6 +3,7 @@ package com.huimv.eartag2.manage2.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.service.IEartagData2Service;
 import com.huimv.eartag2.common.common.token.TokenSign;
@@ -44,7 +45,7 @@ public class EartagData2Controller {
 //        String farmId = maps.get("farmId");
 
         try {
-            QueryWrapper<EartagData2> eartagData2QueryWrapper = new QueryWrapper<EartagData2>().eq("earmark", earmark).between("add_time", starTime, endTime);
+            QueryWrapper<EartagData> eartagData2QueryWrapper = new QueryWrapper<EartagData>().eq("earmark", earmark).between("add_time", starTime, endTime);
 
             List<Data> data = eartagDataService.getActAndEemp(eartagData2QueryWrapper);
 

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/EartagData2Mapper.java

@@ -2,6 +2,7 @@ package com.huimv.eartag2.manage2.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.pojo.pojovo.AllHelthyDto;
 import com.huimv.eartag2.manage2.pojo.pojovo.EartagDataDto;
@@ -19,13 +20,13 @@ import java.util.List;
  * @author author
  * @since 2022-07-29
  */
-public interface EartagData2Mapper extends BaseMapper<EartagData2> {
+public interface EartagData2Mapper extends BaseMapper<EartagData> {
     //
-    List<EartagData2> getEartagDataByEarmark(@Param("earmark") String earmark, @Param("recordCount") String recordCount);
+    List<EartagData> getEartagDataByEarmark(@Param("earmark") String earmark, @Param("recordCount") String recordCount);
 
-    List<EartagDataDto> getAct(@Param(Constants.WRAPPER) QueryWrapper<EartagData2> wrapper);
+    List<EartagDataDto> getAct(@Param(Constants.WRAPPER) QueryWrapper<EartagData> wrapper);
 
-    List<AllHelthyDto> allHealthy3(@Param(Constants.WRAPPER) QueryWrapper<EartagData2> wrapper);
+    List<AllHelthyDto> allHealthy3(@Param(Constants.WRAPPER) QueryWrapper<EartagData> wrapper);
 
-    List<Data> getActAndEemp(@Param(Constants.WRAPPER) QueryWrapper<EartagData2> eartagData2QueryWrapper);
+    List<Data> getActAndEemp(@Param(Constants.WRAPPER) QueryWrapper<EartagData> eartagData2QueryWrapper);
 }

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagData2.java

@@ -0,0 +1,79 @@
+package com.huimv.eartag2.manage2.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("eartag_data")
+public class EartagData2 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+     private Integer id;
+
+    @TableLogic
+    private  byte isDeleted;
+
+    private String cmdHeader;
+
+    private String device;
+
+    private String earmark;
+
+    private Integer bat;
+
+    private Integer earTemp;
+
+    private Float earTemp1;
+    private Float earTemp2;
+
+    private Integer envTemp;
+
+    private Float envTemp1;
+
+    private Long act;
+
+    private Long act1;
+
+    private Integer signal1;
+
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private String  askTime;
+
+    private String other;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date addTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createDate;
+
+    private String farmId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date askDate;
+
+
+}

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/IEartagData2Service.java

@@ -1,6 +1,7 @@
 package com.huimv.eartag2.manage2.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.common.utils.Result;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -18,9 +19,9 @@ import java.util.Map;
  * @author author
  * @since 2022-07-29
  */
-public interface IEartagData2Service extends IService<EartagData2> {
+public interface IEartagData2Service extends IService<EartagData> {
 
-    List<EartagData2> getEartagData(String earmark) throws ParseException;
+    List<EartagData> getEartagData(String earmark) throws ParseException;
 
     Result getEnvByTime(Map<String, String> map);
 
@@ -38,7 +39,7 @@ public interface IEartagData2Service extends IService<EartagData2> {
 
     Result getEnvLast(Map<String, String> map);
 
-    List<Data> getActAndEemp(QueryWrapper<EartagData2> eartagData2QueryWrapper);
+    List<Data> getActAndEemp(QueryWrapper<EartagData> eartagData2QueryWrapper);
 
     Result getByTimeFilter(Map<String, String> map);
 }

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

@@ -23,6 +23,8 @@ public class CacheServiceImpl implements ICacheService {
     public void setDeviceCodeByChipId(String chipId, String deviceCode) {
         String  hashKey = BizConst.CHIP_DEVICE_PREFIX;
         redisTemplate.opsForHash().put(hashKey,chipId,deviceCode);
+        System.out.println(redisTemplate.opsForHash().get(hashKey, chipId));
+
     }
 
     @Override

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

@@ -211,7 +211,7 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
         Date dateTime = calendar.getTime();
-        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
         wrapper.eq("farm_id",farmId);
         wrapper.ge("ask_time",dateTime);
         List<AllHelthyDto> allHelthyDtos =   eartagData2Mapper.allHealthy3(wrapper);

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

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.pojo.pojovo.EartagDataDto;
 import com.huimv.eartag2.manage2.pojo.pojovo.QingShanData;
@@ -35,7 +36,7 @@ import java.util.stream.Collectors;
  * @since 2022-07-29
  */
 @Service
-public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, EartagData2> implements IEartagData2Service {
+public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, EartagData> implements IEartagData2Service {
 
     @Resource
     private EartagData2Mapper eartagData2Mapper;
@@ -47,18 +48,18 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
     private SysAccountMultilevelMapper sysAccountMultilevelMapper;
 
     @Override
-    public List<EartagData2> getEartagData(String earmark) throws ParseException {
-        QueryWrapper<EartagData2> queryWrapper = new QueryWrapper<>();
+    public List<EartagData> getEartagData(String earmark) throws ParseException {
+        QueryWrapper<EartagData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("earmark", earmark);
-        List<EartagData2> eartagData2s = eartagData2Mapper.selectList(queryWrapper);
+        List<EartagData> eartagData2s = eartagData2Mapper.selectList(queryWrapper);
         //查询出来五分钟之内的数据;
         Calendar calendar = Calendar.getInstance();
         //1-当前时间
         Long currentTimestamps = System.currentTimeMillis();
         //存五秒内的数据
-        ArrayList<EartagData2> eartagData2s1 = new ArrayList<>();
+        ArrayList<EartagData> eartagData2s1 = new ArrayList<>();
         if (null != eartagData2s && eartagData2s.size() > 0) {
-            for (EartagData2 eartagData2 : eartagData2s) {
+            for (EartagData eartagData2 : eartagData2s) {
                 String addTime = eartagData2.getAddTime() + "";
                 calendar.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(addTime));
                 long timeInMillis = calendar.getTimeInMillis();
@@ -81,7 +82,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         if (StringUtils.isBlank(earmark)) {
             return new Result(10001, "请选择耳标", false);
         }
-        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
         wrapper.eq("earmark", earmark);
         if (StringUtils.isBlank(startDate)) {
             wrapper.ge("add_time", DateUtil.beginOfDay(now));
@@ -89,7 +90,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
             wrapper.between("add_time", startDate, endDate);
         }
         wrapper.orderByAsc("add_time");
-        List<EartagData2> list = this.list(wrapper);
+        List<EartagData> list = this.list(wrapper);
         //用户数据
 //        if (user.getIsUser() == 0) {
 //            for (EartagData2 eartagData2 : list) {
@@ -116,7 +117,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         if (StringUtils.isBlank(earmark)) {
             return new Result(10001, "请选择耳标", false);
         }
-        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
         wrapper.eq("earmark", earmark);
         if (StringUtils.isBlank(startDate)) {
             wrapper.ge("add_time", DateUtil.beginOfDay(now));
@@ -124,7 +125,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
             wrapper.between("add_time", startDate, endDate);
         }
         wrapper.orderByAsc("add_time");
-        List<EartagData2> list = this.list(wrapper);
+        List<EartagData> list = this.list(wrapper);
         //用户数据
 //        if (user.getIsUser() == 0) {
 //            for (EartagData2 eartagData2 : list) {
@@ -149,11 +150,11 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         String startDate = map.get("startDate");
         String endDate = map.get("endDate");
 //        List<EartagData2> eartagData2List = eartagData2Mapper.getEartagDataByEarmark(earmark, recordCount);
-        QueryWrapper<EartagData2> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<EartagData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("earmark",earmark);
         queryWrapper.between("add_time",startDate +" 00:00:00",endDate+" 23:59:59");
         queryWrapper.orderByDesc("add_time");
-        List<EartagData2> eartagData2List = eartagData2Mapper.selectList(queryWrapper);
+        List<EartagData> eartagData2List = eartagData2Mapper.selectList(queryWrapper);
 
         if (eartagData2List.size() == 0) {
             boolean earmark1 = eartagEartagRegister2Mapper.exists(new QueryWrapper<EartagEartagRegister2>().eq("earmark", earmark));
@@ -162,7 +163,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
             }
             return new Result(10009, "数据为空", false);
         } else {
-            List<EartagData2> newList = new ArrayList();
+            List<EartagData> newList = new ArrayList();
             for (int a = eartagData2List.size() - 1; a >= 0; a--) {
                 newList.add(eartagData2List.get(a));
             }
@@ -173,7 +174,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
     @Override
     public Result getTemp(Map<String, String> map) {
         String earmark = map.get("earmark");
-        return  new Result(ResultCode.SUCCESS,this.list(new QueryWrapper<EartagData2>().eq("earmark",  earmark).ge("ask_time", DateUtil.beginOfDay(new Date()))));
+        return  new Result(ResultCode.SUCCESS,this.list(new QueryWrapper<EartagData>().eq("earmark",  earmark).ge("ask_time", DateUtil.beginOfDay(new Date()))));
 
     }
 
@@ -181,7 +182,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
     public Result getAct(Map<String, String> map) {
         Date date = new Date();
         String earmark = map.get("earmark");
-        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
         wrapper.eq("earmark",earmark);
         wrapper.between("ask_time",DateUtil.beginOfDay(DateUtil.offsetDay(date,-7)),date);
         wrapper.groupBy("`time`");
@@ -227,7 +228,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         if (StringUtils.isBlank(earmark)) {
             return new Result(10001, "请选择耳标", false);
         }
-        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
         wrapper.eq("earmark", earmark);
         if (StringUtils.isBlank(startDate)) {
             wrapper.ge("add_time", DateUtil.beginOfDay(now));
@@ -235,7 +236,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
             wrapper.between("add_time", startDate, endDate);
         }
         wrapper.orderByAsc("add_time");
-        List<EartagData2> list = this.list(wrapper);
+        List<EartagData> list = this.list(wrapper);
 
         return new Result(ResultCode.SUCCESS, list);
     }
@@ -250,26 +251,28 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         if (StringUtils.isBlank(quantity)){
             quantity = "50";
         }
-        List<EartagData2> eartagData2List = this.list(new QueryWrapper<EartagData2>().eq("earmark", earmark).orderByDesc("add_time").last(String.format("limit %s", quantity)));
+        List<EartagData> eartagData2List = this.list(new QueryWrapper<EartagData>().eq("earmark", earmark).orderByDesc("add_time").last(String.format("limit %s", quantity)));
         return new Result(ResultCode.SUCCESS,eartagData2List);
     }
 
     @Override
-    public List<Data> getActAndEemp(QueryWrapper<EartagData2> eartagData2QueryWrapper) {
+    public List<Data> getActAndEemp(QueryWrapper<EartagData> eartagData2QueryWrapper) {
         return eartagData2Mapper.getActAndEemp(eartagData2QueryWrapper);
     }
     @Override
     public Result getByTimeFilter(Map<String, String> map) {
 
         String earmark = map.get("earmark");
+        String farmId = map.get("farmId");
         String startDate = map.get("startDate");
         String endDate = map.get("endDate");
         Date now = new Date();
         if (StringUtils.isBlank(earmark)) {
             return new Result(10001, "请选择耳标", false);
         }
-        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
         wrapper.eq("earmark", earmark);
+        wrapper.eq("farm_id", farmId);
         if (StringUtils.isBlank(startDate)) {
             wrapper.ge("add_time", DateUtil.beginOfDay(now));
         } else {
@@ -280,11 +283,11 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         List<Float> list2 = new ArrayList<>();
         List<Float> list3 = new ArrayList<>();
         List<Date> list4 = new ArrayList<>();
-        List<Long> list5 = new ArrayList<>();
+        List<Integer> list5 = new ArrayList<>();
         List<Integer> list6 = new ArrayList<>();
         List<Float> list7 = new ArrayList<>();
-        List<EartagData2> list = this.list(wrapper);
-        for (EartagData2 eartagData2 : list) {
+        List<EartagData> list = this.list(wrapper);
+        for (EartagData eartagData2 : list) {
             Float earTemp1 = eartagData2.getEarTemp1();
             Float earTemp2 = eartagData2.getEarTemp2();
             Float envTemp1 = eartagData2.getEnvTemp1();

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

@@ -102,13 +102,16 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         String pigpenId = paramsMap.get("pigpenId");
         String unitId = paramsMap.get("unitId");
         EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisterMapper.selectById(id);
-        eartagDeviceRegister.setFarmerId(farmId);
+//        eartagDeviceRegister.setFarmerId(farmId);
+        eartagDeviceRegister.setFarmId(farmId);
         eartagDeviceRegister.setUnitId(Integer.parseInt(unitId));
         eartagDeviceRegister.setPigpenId(Integer.parseInt(pigpenId));
         eartagDeviceRegisterMapper.updateById(eartagDeviceRegister);
         cacheService.setDeviceCodeByChipId(eartagDeviceRegister.getChipId(), eartagDeviceRegister.getDeviceCode());
-        Object o = redisTemplate.opsForValue().get("hash:chipId");
-        System.out.println("修改成功！"+o);
+//        Object o = redisTemplate.opsForValue().get("hash:chipId");
+
+
+//        System.out.println("修改成功！"+o);
         return resultUtil.result(1);
     }
 

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.eartag2.manage2.mapper.EartagData2Mapper;
 import com.huimv.eartag2.manage2.pojo.EartagData;
+import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.huimv.eartag2.manage2.pojo.EartagEartagRegister;
 import com.huimv.eartag2.manage2.pojo.pojovo.EartagEartagRegisterVo;
@@ -74,7 +75,7 @@ public class EartagEartagRegisterServiceImpl extends ServiceImpl<EartagEartagReg
             EartagEartagRegisterVo eartagDeviceRegisterVo = new EartagEartagRegisterVo();
             BeanUtil.copyProperties(record,eartagDeviceRegisterVo);
             EartagData eartagData = eartagDataMapper.selectOne(new QueryWrapper<EartagData>().eq("earmark", record.getEarmark()).orderByDesc("id").last("limit 1"));
-            eartagDeviceRegisterVo.setAct(eartagData.getAct1());
+            eartagDeviceRegisterVo.setAct(Math.toIntExact(eartagData.getAct1()));
             Float earTemp1 = eartagData.getEarTemp1();
             eartagDeviceRegisterVo.setEarTemp(earTemp1);
             eartagDeviceRegisterVo.setEnvTemp(eartagData.getEnvTemp1());

huimv-eartag2-manage2/src/main/resources/bootstrap.yml

@@ -2,7 +2,8 @@ spring:
   application:
     name: huimv-eartag2-manage2
   profiles:
-    active: dev
+#    active: dev
+    active: test
   cloud:
     nacos:
       config: