登录

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

@@ -76,4 +76,6 @@ public class EartagRegisterController {
         return R.ok();
     }
 
-}
+
+
+ }

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

@@ -1,5 +1,5 @@
-server:
-  port: 9502
+listIndexserver:
+  port: 9501
 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

cloud-platform-base/platform-core/src/main/java/com/huimv/core/consts/SpringSecurityConstant.java

@@ -57,6 +57,8 @@ public interface SpringSecurityConstant {
             "/oauth/**",
             "/test/testUpdate",
             "/eartagdata/**",
+            "/test/testUpdate2",
+            "/test/listWarning",
 
             //文件的
             "/sysFileInfo/upload",

cloud-platform-base/platform-core/src/main/java/com/huimv/core/pojo/response/ResponseData.java

@@ -63,15 +63,10 @@ public class ResponseData {
      */
     private Object data;
 
-    /**
-     * 响应牧场名称
-     */
-    private String farmName;
 
-    /**
-     * 响应牧场id
-     */
-    private Integer farmId;
+
+
+
 
     public ResponseData() {
     }

cloud-platform-base/platform-core/src/main/java/com/huimv/core/pojo/response/SuccessResponseData.java

@@ -31,6 +31,31 @@ package com.huimv.core.pojo.response;
  * @date 2020/3/30 15:04
  */
 public class SuccessResponseData extends ResponseData {
+    /**
+     * 响应牧场名称
+     */
+    private String farmName;
+
+    /**
+     * 响应牧场id
+     */
+    private Integer farmId;
+
+    public String getFarmName() {
+        return farmName;
+    }
+
+    public void setFarmName(String farmName) {
+        this.farmName = farmName;
+    }
+
+    public Integer getFarmId() {
+        return farmId;
+    }
+
+    public void setFarmId(Integer farmId) {
+        this.farmId = farmId;
+    }
 
     public SuccessResponseData() {
         super(true, DEFAULT_SUCCESS_CODE, DEFAULT_SUCCESS_MESSAGE, null);

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

@@ -99,6 +99,7 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterM
             //按照最后上传时间倒序
             queryWrapper.lambda().orderByDesc(CollectorRegister::getLastTime);
         }
+        queryWrapper.orderByDesc("last_time");
         return new PageResult<>(this.page(PageFactory.defaultPage(), queryWrapper));
     }
 

cloud-platform-main/src/main/java/com/huimv/modular/eartagdata/mapper/mapping/EartagDataMapper.xml

@@ -50,7 +50,7 @@
     <select id="pageIndex"
             resultMap="eartagDataIndex"
             parameterType="com.huimv.modular.eartagdata.entity.vo.EartagDataVo" >
-        SELECT   ed1.id ,  ed1.eartag_no  ,ed1.device_code ,ed1.time, ed1.ear_temp   ,ed1.bat  ,ed1.exercise ,
+        SELECT   DISTINCT ed1.id ,  ed1.eartag_no  ,ed1.device_code ,ed1.time, ed1.ear_temp   ,ed1.bat  ,ed1.exercise ,
 
         ed1.env_temp   ,ed1.rssi  ,co.pen_name  ,co.unit_name   ,co.stage   ,co.registe_code ,ear.count_times,ear.ear_temp_status
 

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

@@ -25,6 +25,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
 package com.huimv.modular.eartagregister.controller;
 
 
+import com.alibaba.druid.sql.visitor.functions.Substring;
 import com.aliyun.oss.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -56,6 +57,7 @@ import com.huimv.modular.result.R;
 import com.huimv.modular.utils.util.StringUtilsWork;
 import com.tencentcloudapi.vpc.v20170312.models.PrivateIpAddressSpecification;
 import org.apache.poi.ss.formula.functions.T;
+import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -66,10 +68,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.xml.transform.Source;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 耳标注册控制器
@@ -81,25 +80,63 @@ import java.util.Map;
 @RestController
 public class EartagRegisterController{
     
-    
     @Autowired
     private EartagRegisterService   eartagRegisterService;
 
-
     @Autowired
     private EartagRegisterMapper eartagRegisterMapper;
 
-
     @Autowired
     private EartagDataMapper  eartagDataMapper ;
 
-
-
     @Autowired
     private CollectorRegisterMapper collectorRegisterMapper ;
 
+    @PostMapping ("/test/testUpdate")
+    @Test
+    public void test(@RequestBody Map<String,String> map) {
+        for (int  i = 0 ;i <150 ; i++){
+            EartagRegister byId = eartagRegisterService.getById(401 + i);
+            byId.setEartagNo("13307010148"+getStrId(i));
+            eartagRegisterService.updateById(byId);
+        }
+    }
 
-
+    @PostMapping ("/test/testUpdate2")
+    public String testUpdate2(@RequestBody Map<String,Integer> map) {
+        Integer starId = map.get("starId");
+        Integer endId = map.get("endId");
+        Integer starEartag = map.get("starEartag");
+        Integer endEartag  = map.get("endEartag");
+
+        for (int  i = starId ;i <= endId ; i++){
+            EartagRegister byId = eartagRegisterService.getById(i +100 );
+            byId.setEartagNo(starEartag+getStrId(endEartag));
+            eartagRegisterService.updateById(byId);
+        }
+        return "成功";
+    }
+    private String getStrId(Integer id) {
+        StringBuilder strId = new StringBuilder(id + "");
+        for (int  i = strId.length() ;i <  4; i++){
+            strId.insert(0, "0");
+        }
+        return strId.toString();
+    }
+    @PostMapping ("/test/listWarning")
+    public String listWarning(@RequestBody Map<String,Integer> map) {
+        Integer starId = map.get("starId");
+        Integer endId = map.get("endId");
+        Integer starEartag = map.get("starEartag");
+        Integer endEartag  = map.get("endEartag");
+
+        for (int  i = starId ;i <= endId ; i++){
+            EartagRegister byId = eartagRegisterService.getById(i +100 );
+            byId.setEartagNo(starEartag+getStrId(endEartag));
+            eartagRegisterService.updateById(byId);
+        }
+        return "成功";
+    }
 
     //增加增删改查的功能  删除的时候删除所有的耳标：
     //手动添加的只有三个参数  耳标号   坐标  然后没有了    在上传的时候补齐其余信息  （默认上传次数为1）
@@ -178,7 +215,6 @@ public class EartagRegisterController{
         return successResponseData;
     }
 
-
     //展示注册表中的所有耳标  通过时间来倒序查
    /* {
         "eartagNo": "00010131010",
@@ -194,51 +230,38 @@ 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");
-        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();
+        Integer pageNo = (Integer) params.get("pageNo");
+        Integer pageSize = (Integer)  params.get("pageSize");
+        System.out.println(pageNo+"fenye"+ pageSize);
 
-        if(countTimes!=null){
-            eartagRegisterVO.setCount(String.valueOf(countTimes));
-        }
+
+        //
+        EartagRegisterVO eartagRegisterVO = new EartagRegisterVO();
         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 {
         //入参的统一校验就应该通过 param的统一校验来做  不然重复代码过多啊
-
-        Integer  id = (Integer)  params.get("id");
         String   eartagNo = (String) params.get("eartagNo");  //耳标号---不可修改  可能会乱数据库
-        String   location = (String) params.get("location");  //坐标
 
+        String   location = (String) params.get("location");  //坐标
 
         LambdaQueryWrapper<EartagRegister> wrapper = Wrappers.lambdaQuery();
-            wrapper.eq(EartagRegister::getId, id);
+            wrapper.eq(EartagRegister::getEartagNo, eartagNo);
         EartagRegister eartagRegister = eartagRegisterMapper.selectOne(wrapper);
 
         if (StringUtilsWork.isNotBlank(location)) {
             eartagRegister.setLocation(location);
-            eartagRegister.setEartagNo(eartagNo);
         }
 
         eartagRegisterService.updateById(eartagRegister);
@@ -246,6 +269,7 @@ public class EartagRegisterController{
     }
 
 
+
     //增加增删改查的功能  删除的时候删除所有的耳标：
     //手动添加的只有三个参数  耳标号   坐标  然后没有了    在上传的时候补齐其余信息  （默认上传次数为1）
     //所有的事件接口
@@ -283,6 +307,7 @@ public class EartagRegisterController{
     public R deleteEratagRegister(@RequestBody Map<String, Object> params) throws ClientException, ParseException {
         //入参的统一校验就应该通过 param的统一校验来做  不然重复代码过多啊
         String   eartagNo = (String) params.get("eartagNo");  //耳标号
+
         LambdaQueryWrapper<EartagRegister> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(EartagRegister::getEartagNo, eartagNo ).last( "limit 1");
         EartagRegister    EarTagDate = eartagRegisterMapper.selectOne(wrapper);
@@ -293,6 +318,7 @@ public class EartagRegisterController{
         eartagRegisterMapper.deleteByeartagnoFromEartagregister(eartagNo);
        //删除这个耳标的数据
         eartagDataMapper.deleteOneEartagDataAll(eartagNo);
+
         return R.ok("删除成功");
     }
 

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

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