huimv-cloud-eartag-ruian/添加了一个测试类.patch

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) {