yang 3 лет назад
Родитель
Сommit
1f5b8772cd

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

@@ -43,6 +43,19 @@ public class EartagDataController {
 
     }
 
+    /**
+     * 列表  耳标个体数据
+     */
+    @RequestMapping("/listEartagDeatils")
+    public R listEartagDeatils( @RequestBody  EartagParamVo eartagParamVo) throws ParseException {
+
+        PageUtils page = eartagDataService.queryEartagDeatils(eartagParamVo);
+
+        System.out.println(eartagParamVo.toString());
+
+        return R.ok().put("page", page);
+
+    }
 
 
 

+ 1 - 1
huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/entity/vo/EartagParamVo.java

@@ -17,7 +17,7 @@ public class EartagParamVo {
     /**
      * 当前页
      */
-    private String curPage;
+    private String page;
 
 
     /**

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

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

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

@@ -59,18 +59,47 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
 
     @Override
     public PageUtils queryPageIndex(EartagParamVo eartagParamVo) throws ParseException {
+        long l = System.currentTimeMillis();
+
         //分页需要Map类型   可以封装一下  现在不封装
         Map<String , Object>  pageMap  = new HashMap<>();
-        pageMap.put("curPage",eartagParamVo.getCurPage());
+        pageMap.put("page",eartagParamVo.getPage());
         pageMap.put("limit",eartagParamVo.getLimit());
-        
+
         IPage<EartagDataVo>   page = baseMapper.pageIndex(new Query<EartagDataVo>().getPage(pageMap) ,eartagParamVo);
+
+        System.out.println( "shijian=" + (System.currentTimeMillis()-l));
         return new PageUtils(page);
     }
-    
 
 
-    
+
+
+
+
+
+    //耳标详细数据
+    @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());
+
+        IPage<EartagDataVo>   page = baseMapper.pageIndex(new Query<EartagDataVo>().getPage(pageMap) ,eartagParamVo);
+
+        System.out.println(System.currentTimeMillis()-l);
+
+        return new PageUtils(page);
+
+    }
+
+
 
 
 

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

@@ -26,14 +26,12 @@
     </resultMap>
 
 
-
+   <!--第一次试水通过 然后就是优化SQL了   晚上回去学一学-->
     <select id="page" resultType="com.huimv.acquisition.entity.EartagDataEntity">
         SELECT * FROM eartag_data ed1 JOIN (SELECT MAX(id) id FROM eartag_data ed2 ${ew.customSqlSegment}) b ON ed1.id = b.id
     </select>
 
 
-
-
     <!--耳标的最搞温最低温  环境的最高温最低温放在这里没有意义-->
 
     <!-- 可根据自己的需求,是否要使用 -->