接受数据增加了杭电展示的接口

cloud-platform-acquisition/pom.xml

@@ -125,6 +125,10 @@
             <version>2.6</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
 
 
     </dependencies>

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

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

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

@@ -1,6 +1,7 @@
 package com.huimv.acquisition.controller;
 
 import com.huimv.acquisition.entity.EartagDataEntity;
+import com.huimv.acquisition.entity.vo.EartagParamVo;
 import com.huimv.acquisition.mapper.EartagDataDao;
 import com.huimv.acquisition.result.R;
 import com.huimv.acquisition.service.EartagDataService;
@@ -18,7 +19,7 @@ import java.util.Map;
  * @date 2021-07-24 16:29:33
  */
 @RestController
-@RequestMapping("manager/eartagdata")
+@RequestMapping("/eartagdata")
 @CrossOrigin
 public class EartagDataController {
     @Autowired
@@ -44,6 +45,16 @@ public class EartagDataController {
 
 
 
+    /**
+     * 首页的数据
+     */
+    @GetMapping("/sout")
+    public R sout(@RequestParam Map<String, Object> params) {
+        System.out.println("test");
+        return R.ok().put("page", "121");
+    }
+
+
 
 
 
@@ -74,6 +85,24 @@ public class EartagDataController {
         return R.ok().put("page", queryDetailsMap);
     }
 
+
+
+    /**
+     * 列表  耳标个体数据----电大展示专用
+     */
+    @RequestMapping("/listEartagDeatils")
+    public R listEartagDeatils( @RequestBody EartagParamVo eartagParamVo) throws ParseException {
+        System.out.println(eartagParamVo.toString());
+        System.out.println("ceshi");
+        Map  map = eartagDataService.queryEartagDeatils(eartagParamVo);
+        System.out.println(eartagParamVo.toString());
+        return R.ok().put("data", map);
+    }
+
+
+
+    
+
     @RequestMapping("/list_deatils_byeartagno")
     public R listDeatils01(@RequestParam Map<String, Object> params) throws ParseException {
         Map queryDetailsMap = eartagDataService.queryDetailsByEarTag(params);

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

@@ -0,0 +1,122 @@
+package com.huimv.acquisition.entity.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+
+/**
+ * 耳标相关的所有的参数提交用这个来接收
+ */
+@Data
+public class EartagParamVo {
+
+    /**
+     * 当前页
+     */
+    private String page;
+
+
+    /**
+     * 页数大小
+     */
+    private String limit;
+    
+
+    /**
+     * 传入时间（注册时间）
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sendTime;
+
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date starTime;
+
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+
+    /**
+     * 阶段
+     */
+    private Integer stage;
+
+    /**
+     * 耳标高温
+     */
+    private String eartagHighTemp;
+
+
+    /**
+     * 耳标低高温
+     */
+    private String eartagLowTemp;
+
+
+    /**
+     * 耳标编号
+     */
+    private String eartagNo;
+
+
+    /**
+     * 栋舍编号
+     */
+    private String penNo;
+
+
+    /**
+     * 单元编号
+     */
+    private String unitNo;
+
+
+    /**
+     * 环境温度高值
+     */
+    private String envHighTemp;
+
+
+    /**
+     * 环境温度低值
+     */
+    private String envLowTemp;
+
+    /**
+     * 电池电量
+     */
+    private Integer bat;
+
+    /**
+     * 信号强度
+     */
+    private Integer rssi;
+
+
+    /**
+     * 耳标的温度异常情况 为  0   的时候就是异常
+     */
+    private Integer earTempStatus;
+
+
+}

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

@@ -2,6 +2,7 @@ package com.huimv.acquisition.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.acquisition.entity.EartagDataEntity;
+import com.huimv.acquisition.entity.vo.EartagParamVo;
 import com.huimv.acquisition.utils.PageUtils;
 
 import java.text.ParseException;
@@ -22,7 +23,8 @@ public interface EartagDataService extends IService<EartagDataEntity> {
     PageUtils findByConditions(Map<String, Object> params) throws ParseException;
 
 
-
+     //这个是为了 杭电展示优化的版本  耳标号已经写死了
+    Map queryEartagDeatils(EartagParamVo eartagParamVo) throws ParseException;
 
     Map<String, Object> queryDetails(Map<String, Object> params) throws ParseException;
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.acquisition.entity.*;
+import com.huimv.acquisition.entity.vo.EartagParamVo;
 import com.huimv.acquisition.mapper.BasePigpenDao;
 import com.huimv.acquisition.mapper.CollectorRegisterDao;
 import com.huimv.acquisition.mapper.EartagDataDao;
@@ -150,6 +151,8 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
     }
 
 
+
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<EartagDataEntity> page = this.page(
@@ -159,9 +162,121 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         return new PageUtils(page);
     }
 
+    //迁移接口
+    //耳标详细数据
+    @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条
+            wrapper1.last( "limit 50");
+        }
+        System.out.println("耳标号="+eartagParamVo.getEartagNo());
+        List<EartagDataEntity> eartagDataEntities1 = eartagDataDao.selectList(wrapper1);
+
+
+        LambdaQueryWrapper<EartagDataEntity> wrapper2 = Wrappers.lambdaQuery();
+        wrapper2.eq(EartagDataEntity::getEartagNo,eartagNo2).orderByDesc(EartagDataEntity::getId);
+        if(eartagParamVo.getStarTime()!=null){
+            //传了时间按照时间
+            wrapper2.between(EartagDataEntity::getTime, eartagParamVo.getStarTime(), eartagParamVo.getEndTime());
+        }else {
+            //没有时间返回最近的1000条
+            wrapper2.last( "limit 50");
+        }
+        List<EartagDataEntity> eartagDataEntities2 = eartagDataDao.selectList(wrapper2);
+        
+        
+        
+        
+        Map resultMap  = new HashMap();
+        
+        List<String> timeList = new ArrayList<>();
+        List<Double> earTempList = new ArrayList<>();
+        List<Integer> sportsList = new ArrayList<>();
+        List<Integer> electricList = new ArrayList<>();
+        List<Double> environmentTempList = new ArrayList<>();
+        List<Object> averangeTemp = new ArrayList<>();
+        List<Integer> exerciseList = new ArrayList<>();
+        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        
+
+        for (EartagDataEntity eartagDataEntity : eartagDataEntities1) {
+            timeList.add( fmt.format(eartagDataEntity.getTime() ));
+            earTempList.add( eartagDataEntity.getEarTemp()  );
+            electricList.add(eartagDataEntity.getBat());
+            environmentTempList.add(eartagDataEntity.getEnvTemp());
+            sportsList.add(eartagDataEntity.getSportGap());
+            exerciseList.add(eartagDataEntity.getExercise());
+        }
+
+
+        List<Double> earTempList2 = new ArrayList<>();
+        List<Integer> sportsList2 = new ArrayList<>();
+        List<Integer> electricList2 = new ArrayList<>();
+        List<Double> environmentTempList2 = new ArrayList<>();
+        List<Object> averangeTemp2 = new ArrayList<>();
+        List<Integer> exerciseList2 = new ArrayList<>();
+
+        
+        
+        
+        for (EartagDataEntity eartagDataEntity : eartagDataEntities2) {
+            earTempList2.add( eartagDataEntity.getEarTemp()  );
+            electricList2.add(eartagDataEntity.getBat());
+            environmentTempList2.add(eartagDataEntity.getEnvTemp());
+            sportsList2.add(eartagDataEntity.getSportGap());
+            exerciseList2.add(eartagDataEntity.getExercise());
+        }
+
+      
+        Collections.reverse(earTempList2);
+        Collections.reverse(electricList2);
+        Collections.reverse(environmentTempList2);
+        Collections.reverse(sportsList2);
+        Collections.reverse(exerciseList2);
+
+
+        Collections.reverse(timeList);
+        Collections.reverse(earTempList);
+        Collections.reverse(electricList);
+        Collections.reverse(environmentTempList);
+        Collections.reverse(sportsList);
+        Collections.reverse(exerciseList);
+
+        resultMap.put("timeList1",timeList);
+        resultMap.put("earTempList1",earTempList);
+        resultMap.put("electricList1",electricList);
+        resultMap.put("environmentTempList1",environmentTempList);
+        resultMap.put("sportsList1",sportsList);
+        resultMap.put("exerciseList1",exerciseList);
+        
+
+        resultMap.put("earTempList2",earTempList2);
+        resultMap.put("electricList2",electricList2);
+        resultMap.put("environmentTempList2",environmentTempList2);
+        resultMap.put("sportsList2",sportsList2);
+        resultMap.put("exerciseList2",exerciseList2);
+        
+        return resultMap;
+
+    }
+
+
 
 
-       //想办法把平均温度计算到表里面去
+
+
+    //想办法把平均温度计算到表里面去
     @Override
     public Map<String, Object> queryDetails(Map<String, Object> params) throws ParseException {
         System.out.println("id = "+params.get("id"));

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
+    //外面的版本    金华的端口     10024    10025  部署在31 服务器上面好了
     //创建构造方法
-    private int port = 10024;
+    private int port = 10025;
     public EartagServer2(){
     }
 
@@ -61,7 +61,7 @@ public class EartagServer2 {
                             socketChannel.pipeline().addLast(serverHandler);
                         }
                     });
