修复eartag的DAO

huimv-smart-management/src/main/java/com/huimv/management/HuimvSmartManagementApplication.java

@@ -30,4 +30,10 @@ public class HuimvSmartManagementApplication {
 
 
 
+
+
+
+
+
+
 }

huimv-smart-management/src/main/java/com/huimv/management/controller/EartagDataController.java

@@ -1,7 +1,9 @@
  package com.huimv.management.controller;
 
+import java.text.ParseException;
 import java.util.*;
 
+import com.huimv.management.dao.EartagDataDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,46 +27,57 @@ import static java.lang.Thread.sleep;
  * @date 2021-06-21 10:00:18
  */
 @RestController
-@RequestMapping("management/eartagdate")
-public class EartagDataController {
+@RequestMapping("management/eartagdata")
+public class EartagDateController {
     @Autowired
-    private EartagDataService eartagDataService;
+    private EartagDataService eartagDateService;
+
+     @Autowired
+     private EartagDataDao eartagDataDao  ;
+
+
 
     /**
      * 列表
      */
     @RequestMapping("/list")
     public R list(@RequestParam Map<String, Object> params) throws InterruptedException {
-        PageUtils page = eartagDataService.queryPage(params);
+        PageUtils page = eartagDateService.queryPage(params);
         return R.ok().put("page", page);
     }
 
 
-     @RequestMapping("/searchDateByCondition")
-     public R listby(@RequestParam Map<String, Object> params) throws InterruptedException {
-         Map ResultMap = eartagDataService.queryPageBytimeAndEartag(params);
-         return R.ok().put("page", ResultMap);
+    //睡眠时间处理。这里做简单一点的处理，代码都放在这里了
+     @RequestMapping("/sleeptime")
+     public R list1(@RequestParam Map<String, Object> params) throws InterruptedException, ParseException {
+         List<Map<String,String>> list = eartagDateService.querySleepTimeBytimeAndEartag(params);
+         return R.ok().put("data", list);
      }
 
 
 
+     @RequestMapping("/searchDateByCondition")
+     public R listby(@RequestParam Map<String, Object> params) throws InterruptedException, ParseException {
+         Map ResultMap = eartagDateService.queryPageBytimeAndEartag(params);
+         return R.ok().put("page", ResultMap);
+     }
 
      /**
      * 信息
      */
     @RequestMapping("/info/{id}")
     public R info(@PathVariable("id") Integer id){
-		EartagDataEntity eartagData = eartagDataService.getById(id);
+		EartagDataEntity eartagDate = eartagDateService.getById(id);
 
-        return R.ok().put("eartagData", eartagData);
+        return R.ok().put("eartagDate", eartagDate);
     }
 
     /**
      * 保存
      */
     @RequestMapping("/save")
-    public R save(@RequestBody EartagDataEntity eartagData){
-		eartagDataService.save(eartagData);
+    public R save(@RequestBody EartagDataEntity eartagDate){
+		eartagDateService.save(eartagDate);
 
         return R.ok();
     }
@@ -73,8 +86,8 @@ public class EartagDataController {
      * 修改
      */
     @RequestMapping("/update")
-    public R update(@RequestBody EartagDataEntity eartagData){
-		eartagDataService.updateById(eartagData);
+    public R update(@RequestBody EartagDataEntity eartagDate){
+		eartagDateService.updateById(eartagDate);
 
         return R.ok();
     }
@@ -84,7 +97,7 @@ public class EartagDataController {
      */
     @RequestMapping("/delete")
     public R delete(@RequestBody Integer[] ids){
-		eartagDataService.removeByIds(Arrays.asList(ids));
+		eartagDateService.removeByIds(Arrays.asList(ids));
 
         return R.ok();
     }
@@ -93,7 +106,7 @@ public class EartagDataController {
      @RequestMapping("/getTemperatureCurve")
      public R getTemperatureCurve(@RequestParam Map<String, Object> params){
 
-         return R.ok().put("data", eartagDataService.getTemperatureCurve(params));
+         return R.ok().put("data", eartagDateService.getTemperatureCurve(params));
      }
 
 }

huimv-smart-management/src/main/java/com/huimv/management/dao/EartagDataDao.java

@@ -12,6 +12,8 @@ import org.springframework.stereotype.Repository;
  * @email yinhao@163.com
  * @date 2021-06-21 10:00:18
  */
+
+
 @Mapper
 @Repository
 public interface EartagDataDao extends BaseMapper<EartagDataEntity> {

huimv-smart-management/src/main/java/com/huimv/management/service/impl/EartagDataServiceImpl.java

@@ -52,12 +52,15 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         String endtime = (String) params.get("endTime");
         DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map<String,List> map1 = new HashMap();
-
         //格式化传入的时间
             Date  startTime = fmt.parse(starttime);
             Date   endTime = fmt.parse(endtime);
 
 
+        System.out.println("yangdi"+starttime+endtime);
+
+
+
           LambdaQueryWrapper<EartagDataEntity> lambdaQuery = Wrappers.lambdaQuery();
           lambdaQuery.eq(EartagDataEntity::getEartagId,eartag);
            //过滤时间

huimv-smart-management/src/main/java/com/huimv/management/socket/eartagrecive/service/impl/ReceivePackageSerivce.java

@@ -78,8 +78,6 @@ public class ReceivePackageSerivce {
         String ntc = clientMessageArray[9];
         //当前运动量
         String ydl = clientMessageArray[10];
-
-
         //数据库CMD字段没什么用，用来放环境温度了
         //计算区间运动量 --查找区间运动量
         //由于机器矫正时间或发生时间翻转问题，造成负运动量，因此直接清洗掉这些数据
@@ -133,7 +131,8 @@ public class ReceivePackageSerivce {
         //需要除以五秒钟作为时间间隔
         System.out.println("有多少个五秒" + second);
        //String cqs = clientMessageArray[11];
-        String rssi = clientMessageArray[12];
+        String rssi = clientMessageArray[12];//信号强度
+
         String timestamp = clientMessageArray[13];
         String checkNumber = clientMessageArray[14];
         //String commandTail = clientMessageArray[15];

huimv-smart-management/src/main/java/com/huimv/management/socket/eartagrecive/service/impl/SendPackageService.java

@@ -34,7 +34,7 @@ public class SendPackageService {
         // 查询机器id  没有查询了，取消
        // String jqid = jqidService.findDeviceIdByJQcode(serialNo);
 
-        return "hm+1+0+158+123+8+end";
+        return "hm+1+0+250+520+8+end";
     }
 
     /**

huimv-smart-management/src/main/resources/mapper/management/EartagDataDao.xml

@@ -24,10 +24,11 @@
         <result property="checkNumber" column="check_number"/>
         <result property="messageEnd" column="message_end"/>
         <result property="farmName" column="farm_name"/>
-        <result property="backFirst" column="back_first"/>
-        <result property="backSecong" column="back_secong"/>
-        <result property="backThird" column="back_third"/>
+        <result property="sleepStatus" column="sleep_status"/>
         <result property="remark" column="remark"/>
+        <result property="sleepBegin" column="sleep_begin"/>
+        <result property="sleepEnd" column="sleep_end"/>
+        <result property="sleepGap" column="sleep_gap"/>
     </resultMap>