耳标数据详情

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/controller/EartagDataController.java

@@ -49,12 +49,11 @@ public class EartagDataController {
     @RequestMapping("/listEartagDeatils")
     public R listEartagDeatils( @RequestBody  EartagParamVo eartagParamVo) throws ParseException {
 
-        PageUtils page = eartagDataService.queryEartagDeatils(eartagParamVo);
+        Map  map = eartagDataService.queryEartagDeatils(eartagParamVo);
 
         System.out.println(eartagParamVo.toString());
 
-        return R.ok().put("page", page);
-
+        return R.ok().put("data", map);
     }
 
 

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/service/EartagDataService.java

@@ -23,8 +23,17 @@ public interface EartagDataService extends IService<EartagDataEntity> {
 
     PageUtils queryPageIndex(EartagParamVo eartagParamVo) throws ParseException;
 
-    PageUtils queryEartagDeatils(EartagParamVo eartagParamVo) throws ParseException;
-
+    
+    
+    
+      Map queryEartagDeatils(EartagParamVo eartagParamVo) throws ParseException;
+
+    
+    
+    
+    
+    
+    
     PageUtils findByConditions(Map<String, Object> params) throws ParseException;
 
 

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/service/impl/EartagDataServiceImpl.java

@@ -15,6 +15,7 @@ import com.huimv.acquisition.mapper.EartagDataDao;
 import com.huimv.acquisition.mapper.MovePigpenDao;
 import com.huimv.acquisition.service.EartagDataService;
 import com.huimv.acquisition.socket.eartagrecive.util.DateUtilsPublic;
+import com.huimv.acquisition.socket.eartagrecive.util.Result;
 import com.huimv.acquisition.socket.eartagrecive.util.StringUtilsWork;
 import com.huimv.acquisition.utils.PageUtils;
 import com.huimv.acquisition.utils.Query;
@@ -74,28 +75,44 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
 
 
 
-
-
-
-
     //耳标详细数据
     @Override
-    public PageUtils queryEartagDeatils(EartagParamVo eartagParamVo) throws ParseException {
-
-
-        //返回时间list   //返回温度list   //返回环境温度list     //返回基站下面耳标平均温度list      平均温度放一放
-        //查出耳标时间list  同时获得温度的其他的list
-        long l = System.currentTimeMillis();
-        //分页需要Map类型   可以封装一下  现在不封装
-        Map<String , Object>  pageMap  = new HashMap<>();
-        pageMap.put("curPage",eartagParamVo.getPage());
-        pageMap.put("limit",eartagParamVo.getLimit());
+    public   Map  queryEartagDeatils(EartagParamVo eartagParamVo) throws ParseException {
+         //直接构建wapper
+         //时间还是要判断，如果没有时间直接倒序  有时间就按时间过滤
+        LambdaQueryWrapper<EartagDataEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(EartagDataEntity::getEartagNo, eartagParamVo.getEartagNo());
+        if(eartagParamVo.getStarTime()!=null){
+            //传了时间按照时间
+            wrapper.between(EartagDataEntity::getTime, eartagParamVo.getStarTime(), eartagParamVo.getEndTime());
+        }else {
+            //没有时间返回最近的1000条
+            wrapper.last( "limit 1000");
+        }
+        System.out.println("耳标号="+eartagParamVo.getEartagNo());
+        List<EartagDataEntity> eartagDataEntities = eartagDataDao.selectList(wrapper);
+        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<>();
+        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        IPage<EartagDataVo>   page = baseMapper.pageIndex(new Query<EartagDataVo>().getPage(pageMap) ,eartagParamVo);
+        for (EartagDataEntity eartagDataEntity : eartagDataEntities) {
+            timeList.add( fmt.format(eartagDataEntity.getTime() ));
+            earTempList.add( eartagDataEntity.getEarTemp()  );
+            electricList.add(eartagDataEntity.getExercise());
+            environmentTempList.add(eartagDataEntity.getEnvTemp());
 
-        System.out.println(System.currentTimeMillis()-l);
+        }
+        resultMap.put("timeList",timeList);
+        resultMap.put("earTempList",earTempList);
+        resultMap.put("electricList",electricList);
+        resultMap.put("environmentTempList",environmentTempList);
 
-        return new PageUtils(page);
+        return resultMap;
 
     }
 

huimv-goldpig/huimv-goldpig-anquisition/src/main/resources/application-dev.yml

@@ -51,5 +51,5 @@ mybatis-plus:
     cache-enabled: false
     call-setters-on-nulls: true
     jdbc-type-for-null: 'null'
-    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
-  #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl --打印日志--上面的是关闭打印
+   # log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

huimv-goldpig/huimv-goldpig-anquisition/src/main/resources/mapper/acquisition/EartagDataDao.xml

@@ -119,4 +119,37 @@
     </select>
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </mapper>