修改了耳标温度展示逻辑

cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/EartagRegisterEntity.java

@@ -1,5 +1,6 @@
 package com.huimv.acquisition.entity;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -60,4 +61,26 @@ public class EartagRegisterEntity implements Serializable {
 	 */
 	private String pigpen;
 
+
+
+
+	//为了统计上传次数增加的字段
+	@Excel(name = "")
+	private Integer countTimes;
+
+
+
+	//为了统计上传次数增加的字段
+	@Excel(name = "")
+	private double earTemp;
+
+
+
+	//为了统计上传次数增加的字段
+	@Excel(name = "")
+	private Integer earTempStatus;
+	
+
+
+
 }

cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/eartagsocket/EartagServer2.java

@@ -25,9 +25,9 @@ import java.net.Socket;
 public class EartagServer2 {
     @Autowired
     private EartagServerHandler2 serverHandler;
-
+    //外面的版本    金华的端口     10024
     //创建构造方法
-    private int port = 10023;
+    private int port = 10024;
     public EartagServer2(){
     }
 

cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/ReceivePackageSerivce.java

@@ -60,6 +60,9 @@ public class ReceivePackageSerivce {
     private HeartBeatRecordService heartBeatRecordService ;
 
 
+
+
+
     //2021.2.16修改  当数据被上传的时候检查是否注册  如果没有注册就放弃上传
     public String handleEartagData(String[] clientMessageArray ,String rawdata) throws ParseException {
         //这一块应该封装起来 ，而不是直接展示
@@ -144,8 +147,18 @@ public class ReceivePackageSerivce {
             return  null;
         }
 
+       Double a =    Double.parseDouble(env_temp)/100-Double.parseDouble(df.format(ln(Integer.parseInt(split[2]))));
+        System.out.println("温度差A="+a);
+        if(Math.abs(a)>10){
+            findeartagRegisterEntity.setEarTempStatus(0);
+            eartagRegisterService.updateById(findeartagRegisterEntity);
+        }else {
+            findeartagRegisterEntity.setEarTempStatus(1);
+            eartagRegisterService.updateById(findeartagRegisterEntity);
+        }
 
 
+        
          //已经登记了但是没有第一条
         if (lastEarTagDate==null){
             //存储这一条数据
@@ -166,6 +179,7 @@ public class ReceivePackageSerivce {
             rawDataService.save(rawDataEntity);
             //罗工要求返回空数据
             return null;
+            
         }
         
         
@@ -203,10 +217,21 @@ public class ReceivePackageSerivce {
     
     
     public static void main(String[] args) {
+
+
+      //  编码zj+202007239999865+133083123618532+100+0+2057+0+96+20220224133353+1.0#1.0#12424+0+end
+
+
+
+
         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);
@@ -247,9 +272,7 @@ public class ReceivePackageSerivce {
         dou = Double.parseDouble(nf.format(dou));
         return dou;
     }
-
-
-
+    
 
     //温度转换
     public static double ln(int rv) {
@@ -258,9 +281,7 @@ public class ReceivePackageSerivce {
         //保留一位小数
         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 {
         //湿度数据还是不需要处理，返回对应的数值
   /*      String header = clientMessageArray[0];
@@ -343,12 +364,6 @@ public class ReceivePackageSerivce {
         heartBeatRecordEntity.setCreateTime(new Date());
         heartBeatRecordService.save(heartBeatRecordEntity);
 
-
-
-
-
-
-
         return "hm+4+0+7+end";
     }
 

cloud-platform-acquisition/src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 server:
-  port: 9501
+  port: 9502
 spring:
   datasource:
-    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-cloud-test1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-cloud-pro1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

cloud-platform-base/platform-system/src/main/java/com/huimv/sys/modular/auth/service/impl/AuthServiceImpl.java

@@ -30,7 +30,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.huimv.core.pojo.response.ResponseData;
 import com.huimv.core.pojo.response.SuccessResponseData;
 import com.huimv.sys.core.cache.UserCache;
 import com.huimv.sys.core.enums.LogSuccessStatusEnum;

cloud-platform-main/src/main/java/com/huimv/modular/collectorregister/controller/CollectorRegisterController.java

@@ -48,6 +48,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+
 import javax.annotation.Resource;
 import java.util.*;
 
@@ -75,11 +76,10 @@ public class CollectorRegisterController {
 
     @Autowired
     private BasePigpenMapper basePigpenMapper;
-    
-    
+
 
     //批量添加采集器----客户接口
-    @PostMapping ("/collectorRegister/addPro")
+    @PostMapping("/collectorRegister/addPro")
     public ResponseData addPro(@RequestBody Map<String, Object> params) {
         //批量添加 基站
         String deviceCodeList = (String) params.get("deviceCodeList");  //耳基站号码  不止一个
@@ -105,7 +105,6 @@ public class CollectorRegisterController {
         BasePigpen pigpen = basePigpenMapper.selectOne(wrapper);
 
 
-
         //添加舍得信息
         BasePigpen basePigpenunit = new BasePigpen();
         basePigpenunit.setFarmCode(farmId); //记录牧场
@@ -124,20 +123,17 @@ public class CollectorRegisterController {
         String[] as = deviceCodeList.split(",");
 
         LambdaQueryWrapper<CollectorRegister> wrapper13 = Wrappers.lambdaQuery();
-        wrapper13.in(CollectorRegister::getDeviceCode ,   as);
+        wrapper13.in(CollectorRegister::getDeviceCode, as);
         List<CollectorRegister> collectorRegisters = collectorRegisterMapper.selectList(wrapper13);
 
-        if(collectorRegisters.size()!=0) {
+        if (collectorRegisters.size() != 0) {
             List<String> devideCodes = new ArrayList<>();
             for (CollectorRegister collectorRegister : collectorRegisters) {
                 devideCodes.add(collectorRegister.getDeviceCode());
             }
-
-
-             ErrorResponseData errorResponseData = new ErrorResponseData("添加失败，基站编码存在重复,重复编码为 "+devideCodes);
+            ErrorResponseData errorResponseData = new ErrorResponseData("添加失败，基站编码存在重复,重复编码为 " + devideCodes);
             return errorResponseData;
-         }
-
+        }
 
 
         for (int i = 0; i < as.length; i++) {
@@ -156,16 +152,8 @@ public class CollectorRegisterController {
             collectorRegister.setPort(6859);
             collectorRegister.setServerIp("195.125.635.3");
 
-
-
-
             collectorRegisterService.save(collectorRegister);
 
-
-
-
-
-
         }
         SuccessResponseData successResponseData = new SuccessResponseData();
         successResponseData.setCode(200);
@@ -175,8 +163,6 @@ public class CollectorRegisterController {
     }
 
 
-
-
     /**
      * 查询设备管理
      *
@@ -192,51 +178,46 @@ public class CollectorRegisterController {
 
     /**
      * 添加设备管理
-     *添加就是这个接口   最终就是这样  带上  token就行
+     * 添加就是这个接口   最终就是这样  带上  token就行
+     *
      * @author yinhao
      * @date 2021-08-19 09:43:52
      */
     @Permission
     @PostMapping("/collectorRegister/add")
     public ResponseData add(@RequestBody @Validated(CollectorRegisterParam.add.class) CollectorRegisterParam collectorRegisterParam) {
-            collectorRegisterService.add(collectorRegisterParam);
+        collectorRegisterService.add(collectorRegisterParam);
         return new SuccessResponseData();
     }
 
 
-
     /**
      * 删除设备管理，可批量删除
-     *统计数量
+     * 统计数量
+     *
      * @author yinhao
      * @date 2021-08-19 09:43:52
      */
     @PostMapping("/collectorRegister/delete")
     public ResponseData delete(@RequestBody @Validated(CollectorRegisterParam.delete.class) List<Integer> ids) {
-        if (ids == null || ids.size() == 0){
+        if (ids == null || ids.size() == 0) {
             return ResponseData.error("请选择设备");
         }
         for (Integer id : ids) {
-            CollectorRegister collectorRegisterEntity= collectorRegisterService.getById(id);
+            CollectorRegister collectorRegisterEntity = collectorRegisterService.getById(id);
             String deviceCode = collectorRegisterEntity.getDeviceCode();
 
             int count = eartagRegisterService.count(Wrappers.<EartagRegister>lambdaQuery().eq(EartagRegister::getDeviceCode, deviceCode));
-            if (count > 0){
-                return ResponseData.error("删除失败，设备号为"+collectorRegisterEntity.getDeviceCode()+"的设备下有未清理耳标");
+            if (count > 0) {
+                return ResponseData.error("删除失败，设备号为" + collectorRegisterEntity.getDeviceCode() + "的设备下有未清理耳标");
             }
         }
 
-            collectorRegisterService.delete(ids);
+        collectorRegisterService.delete(ids);
         return new SuccessResponseData();
     }
 
 
-
-
-
-
-
-
     /**
      * 编辑设备管理
      *
@@ -245,7 +226,7 @@ public class CollectorRegisterController {
      */
     @PostMapping("/collectorRegister/edit")
     public ResponseData edit(@RequestBody @Validated(CollectorRegisterParam.edit.class) CollectorRegisterParam collectorRegisterParam) {
-            collectorRegisterService.edit(collectorRegisterParam);
+        collectorRegisterService.edit(collectorRegisterParam);
         return new SuccessResponseData();
     }
 
@@ -264,9 +245,9 @@ public class CollectorRegisterController {
     public ResponseData logout(@RequestBody CollectorRegister collectorRegister) {
         Integer id = collectorRegister.getId();
         CollectorRegister byId = collectorRegisterService.getById(id);
-        if ( 0 ==byId.getCanStatus() ){
+        if (0 == byId.getCanStatus()) {
             byId.setCanStatus(3);
-        }else {
+        } else {
             byId.setCanStatus(0);
         }
         collectorRegisterService.updateById(byId);

cloud-platform-main/src/main/java/com/huimv/modular/collectorregister/entity/CollectorRegister.java

@@ -106,6 +106,13 @@ public class CollectorRegister  {
     @Excel(name = "猪舍id")
     private Integer pigpenId;
 
+
+    /**
+     *   平均温度  2.23添加的这个参数
+     */
+    @Excel(name = "近期平均温度")
+    private double envTemp;
+
     /**
      * 栋舍名称
      */

cloud-platform-main/src/main/java/com/huimv/modular/collectorregister/mapper/CollectorRegisterMapper.java

@@ -76,4 +76,16 @@ public interface CollectorRegisterMapper extends BaseMapper<CollectorRegister> {
 
 
 
+
+    //更新采集器温度
+    @Select("      UPDATE   collector_register   C   SET C.env_temp  =   \n" +
+            "      \n" +
+            "       (  SELECT    E.temp    FROM \n" +
+            "       \n" +
+            "           (    SELECT   de.create_date,  de.device_code ,  de.temp_value AS temp  FROM   device_temp  de  JOIN   ( SELECT   MAX(id) id  FROM     device_temp     ed2      GROUP BY  ed2.device_code  )   D   \n" +
+            "\n" +
+            "                  WHERE  de.id  = D.id   )   E      WHERE  E.device_code  = C.`device_code` )   ")
+    void     updateTemp( );
+
+
 }

cloud-platform-main/src/main/java/com/huimv/modular/collectorregister/service/impl/CollectorRegisterServiceImpl.java

@@ -96,10 +96,13 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterM
             if (ObjectUtil.isNotEmpty(collectorRegisterParam.getCanStatus())) {
                 queryWrapper.lambda().like(CollectorRegister::getCanStatus, collectorRegisterParam.getCanStatus());
             }
+            //按照最后上传时间倒序
+            queryWrapper.lambda().orderByDesc(CollectorRegister::getLastTime);
         }
         return new PageResult<>(this.page(PageFactory.defaultPage(), queryWrapper));
     }
 
+    
     @Override
     public List<CollectorRegister> list(CollectorRegisterParam collectorRegisterParam) {
         return this.list();

cloud-platform-main/src/main/java/com/huimv/modular/eartagregister/controller/EartagRegisterController.java

@@ -193,6 +193,7 @@ public class EartagRegisterController{
         return successResponseData;
     }
 
+
     //展示注册表中的所有耳标  通过时间来倒序查
    /* {
         "eartagNo": "00010131010",
@@ -208,24 +209,39 @@ public class EartagRegisterController{
         //入参的统一校验就应该通过 param的统一校验来做  不然重复代码过多啊
         String   eartagNo = (String) params.get("eartagNo");  //耳标号
         String   location = (String) params.get("location");  //坐标
-        Integer pageNo = (Integer) params.get("pageNo");
-        Integer pageSize = (Integer)  params.get("pageSize");
-        System.out.println(pageNo+"fenye"+ pageSize);
-
-
-        //
+        Integer   pageNo = (Integer) params.get("pageNo");
+        Integer  pageSize = (Integer)  params.get("pageSize");
+        String   EartagError = (String) params.get("EartagError");  //耳标损坏  --次数个和温度都是0
+        String   EartagWarm = (String) params.get("EartagWarm");  //可能次数很少 但是温度不为0
+        Integer  countTimes = (Integer)  params.get("countTimes");
+        String   TempError = (String) params.get("TempError");  //可能次数很少 但是温度不为0
         EartagRegisterVO eartagRegisterVO = new EartagRegisterVO();
+
+        if(countTimes!=null){
+            eartagRegisterVO.setCount(String.valueOf(countTimes));
+        }
         eartagRegisterVO.setLocation(location);
+        eartagRegisterVO.setTempError(TempError);
         eartagRegisterVO.setPageNo(pageNo);
         eartagRegisterVO.setPageSize(pageSize);
         eartagRegisterVO.setEartagNo(eartagNo);
+        eartagRegisterVO.setEartagWarm(EartagWarm);
+        eartagRegisterVO.setEartagError(EartagError);
         //
         PageResult<EartagRegister> query = eartagRegisterService.query(eartagRegisterVO);
-        
         return     new SuccessResponseData(query);
        
     }
 
+
+
+
+
+
+
+
+
+
     //修改注册信息
     @RequestMapping("/EratagRegister/update")
     public R updateEratagRegister(@RequestBody Map<String, Object> params) throws ClientException, ParseException {
@@ -298,6 +314,7 @@ public class EartagRegisterController{
         eartagDataMapper.deleteOneEartagDataAll(eartagNo);
 
         return R.ok("删除成功");
+
     }
 
 

cloud-platform-main/src/main/java/com/huimv/modular/eartagregister/entity/EartagRegisterVO.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import javax.management.StandardEmitterMBean;
 import java.util.Date;
 
 @Data
@@ -30,6 +31,23 @@ public class EartagRegisterVO {
     @Excel(name = "")
     private String eartagNo;
 
+    
+    
+    @Excel(name = "")
+    private String eartagWarm;
+
+
+    
+
+    @Excel(name = "")
+    private String tempError;
+    
+    
+    
+    
+    @Excel(name = "")
+    private String eartagError;
+
     /**
      *
      */
@@ -46,6 +64,23 @@ public class EartagRegisterVO {
      *
      */
     @Excel(name = "")
+    private String count;
+
+    //最大上传次数
+    @Excel(name = "")
+    private Integer maxCountTimes;
+    
+    
+    
+   //最小上传次数
+    @Excel(name = "")
+    private Integer minCountTimes;
+    
+
+    /**
+     *
+     */
+    @Excel(name = "")
     private String deviceCode;
 
     /**

cloud-platform-main/src/main/java/com/huimv/modular/eartagregister/mapper/EartagRegisterMapper.java

@@ -43,9 +43,9 @@ public interface EartagRegisterMapper extends BaseMapper<EartagRegister> {
 
      //查询过去时间内耳标数据上传次数并且批量更新上传次数
     @Select("UPDATE  eartag_register E  SET E.count_times =  (  IF (   (   SELECT B.count FROM  ( SELECT eartag_no, COUNT(*) AS COUNT\n" +
-            "FROM eartag_data ea  WHERE 1=1   AND    ea.time >  DATE_SUB(NOW(), INTERVAL 15 HOUR)\n" +
+            "FROM eartag_data ea  WHERE 1=1   AND    ea.time >  DATE_SUB(NOW(), INTERVAL 12 HOUR)\n" +
             "GROUP BY eartag_no   ORDER BY  COUNT DESC ) B  WHERE E.eartag_no = B.eartag_no  )  >   0  ,    (SELECT B.count FROM  ( SELECT eartag_no, COUNT(*) AS COUNT\n" +
-            "FROM eartag_data ea  WHERE 1=1   AND    ea.time >  DATE_SUB(NOW(), INTERVAL 15 HOUR)\n" +
+            "FROM eartag_data ea  WHERE 1=1   AND    ea.time >  DATE_SUB(NOW(), INTERVAL 12 HOUR)\n" +
             "GROUP BY eartag_no   ORDER BY  COUNT DESC ) B  WHERE E.eartag_no = B.eartag_no  )  ,   0    )   ) ")
     public void updateCount();
 
@@ -66,14 +66,6 @@ public interface EartagRegisterMapper extends BaseMapper<EartagRegister> {
     @Delete(" DELETE   FROM    `eartag_register` WHERE    eartag_no =#{eartag_no}    ")
     void    deleteByeartagnoFromEartagregister(@Param("eartag_no") String eartag_no);
      //定时更新耳标绑定的基站信息
-
-    
-    
-    
     
-    
-
-
-
 
 }

cloud-platform-main/src/main/java/com/huimv/modular/eartagregister/service/impl/EartagRegisterServiceImpl.java

@@ -67,36 +67,71 @@ public class EartagRegisterServiceImpl extends ServiceImpl<EartagRegisterMapper,
     @Override
     public PageResult<EartagRegister> query(EartagRegisterVO eartagRegisterVO) throws ParseException {
 
-
         LambdaQueryWrapper<EartagRegister> wrapper = Wrappers.lambdaQuery();
 
         //耳标号模糊查询
         if (StringUtilsWork.isNotBlank(eartagRegisterVO.getEartagNo())) {
             wrapper.like(EartagRegister::getEartagNo, eartagRegisterVO.getEartagNo());
         }
+
         //位置模糊查询
-        if (StringUtilsWork.isNotBlank(eartagRegisterVO.getLocation()) ) {
-            wrapper.like(EartagRegister::getLocation, eartagRegisterVO.getLocation());
+        if (StringUtilsWork.isNotBlank(eartagRegisterVO.getLocation())) {
+            if(eartagRegisterVO.getLocation().equals("0") ){
+                wrapper.eq(EartagRegister::getCountTimes, 0);
+            }else {
+                wrapper.like(EartagRegister::getLocation, eartagRegisterVO.getLocation());
+            }
         }
-        wrapper.orderByAsc(EartagRegister::getId);
-        System.out.println(eartagRegisterVO.getLocation());
 
+        //坏耳标
+        if(StringUtilsWork.isNotBlank(eartagRegisterVO.getEartagError())){
+            //次数0
+            wrapper.eq(EartagRegister::getCountTimes, 0);
+            wrapper.eq(EartagRegister::getEarTempStatus, 0);
+        }
 
-        PageResult<EartagRegister>  EartagDataPageResult = new PageResult<>();
+        //坏耳标---
+        if(StringUtilsWork.isNotBlank(eartagRegisterVO.getTempError())){
+            //次数0
+            wrapper.eq(EartagRegister::getCountTimes, 0);
+            wrapper.eq(EartagRegister::getEarTempStatus, 0);
+        }
+
+
+        if(StringUtilsWork.isNotBlank(eartagRegisterVO.getCount())){
+            wrapper.eq(EartagRegister::getCountTimes, 0);
+        }
+        
+
+        if(StringUtilsWork.isNotBlank(eartagRegisterVO.getEartagWarm())){
+          
+            //次数为0--5次
+            wrapper.between(EartagRegister::getCountTimes, 0,5);
+            //温度OK
+            wrapper.eq(EartagRegister::getEarTempStatus, 1 );
+
+        }
 
+
+
+        wrapper.orderByAsc(EartagRegister::getId);
+        PageResult<EartagRegister>  EartagDataPageResult = new PageResult<>();
         IPage<EartagRegister> iPage = eartagRegisterMapper.selectPage(new Page<>(eartagRegisterVO.getPageNo(), eartagRegisterVO.getPageSize()),
                 wrapper);
-
         EartagDataPageResult.setRows(iPage.getRecords());
         EartagDataPageResult.setPageSize(eartagRegisterVO.getPageSize());
         EartagDataPageResult.setPageNo(eartagRegisterVO.getPageNo());
         EartagDataPageResult.setTotalPage( Integer.valueOf(String.valueOf(iPage.getPages())) );
         EartagDataPageResult.setTotalRows( Integer.valueOf(String.valueOf(iPage.getTotal())) );
-
         return EartagDataPageResult ;
     }
 
 
+
+
+
+
+
     
 
     @Transactional

cloud-platform-main/src/main/java/com/huimv/modular/timer/tasks/CheckDeviceAble.java

@@ -29,6 +29,7 @@ import java.util.List;
 public class CheckDeviceAble {
 
     //查找掉线的设备是否还掉线，让他上线 --对应的有一个让设备下线的
+    //更新采集器温度
     @Autowired
     private CollectorRegisterService collectorRegisterService;
 
@@ -41,7 +42,7 @@ public class CheckDeviceAble {
     @Autowired
     private CollectorRegisterMapper  collectorRegisterDao;
 
-  //  @Scheduled(cron = "0/59 * * * * ?")
+    @Scheduled(cron = "0/59 * * * * ?")
     public void  checkDeviceAble() {
 
         Date now = new Date();//end
@@ -50,10 +51,15 @@ public class CheckDeviceAble {
         String format = sdf.format(GapTimeBefor_gap);
         String format1 = sdf.format(new Date());
         List<String> strings = collectorRegisterMapper.DeviceAble1(format, format1);
+        
         LambdaUpdateWrapper<CollectorRegister> updateWrapper = Wrappers.lambdaUpdate();
         updateWrapper.in(CollectorRegister::getDeviceCode,strings)
                 .set(CollectorRegister::getCanStatus,0);
         collectorRegisterMapper.update(null, updateWrapper);
 
+        collectorRegisterMapper.updateTemp();
+        
+        
+        
     }
 }

cloud-platform-main/src/main/java/com/huimv/modular/timer/tasks/CheckDeviceUnable.java

@@ -41,7 +41,7 @@ public class CheckDeviceUnable {
 
 
     //写一个sql应该能解决 目前没时间   后面增加   这个代码也太垃圾了    虽然用了SQL 还是好垃圾
-   // @Scheduled(cron = "0/59 * * * * ?")
+    @Scheduled(cron = "0/59 * * * * ?")
     private void checkUnadleDevice() throws ParseException {
         System.out.println("zhixing");
         Date now = new Date();//end

cloud-platform-main/src/main/java/com/huimv/modular/timer/tasks/CountEartagSendMassageTimes.java

@@ -24,12 +24,14 @@ public class CountEartagSendMassageTimes {
     //更新温度状态
     @Scheduled(cron = "0/59 * * * * ?")
     public void CountAndUpdateEartagSendMassageTimes() {
+        
         //更新统计次数
         eartagRegisterMapper.updateCount();
         //更新最新温度
         eartagRegisterMapper.updateEartagTemp();
         //判断是否有问题
-        eartagRegisterMapper.CheckEartagTempAndSetStatus();
+       // eartagRegisterMapper.CheckEartagTempAndSetStatus();
+        
         System.out.println("更新耳标上传次数成功");
 
     }

cloud-platform-main/src/main/java/com/huimv/modular/timer/tasks/UpdateDeviceLastSendTime.java

@@ -24,23 +24,18 @@ import java.util.List;
 public class UpdateDeviceLastSendTime {
 
     @Autowired
-    private EartagDataMapper eartagDataMapper   ;
-
-    @Autowired
     private HeartBeatRecordMapper   heartBeatRecordMapper   ;
-    @Autowired
-    private AlarmValueSetMapper alarmValueSetMapper    ;
+
 
     @Autowired
     private CollectorRegisterMapper collectorRegisterMapper    ;
-    @Autowired
-    private CollectorRegisterService collectorRegisterService     ;
+
 
     @Autowired
-    private AlarmRecordService alarmRecordService     ;
+    private CollectorRegisterService collectorRegisterService     ;
 
     //更新设备最后一次上传时间
-   // @Scheduled(cron = "0/10 * * * * ?")
+    @Scheduled(cron = "0/59 * * * * ?")
     public void checkDeviceAble() {
 
         System.out.println("更新设备最后一次上传时间");
@@ -55,6 +50,7 @@ public class UpdateDeviceLastSendTime {
                 collectorRegister.setLastTime(heartBeatRecord.getCreateTime());
                 collectorRegisterService.updateById(collectorRegister);
             }
+
         }
     }
 }

cloud-platform-main/src/main/java/com/huimv/modular/timer/tasks/UpdateEartagRegirterDetailsInfo.java

@@ -46,7 +46,8 @@ public class UpdateEartagRegirterDetailsInfo {
         System.out.println("更新耳标注册基础信息");
 
 
-     /*  for (int i = 13; i <= 20; i++) {
+/*
+       for (int i = 21; i <= 30; i++) {
 
             for (int j = 1; j <= 100; j++) {
                 EartagRegister eartagRegister1 = new EartagRegister();
@@ -57,8 +58,8 @@ public class UpdateEartagRegirterDetailsInfo {
                 eartagRegisterService.save(eartagRegister1);
                 System.out.println("存储" + i + "--" + j);
             }
-        }
-*/
+        }*/
+
 
         LambdaQueryWrapper<EartagRegister> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(EartagRegister::getDeviceCode, null);

cloud-platform-main/src/main/resources/application-local.yml

@@ -2,7 +2,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-cloud-pro1?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-cloud-test1?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
     username: root
     password: hm123456
   redis:

cloud-platform-main/src/main/resources/application.yml

@@ -1,6 +1,6 @@
-#服务配置
+#服务配置   云中心 9556     公司测试  8256     第一家客户的   9256
 server:
-  port: 9256
+  port: 8256
   max-http-header-size: 10240
 
 #spring相关配置  选择哪个配置文件