更新部分代码

cloud-platform-acquisition/pom.xml

@@ -146,5 +146,4 @@
 
 
 
-
 </project>

cloud-platform-acquisition/src/main/java/com/huimv/acquisition/HuimvSmartEartagDataAcquisitionApplication.java

@@ -17,7 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 //这是新项目深度优化版本，可以深度修改，改完了记得上传
 //只充当存储数据的服务是没有任何问题的----已经复原之前的功能仅仅
 @EnableScheduling
-//排除掉 security
+//排除掉 security--不然接口会一直报错
 @SpringBootApplication(exclude = {org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class})
 public class HuimvSmartEartagDataAcquisitionApplication {
     public static void main(String[] args) throws InterruptedException {

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

@@ -88,7 +88,7 @@ public class EartagDataController {
 
 
     /**
-     * 列表  耳标个体数据----电大展示专用
+     * 列表  耳标个体数据----杭电展示专用--耳标写死了的
      */
     @RequestMapping("/listEartagDeatils")
     public R listEartagDeatils( @RequestBody EartagParamVo eartagParamVo) throws ParseException {

cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagDataServiceImpl.java

@@ -42,14 +42,14 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
     @Autowired
     private BasePigpenDao basePigpenDao;
 
-
     @Autowired
     private CollectorRegisterDao collectorRegisterDao ;
 
-
     @Autowired
     private MovePigpenDao movePigpenDao;
 
+
+    //这个接口写的太辣鸡了
     @Override
     public PageUtils findByConditions(Map<String, Object> params) throws ParseException {
 
@@ -151,8 +151,6 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
     }
 
 
-
-
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<EartagDataEntity> page = this.page(
@@ -162,21 +160,20 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         return new PageUtils(page);
     }
 
-    //迁移接口
-    //耳标详细数据
+
+    //杭电展示专用接口--耳标号目前写死  部署在35服务器 数据库为  huimv—eartag-show
     @Override
     public   Map  queryEartagDeatils(EartagParamVo eartagParamVo) throws ParseException {
         String  eartagNo1 ="133083123620938";
         String  eartagNo2 ="133083123623215";
 
-
         LambdaQueryWrapper<EartagDataEntity> wrapper1 = Wrappers.lambdaQuery();
         wrapper1.eq(EartagDataEntity::getEartagNo, eartagNo1).orderByDesc(EartagDataEntity::getId);
         if(eartagParamVo.getStarTime()!=null){
             //传了时间按照时间
             wrapper1.between(EartagDataEntity::getTime, eartagParamVo.getStarTime(), eartagParamVo.getEndTime());
         }else {
-            //没有时间返回最近的1000条
+            //没有时间返回最近的500条
             wrapper1.last( "limit 50");
         }
         System.out.println("耳标号="+eartagParamVo.getEartagNo());
@@ -193,10 +190,7 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             wrapper2.last( "limit 50");
         }
         List<EartagDataEntity> eartagDataEntities2 = eartagDataDao.selectList(wrapper2);
-        
-        
-        
-        
+
         Map resultMap  = new HashMap();
         
         List<String> timeList = new ArrayList<>();

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

@@ -25,9 +25,10 @@ import java.net.Socket;
 public class EartagServer2 {
     @Autowired
     private EartagServerHandler2 serverHandler;
-    //外面的版本    金华的端口     10024    10025  部署在31 服务器上面好了
+    //外面的版本    金华的端口     10024    10025  部署在31 服务器上面好了    10023是test1平台的
     //创建构造方法
-    private int port = 10025;
+
+    private int port = 10023;
     public EartagServer2(){
     }
 

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

@@ -46,8 +46,6 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
     public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
         ByteBuf data = (ByteBuf) msg;
         String clientAsk = data.toString(CharsetUtil.UTF_8);
-      
-
 
 
         /* 处理客户端请求数据 */

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

@@ -126,14 +126,13 @@ public class ReceivePackageSerivce {
 
 
         if(findeartagRegisterEntity == null){
-            System.out.println("没有手动登记的耳标号 请手动注册登记"+eartag_no);
             RawDataEntity rawDataEntity = new RawDataEntity();
             rawDataEntity.setDetailData(rawdata+"没有手动登记");
             rawDataEntity.setStatus(0);
             rawDataEntity.setCreateTime(new Date());
             rawDataService.save(rawDataEntity);
             //耳标号没有注册  直接返回
-         /*   EartagRegisterEntity eartagRegisterEntity = new EartagRegisterEntity();
+            EartagRegisterEntity eartagRegisterEntity = new EartagRegisterEntity();
             eartagRegisterEntity.setAge(0);
             eartagRegisterEntity.setDeviceCode(device_code);//给绑定的设备编码死否会改变
             eartagRegisterEntity.setEartagNo(eartag_no);
@@ -144,7 +143,7 @@ public class ReceivePackageSerivce {
             eartagRegisterEntity.setStage(collectorRegisterEntity.getStage());
             eartagRegisterEntity.setStage(collectorRegisterEntity.getUnitId());
             eartagRegisterService.save(eartagRegisterEntity);//存储一条还没有处理的数据*/
-            return  null;
+             return  null ;
         }
 
        Double a =    Double.parseDouble(env_temp)/100-Double.parseDouble(df.format(ln(Integer.parseInt(split[2]))));

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

@@ -24,6 +24,8 @@ import java.util.Date;
  **/
 @Component
 public class SendPackageService {
+
+
     @Autowired
     private CollectorRegisterDao collectorRegisterDao;
 
@@ -31,6 +33,7 @@ public class SendPackageService {
     private HeartBeatRecordService heartBeatRecordService;
 
 
+
     /**
      * @Method      : _handleGetDeviceId
      * @Description : 获取设备id

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

@@ -2,7 +2,7 @@ server:
   port: 9502
 spring:
   datasource:
-    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-show?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-cloud-test1?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-main/src/main/java/com/huimv/CloudPlatformApplication.java

@@ -19,7 +19,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 //2022.2.9 解决温度阈值问题  解决数据数量不够的问题
     //1.上传的温度与实际温度偏差过大的问题
     //2.选定的耳标上传数量不够的问题，掉帧
-
+    //3.给客户配置的时候 记得才参数
 @SpringBootApplication
 @EnableScheduling
 public class CloudPlatformApplication {
@@ -28,4 +28,18 @@ public class CloudPlatformApplication {
         SpringApplication.run(CloudPlatformApplication.class, args);
         log.info(">>> " + CloudPlatformApplication.class.getSimpleName() + " is success!");
     }
+
+    //首先给客户配置好上传的IP
+    public  static  final   String    IP_VALUE= "192.168.1.1" ;
+
+   //客户数据上传的端口
+    public  static  final Integer  Port= 8001 ;
+
+
+
+
+
+
+
+
 }

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

@@ -40,14 +40,18 @@ import com.huimv.modular.collectorregister.entity.CollectorRegister;
 import com.huimv.modular.collectorregister.mapper.CollectorRegisterMapper;
 import com.huimv.modular.collectorregister.param.CollectorRegisterParam;
 import com.huimv.modular.collectorregister.service.CollectorRegisterService;
+import com.huimv.modular.constant.ConstnatValue;
 import com.huimv.modular.eartagregister.entity.EartagRegister;
 import com.huimv.modular.eartagregister.service.EartagRegisterService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.RestController;
 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 org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -78,15 +82,24 @@ public class CollectorRegisterController {
     private BasePigpenMapper basePigpenMapper;
 
 
-    //批量添加采集器----客户接口
+    //批量添加采集器----客户接口--针对瑞安项目 还没有更新添加基站进去
+/*
+
     @PostMapping("/collectorRegister/addPro")
     public ResponseData addPro(@RequestBody Map<String, Object> params) {
-        //批量添加 基站
-        String deviceCodeList = (String) params.get("deviceCodeList");  //耳基站号码  不止一个
+        //批量添加  只是基站号码不是一个  可以一样的操作 -------基站编号自动生成--唯一且不可更改--只展示自己
+        String   deviceCodeList = (String) params.get("deviceCodeList");  //耳基站号码  不止一个---实际上是 registerCode
+
+        String[] as = deviceCodeList.split(",");
+
+
+
         String penName = (String) params.get("penName");
         String unitName = (String) params.get("unitName");
         String farmName = (String) params.get("farmName");
         String farmId = (String) params.get("farmId");
+        //基站的编码应该在这儿提前确定
+        //上传的IP怎么处理--初始ooo 登录后台进行设置？
 
 
         //一进来先添加栋舍   拿到  id  再添加舍
@@ -97,9 +110,8 @@ public class CollectorRegisterController {
         basePigpen.setParentId(0);//栋  阶段啥的全部空着
         basePigpenService.save(basePigpen);
 
-        //拿最新的id 很麻烦直接查一次
-
 
+        //拿最新的id 很麻烦直接查一次
         LambdaQueryWrapper<BasePigpen> wrapper = Wrappers.lambdaQuery();
         wrapper.orderByDesc().last("limit 1");
         BasePigpen pigpen = basePigpenMapper.selectOne(wrapper);
@@ -120,10 +132,13 @@ public class CollectorRegisterController {
 
         //主从关系直接在这里创建   存到云服务器的只有设备编号  不存在其他的东西  转发IP   我们给他写死就可以了
 
-        String[] as = deviceCodeList.split(",");
 
+
+
+
+         //传的注册码不能重复
         LambdaQueryWrapper<CollectorRegister> wrapper13 = Wrappers.lambdaQuery();
-        wrapper13.in(CollectorRegister::getDeviceCode, as);
+        wrapper13.in(CollectorRegister::getRegisteCode, as);
         List<CollectorRegister> collectorRegisters = collectorRegisterMapper.selectList(wrapper13);
 
         if (collectorRegisters.size() != 0) {
@@ -135,12 +150,85 @@ public class CollectorRegisterController {
             return errorResponseData;
         }
 
+        //校验结束的同同时生成基站编码
 
-        for (int i = 0; i < as.length; i++) {
 
 
+
+
+        //关于设备得机器编码重复的问题  每个牧场分配不同的号段  这里就不做校验了
+
+        // 给 注册中心的的重要参数就是编码   添加到注册中心
+
+        RestTemplate restTemplateAddController = new RestTemplate();
+
+        //放置   tokrn 到  header
+
+        HttpHeaders headers = new HttpHeaders();
+
+        headers.add("Authorization", "Bearer " + json.get("data"));
+
+        headers.add("Content-Type", "applicati on/json");
+
+        Map<String, Object> requestBody = new HashMap<>(8);
+
+
+        requestBody.put("deviceCode", collectorRegister.getDeviceCode() );
+
+        requestBody.put("penName", collectorRegister.getPenName());
+
+        requestBody.put("pigpenId", collectorRegister.getPigpenId() );
+
+        requestBody.put("port", collectorRegister.getPort());
+
+        requestBody.put("registeCode", collectorRegister.getRegisteCode() );
+
+        requestBody.put("serverIp", collectorRegister.getServerIp() );
+
+        requestBody.put("stage", collectorRegister.getStage());
+
+        requestBody.put("unitId", collectorRegister.getUnitId() );
+
+        requestBody.put("unitName", collectorRegister.getUnitName());
+
+        HttpEntity<Map<String, Object>> httpEntity = new HttpEntity<>(requestBody, headers);
+
+        //用的是 199数据库  只有这一个数据库     调用他的增加办法
+
+        String body = restTemplate.postForEntity("http://47.98.40.154:8256/collectorRegister/add", httpEntity, String.class).getBody();
+
+        System.out.println(body);
+
+        //Integer userId = TokenSign.getMemberIdByJwtToken(request);
+
+        collectorRegister.setRegisterTime(new Date());
+
+        collectorRegisterService.save(collectorRegister);
+
+        return new Result(10000,"添加成功",true);
+
+
+
+
+
+
+
+
+
+
+        //前面校验都通过.这儿添加发送的端口，进行数据添加
+
+        List<String>
+
+
+
+
+
+
+        for (int i = 0; i < as.length; i++) {
+
             CollectorRegister collectorRegister = new CollectorRegister();
-            collectorRegister.setDeviceCode(as[i]);
+            collectorRegister.setDeviceCode(as[i]);//拿基站编码
             collectorRegister.setFarmCode(farmId);
             collectorRegister.setFarmName(farmName);
             collectorRegister.setRegisterTime(new Date());
@@ -149,8 +237,8 @@ public class CollectorRegisterController {
             collectorRegister.setUnitName(unitName);
             collectorRegister.setUnitId(pigpenUnite.getId());
             collectorRegister.setPigpenId(pigpen.getId());
-            collectorRegister.setPort(6859);
-            collectorRegister.setServerIp("195.125.635.3");
+            collectorRegister.setPort(ConstnatValue.Port);//
+            collectorRegister.setServerIp(ConstnatValue.IP_VALUE);
 
             collectorRegisterService.save(collectorRegister);
 
@@ -160,9 +248,19 @@ public class CollectorRegisterController {
         successResponseData.setSuccess(true);
         successResponseData.setMessage("保存成功");
         return successResponseData;
+        
     }
 
 
+
+
+*/
+
+
+
+
+    
+    
     /**
      * 查询设备管理
      *

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

@@ -114,14 +114,18 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterM
     @Override
     public void add(CollectorRegisterParam collectorRegisterParam) {
         CollectorRegister collectorRegister = new CollectorRegister();
+        //之前是拿组织ID  之后添加---现在应该改变这里
         BeanUtil.copyProperties(collectorRegisterParam, collectorRegister);
         Long sysLoginUserOrgId = LoginContextHolder.me().getSysLoginUserOrgId();
         SysOrg sysOrg = sysOrgMapper.selectById(sysLoginUserOrgId);
-        collectorRegister.setOrgId(sysLoginUserOrgId);
-        collectorRegister.setOrgName(sysOrg.getName());
+
+        collectorRegister.setOrgId(sysLoginUserOrgId);//非省平台不需要这个
+        collectorRegister.setOrgName(sysOrg.getName());//非省平台不需要这个
         this.save(collectorRegister);
     }
 
+
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(List<Integer> ids) {

cloud-platform-main/src/main/java/com/huimv/modular/constant/ConstnatValue.java

@@ -0,0 +1,25 @@
+package com.huimv.modular.constant;
+
+
+import javax.sound.sampled.Port;
+
+public class ConstnatValue {
+    
+    //首先给客户配置好上传的端口和
+
+    public  static  final   String    IP_VALUE= "192.168.1.1" ;
+
+
+    public  static  final Integer  Port= 8001 ;
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+}

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

@@ -98,22 +98,6 @@ public class EartagRegisterController{
     @Autowired
     private CollectorRegisterMapper collectorRegisterMapper ;
 
-    @PostMapping ("/test/testUpdate")
-    public void test() {
-
-        long eartagNo = 133202200001001L;
-            for (int i = 1; i <= 70; i++) {
-
-                String location = 28+"--" + i;
-                EartagRegister eartagRegister = eartagRegisterMapper.selectOne(new QueryWrapper<EartagRegister>().eq("location", location));
-                eartagRegister.setEartagNo(String.valueOf(eartagNo));
-                eartagRegister.setCountTimes(0);
-                eartagRegister.setEarTemp(0);
-                eartagRegister.setEarTempStatus(0);
-                eartagRegisterMapper.updateById(eartagRegister);
-                eartagNo=eartagNo+1;
-            }
-        }
 
 
 

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

@@ -11,6 +11,18 @@ spring:
     password: hm123456
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 # Oracle数据库
 #spring:
 #  datasource:

添加了一个测试类.patch

@@ -0,0 +1,226 @@
+Index: cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/ReceivePackageSerivce.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/ReceivePackageSerivce.java	(revision ad2aa865790715476d6de77dca02190fce53450a)
++++ cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/ReceivePackageSerivce.java	(date 1646122535364)
+@@ -126,14 +126,13 @@
+ 
+ 
+         if(findeartagRegisterEntity == null){
+-            System.out.println("没有手动登记的耳标号 请手动注册登记"+eartag_no);
+             RawDataEntity rawDataEntity = new RawDataEntity();
+             rawDataEntity.setDetailData(rawdata+"没有手动登记");
+             rawDataEntity.setStatus(0);
+             rawDataEntity.setCreateTime(new Date());
+             rawDataService.save(rawDataEntity);
+             //耳标号没有注册  直接返回
+-         /*   EartagRegisterEntity eartagRegisterEntity = new EartagRegisterEntity();
++            EartagRegisterEntity eartagRegisterEntity = new EartagRegisterEntity();
+             eartagRegisterEntity.setAge(0);
+             eartagRegisterEntity.setDeviceCode(device_code);//给绑定的设备编码死否会改变
+             eartagRegisterEntity.setEartagNo(eartag_no);
+@@ -144,7 +143,7 @@
+             eartagRegisterEntity.setStage(collectorRegisterEntity.getStage());
+             eartagRegisterEntity.setStage(collectorRegisterEntity.getUnitId());
+             eartagRegisterService.save(eartagRegisterEntity);//存储一条还没有处理的数据*/
+-            return  null;
++             return  null ;
+         }
+ 
+        Double a =    Double.parseDouble(env_temp)/100-Double.parseDouble(df.format(ln(Integer.parseInt(split[2]))));
+Index: cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/SendPackageService.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/SendPackageService.java	(revision ad2aa865790715476d6de77dca02190fce53450a)
++++ cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/SendPackageService.java	(date 1646188688940)
+@@ -24,6 +24,8 @@
+  **/
+ @Component
+ public class SendPackageService {
++
++
+     @Autowired
+     private CollectorRegisterDao collectorRegisterDao;
+ 
+@@ -31,6 +33,7 @@
+     private HeartBeatRecordService heartBeatRecordService;
+ 
+ 
++
+     /**
+      * @Method      : _handleGetDeviceId
+      * @Description : 获取设备id
+Index: cloud-platform-acquisition/src/main/java/com/huimv/acquisition/HuimvSmartEartagDataAcquisitionApplication.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- cloud-platform-acquisition/src/main/java/com/huimv/acquisition/HuimvSmartEartagDataAcquisitionApplication.java	(revision ad2aa865790715476d6de77dca02190fce53450a)
++++ cloud-platform-acquisition/src/main/java/com/huimv/acquisition/HuimvSmartEartagDataAcquisitionApplication.java	(date 1646188688929)
+@@ -17,7 +17,7 @@
+ //这是新项目深度优化版本，可以深度修改，改完了记得上传
+ //只充当存储数据的服务是没有任何问题的----已经复原之前的功能仅仅
+ @EnableScheduling
+-//排除掉 security
++//排除掉 security--不然接口会一直报错
+ @SpringBootApplication(exclude = {org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class})
+ public class HuimvSmartEartagDataAcquisitionApplication {
+     public static void main(String[] args) throws InterruptedException {
+Index: cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/EartagDataController.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/EartagDataController.java	(revision ad2aa865790715476d6de77dca02190fce53450a)
++++ cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/EartagDataController.java	(date 1646098189828)
+@@ -88,7 +88,7 @@
+ 
+ 
+     /**
+-     * 列表  耳标个体数据----电大展示专用
++     * 列表  耳标个体数据----杭电展示专用--耳标写死了的
+      */
+     @RequestMapping("/listEartagDeatils")
+     public R listEartagDeatils( @RequestBody EartagParamVo eartagParamVo) throws ParseException {
+Index: cloud-platform-acquisition/src/main/resources/application-dev.yml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- cloud-platform-acquisition/src/main/resources/application-dev.yml	(revision ad2aa865790715476d6de77dca02190fce53450a)
++++ cloud-platform-acquisition/src/main/resources/application-dev.yml	(date 1646187762065)
+@@ -2,7 +2,7 @@
+   port: 9502
+ spring:
+   datasource:
+-    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-show?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
++    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-cloud-test1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+     username: root
+     password: hm123456
+     driver-class-name: com.mysql.cj.jdbc.Driver
+Index: cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagDataServiceImpl.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagDataServiceImpl.java	(revision ad2aa865790715476d6de77dca02190fce53450a)
++++ cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagDataServiceImpl.java	(date 1646113777807)
+@@ -42,14 +42,14 @@
+     @Autowired
+     private BasePigpenDao basePigpenDao;
+ 
+-
+     @Autowired
+     private CollectorRegisterDao collectorRegisterDao ;
+ 
+-
+     @Autowired
+     private MovePigpenDao movePigpenDao;
+ 
++
++    //这个接口写的太辣鸡了
+     @Override
+     public PageUtils findByConditions(Map<String, Object> params) throws ParseException {
+ 
+@@ -151,8 +151,6 @@
+     }
+ 
+ 
+-
+-
+     @Override
+     public PageUtils queryPage(Map<String, Object> params) {
+         IPage<EartagDataEntity> page = this.page(
+@@ -162,21 +160,20 @@
+         return new PageUtils(page);
+     }
+ 
+-    //迁移接口
+-    //耳标详细数据
++
++    //杭电展示专用接口--耳标号目前写死  部署在35服务器 数据库为  huimv—eartag-show
+     @Override
+     public   Map  queryEartagDeatils(EartagParamVo eartagParamVo) throws ParseException {
+         String  eartagNo1 ="133083123620938";
+         String  eartagNo2 ="133083123623215";
+ 
+-
+         LambdaQueryWrapper<EartagDataEntity> wrapper1 = Wrappers.lambdaQuery();
+         wrapper1.eq(EartagDataEntity::getEartagNo, eartagNo1).orderByDesc(EartagDataEntity::getId);
+         if(eartagParamVo.getStarTime()!=null){
+             //传了时间按照时间
+             wrapper1.between(EartagDataEntity::getTime, eartagParamVo.getStarTime(), eartagParamVo.getEndTime());
+         }else {
+-            //没有时间返回最近的1000条
++            //没有时间返回最近的500条
+             wrapper1.last( "limit 50");
+         }
+         System.out.println("耳标号="+eartagParamVo.getEartagNo());
+@@ -193,10 +190,7 @@
+             wrapper2.last( "limit 50");
+         }
+         List<EartagDataEntity> eartagDataEntities2 = eartagDataDao.selectList(wrapper2);
+-        
+-        
+-        
+-        
++
+         Map resultMap  = new HashMap();
+         
+         List<String> timeList = new ArrayList<>();
+Index: cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/eartagsocket/EartagServer2.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/eartagsocket/EartagServer2.java	(revision ad2aa865790715476d6de77dca02190fce53450a)
++++ cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/eartagsocket/EartagServer2.java	(date 1646188179540)
+@@ -25,9 +25,10 @@
+ public class EartagServer2 {
+     @Autowired
+     private EartagServerHandler2 serverHandler;
+-    //外面的版本    金华的端口     10024    10025  部署在31 服务器上面好了
++    //外面的版本    金华的端口     10024    10025  部署在31 服务器上面好了    10023是test1平台的
+     //创建构造方法
+-    private int port = 10025;
++
++    private int port = 10023;
+     public EartagServer2(){
+     }
+ 
+Index: cloud-platform-acquisition/pom.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- cloud-platform-acquisition/pom.xml	(revision ad2aa865790715476d6de77dca02190fce53450a)
++++ cloud-platform-acquisition/pom.xml	(date 1646122330753)
+@@ -146,5 +146,4 @@
+ 
+ 
+ 
+-
+ </project>
+\ No newline at end of file
+Index: cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/eartagsocket/EartagServerHandler2.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/eartagsocket/EartagServerHandler2.java	(revision ad2aa865790715476d6de77dca02190fce53450a)
++++ cloud-platform-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/eartagsocket/EartagServerHandler2.java	(date 1646116041508)
+@@ -46,10 +46,8 @@
+     public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+         ByteBuf data = (ByteBuf) msg;
+         String clientAsk = data.toString(CharsetUtil.UTF_8);
+-      
+ 
+ 
+-
+         /* 处理客户端请求数据 */
+         String answer = iClientDataPacketService.handleClientSendPacket(clientAsk);
+         if (answer != null) {