一厂功图量液汇总数据按照量液值大小返回

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

@@ -4,9 +4,9 @@ package com.gct.aoid.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gct.aoid.entity.AoidDailyYield;
-import com.gct.aoid.entity.Vo.LiqWarringVo;
 import com.gct.aoid.entity.Vo.AoidYeildVo;
 import com.gct.aoid.entity.Vo.CalRemakeVo;
+import com.gct.aoid.entity.Vo.LiqWarringVo;
 import com.gct.aoid.feignclient.BaseDataClient;
 import com.gct.aoid.job.TimingSummaryJob;
 import com.gct.aoid.service.AoidDailyYieldService;
@@ -23,9 +23,9 @@ import org.springframework.web.bind.annotation.*;
 import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -88,8 +88,8 @@ public class AoidDailyYieldController {
     @ApiOperation(value="get default data from aoid_daily_yield,may be return null")
     @PostMapping("/getDefaultDataNew")
     public Result getDefaultDataNew(@RequestBody String wellIdSet){
-        AoidDailyYield defaultData = aoidDailyYieldService.getDefaultDataNew(wellIdSet);
-        return defaultData ==null?Result.error("Can not find available data for default view."):Result.ok(defaultData);
+        List<AoidDailyYield> defaultData = aoidDailyYieldService.getDefaultDataNew(wellIdSet);
+        return defaultData.isEmpty()?Result.error("Can not find available data for default view."):Result.ok(defaultData);
     }
 
     @ApiOperation(value="get default data from aoid_daily_yield,may be return null")

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

@@ -3,16 +3,15 @@ package com.gct.aoid.service;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gct.aoid.entity.AoidDailyYield;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gct.aoid.entity.Vo.LiqWarringVo;
+import com.gct.aoid.entity.AoidDailyYield;
 import com.gct.aoid.entity.Vo.AoidYeildVo;
+import com.gct.aoid.entity.Vo.LiqWarringVo;
 import com.gct.common.core.result.Result;
 
 import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
 import java.time.LocalDateTime;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -48,7 +47,7 @@ public interface AoidDailyYieldService extends IService<AoidDailyYield> {
 
     AoidDailyYield getDefaultData();
 
-    AoidDailyYield getDefaultDataNew(String orgId);
+ List<AoidDailyYield> getDefaultDataNew(String orgId);
 
     Page<AoidDailyYield> getAoidDailyYieldInfoPage(AoidYeildVo aoidYeildVo);
 

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

@@ -406,26 +406,31 @@ public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper,
     }
 
     @Override
-    public AoidDailyYield   getDefaultDataNew(String wellId) {
+    public List<AoidDailyYield>   getDefaultDataNew(String wellId) {
         Map map = JSONObject.parseObject(wellId, HashMap.class);
-        List list = JSONObject.parseObject(map.get("wellIdSet").toString(), List.class);
+        List<String> wellIds = JSONObject.parseObject(map.get("wellIdSet").toString(), List.class);
+        AoidDailyYield one = aoidDailyYieldMapper.selectOne(new QueryWrapper<AoidDailyYield>()
+                .select("max(prod_date) prod_date"));
         QueryWrapper<AoidDailyYield> wrapper = new QueryWrapper<AoidDailyYield>()
-                .in("well_id",list)
-                .isNotNull("liq_prod_daily")
-                .gt("liq_prod_daily",0)
-                .orderByDesc("prod_date").last("limit 1");
-        AoidDailyYield aoidDailyYield = aoidDailyYieldMapper.selectOne(wrapper);
-        String orgByWellId = baseDataClient.getOrgInfoByWellID(aoidDailyYield.getWellId());
-        Result result = JSONObject.parseObject(orgByWellId, Result.class);
-        HashMap hashMap = JSONObject.parseObject(result.getData().toString(), HashMap.class);
-        if (Objects.isNull(aoidDailyYield)) return aoidDailyYield;
-        if (orgByWellId!="") {
-            aoidDailyYield.setZyq(hashMap.get("gfat").toString());
-            aoidDailyYield.setJq(hashMap.get("fat").toString());
-            aoidDailyYield.setZd(hashMap.get("orgid").toString());
+                .in("well_id",wellIds).eq("prod_date",one.getProdDate());
+        List<AoidDailyYield> list = aoidDailyYieldMapper.selectList(wrapper);
+        List<AoidDailyYield> collect = list.stream().filter(x -> Objects.isNull(x.getLiqProdDaily())).collect(toList());
+        List<AoidDailyYield> temp = list.stream().filter(x -> !collect.contains(x)).collect(toList());
+        temp = temp.stream().sorted(Comparator.comparingDouble(AoidDailyYield::getLiqProdDaily).reversed()).collect(toList());
+        temp.addAll(collect);
+        String wellInfoByWellId = baseDataClient.getWellInfoByList(wellIds);
+        List list1 = JSONObject.parseObject(JSONObject.parseObject(wellInfoByWellId, Result.class).getData().toString(), ArrayList.class);
+        for (Object o : list1) {
+            for (AoidDailyYield dailyYield : temp) {
+                if (((JSONObject) o).get("wellId").equals(dailyYield.getWellId())) {
+                    String[] stationIds = ((JSONObject) o).getString("stationId").split("@");
+                    dailyYield.setZyq(stationIds[0]);
+                    dailyYield.setJq(stationIds[1]);
+                    dailyYield.setZd(stationIds[2]);
+                }
+            }
         }
-        return aoidDailyYield;
-
+        return temp;
     }
 
     @Override