add getAoidDailyYieldInfoPage

src/main/java/com/gct/aoid/controller/AoidDailyYieldController.java

@@ -1,6 +1,7 @@
 package com.gct.aoid.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gct.aoid.entity.Vo.AoidYeildVo;
 import com.gct.aoid.service.AoidDailyYieldService;
 import com.gct.common.core.result.Result;
@@ -38,5 +39,12 @@ public class AoidDailyYieldController {
         List<Map<String, Object>> list =   aoidDailyYieldService.getAoidDailyYieldInfoByWellIdAndPorDatePeriod(aoidYeildVo.getWellId(), aoidYeildVo.getStartDate());
         return list==null||list.size()==0?Result.error("未找到"):Result.ok(list);
     }
+
+    @ApiOperation(value = "根据井号和日期时间段查询量液的每日基本信息page" ,notes = "根据井号和日期时间段查询量液的每日基本信息")
+    @PostMapping("/getAoidDailyYieldInfoPage")
+    public Result getAoidDailyYieldInfoByWellIdAndPorDatePeriodPage(@RequestBody AoidYeildVo aoidYeildVo){
+        Page<Map<String, Object>> page =   aoidDailyYieldService.getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(aoidYeildVo.getWellId(), aoidYeildVo.getStartDate(),aoidYeildVo.getSize(),aoidYeildVo.getPage());
+        return page ==null|| page.getRecords().size()==0?Result.error("未找到"):Result.ok(page);
+    }
 }
 

src/main/java/com/gct/aoid/service/AoidDailyYieldService.java

@@ -1,5 +1,6 @@
 package com.gct.aoid.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gct.aoid.entity.AoidDailyYield;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gct.common.core.result.Result;
@@ -29,4 +30,8 @@ public interface AoidDailyYieldService extends IService<AoidDailyYield> {
 
 
     List<Map<String, Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriod(String wellId, String startDate);
-}
+
+
+    Page<Map<String,Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(String wellId, String startDate, int pageSize, int pageNum);
+
+    }

src/main/java/com/gct/aoid/service/impl/AoidDailyYieldServiceImpl.java

@@ -3,6 +3,7 @@ package com.gct.aoid.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gct.aoid.entity.AoidDailyYield;
 import com.gct.aoid.feignclient.BaseDataClient;
 import com.gct.aoid.mapper.AoidDailyYieldMapper;
@@ -70,8 +71,28 @@ public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper,
         for (Map<String, Object> map : maps) {
             String date = map.get("prod_date").toString().substring(0, 10);
             String time = map.get("prod_date").toString().substring(11, 19);
-            map.put("prod_date",date+" "+time);
+//            map.put("prod_date",date+" "+time);
+            map.put("prod_date",date);
         }
         return maps;
     }
+    public Page<Map<String,Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(String wellId, String startDate,int pageSize,int pageNum){
+        startDate = startDate+" 00:00:00";
+        LocalDateTime localDateTime = LocalDateTime.parse(startDate, df);
+        LocalDateTime localDateTime1 = localDateTime.plusDays(1);
+        String end = localDateTime1.format(df);
+        QueryWrapper<AoidDailyYield> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<AoidDailyYield> queryWrapper = wrapper.lambda().eq(AoidDailyYield::getWellId, wellId).
+                ge(AoidDailyYield::getProdDate, Timestamp.valueOf(LocalDateTime.parse(startDate,df))).
+                le(AoidDailyYield::getProdDate,Timestamp.valueOf(LocalDateTime.parse(end,df))).orderByAsc(AoidDailyYield::getProdDate);
+        Page<Map<String,Object>> paramPage = new Page<>(pageNum,pageSize);
+        Page<Map<String, Object>> mapPage = aoidDailyYieldMapper.selectMapsPage(paramPage, queryWrapper);
+        for (Map<String, Object> map : mapPage.getRecords()) {
+            String date = map.get("prod_date").toString().substring(0, 10);
+            String time = map.get("prod_date").toString().substring(11, 19);
+//            map.put("prod_date",date+" "+time);
+            map.put("prod_date",date);
+        }
+        return mapPage;
+    }
 }