-            System.out.println("Echo 服务器启动ing");
+            System.out.println("Echo 服务器启动ing--监听端口"+port);
             //绑定端口，同步等待成功
             ChannelFuture cf = serverBootstrap.bind(port).sync();
             System.out.println("ok");

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

@@ -156,8 +156,7 @@ public class ReceivePackageSerivce {
             findeartagRegisterEntity.setEarTempStatus(1);
             eartagRegisterService.updateById(findeartagRegisterEntity);
         }
-
-
+        
         
          //已经登记了但是没有第一条
         if (lastEarTagDate==null){

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-cloud-pro1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-show?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-core/src/main/java/com/huimv/core/consts/SpringSecurityConstant.java

@@ -56,6 +56,7 @@ public interface SpringSecurityConstant {
             "/logout",
             "/oauth/**",
             "/test/testUpdate",
+            "/eartagdata/**",
 
             //文件的
             "/sysFileInfo/upload",

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

@@ -72,7 +72,6 @@ public class EartagDataController {
 
 
 
-
     //按照条件查询耳标数据接口，之前很慢，现在改进
     @Permission
     @PostMapping("/manager/eartagdata/findByConditionsNew")
@@ -83,17 +82,6 @@ public class EartagDataController {
         System.out.println("进入查询");
         return   new SuccessResponseData(byConditions);
     }
-/*
-
-    @PostMapping("/manager/eartagdata/findByConditions2")
-    //@BusinessLog(title = "栋舍表_删除", opType = LogAnnotionOpTypeEnum.DELETE)
-    public ResponseData findByConditions2(@RequestParam Map<String, Object> params  ) throws ParseException {
-        System.out.println("进入查询111");
-        PageResult<EartagData> byConditions = eartagDataService.findByConditions2(params);
-        System.out.println("进入查询");
-        return   new SuccessResponseData(byConditions);
-    }
-*/
 
 
 

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

@@ -485,6 +485,10 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataMapper, EartagD
 
 
 
+    
+    
+    
+    
 
 
 /*