Skip to content

G
gf_back
Commit c67cd465 authored by ZWT's avatar ZWT
Browse files
Options

feat(吉林演示): 松原 

1.修改系统首页大屏总览接口,增加区分组织机构逻辑,完成接口冒烟测试;
2.修改系统首页获取井场列表接口,增加区分组织机构逻辑,完成接口冒烟测试;
3.修改系统首页井场功能下钻后提示报错问题,修改用电功率数据获取逻辑,修复报错问题;
4.修改输电线路分页列表查询接口,增加查询条件,在查询父线路列表时只查询10千伏线路,修改线上接口文档同时完成接口冒烟测试;
5.修改系统首页井场实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
6.修改系统首页用能分析接口,增加区分组织机构逻辑,完成接口冒烟测试;
7.修改系统首页井场用能分析(双坐标轴)接口,增加区分组织机构逻辑,完成接口冒烟测试;
8.修改系统首页累积用电接口,增加区分组织机构逻辑,完成接口冒烟测试;
9.修改系统首页光伏实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
10.修改系统首页井场效果评价接口,增加区分组织机构逻辑,完成接口冒烟测试;
11.修改系统首页先导实验井间开制度接口,增加区分组织机构逻辑,完成接口冒烟测试;
12.修改极短期间开优化模块井口生产情况油井状态接口,增加区分组织机构逻辑,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent b5f3a3e1
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 563 deletions
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/WellheadDailyProductionSituationService.java
View file @ c67cd465
...@@ -9,8 +9,6 @@ import com.alibaba.fastjson2.JSONObject; ...@@ -9,8 +9,6 @@ import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.github.pagehelper.page.PageMethod; import com.github.pagehelper.page.PageMethod;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
import pps.core.auth.HttpRequestClient; import pps.core.auth.HttpRequestClient;
import pps.core.common.constant.BusinessConstant; import pps.core.common.constant.BusinessConstant;
import pps.core.prediction.constant.ThirdPartyApiConstant; import pps.core.prediction.constant.ThirdPartyApiConstant;
...@@ -18,7 +16,6 @@ import pps.core.prediction.entity.WellheadDailyProductionSituationEnt; ...@@ -18,7 +16,6 @@ import pps.core.prediction.entity.WellheadDailyProductionSituationEnt;
import pps.core.prediction.excel.listener.ThirdActivePowerDataListener; import pps.core.prediction.excel.listener.ThirdActivePowerDataListener;
import pps.core.prediction.mapper.WellheadDailyProductionSituationMapper; import pps.core.prediction.mapper.WellheadDailyProductionSituationMapper;
import pps.core.prediction.service.data.third_active_power.ThirdActivePowerExcelData; import pps.core.prediction.service.data.third_active_power.ThirdActivePowerExcelData;
import pps.core.prediction.service.data.third_current_well_condition.GetThirdCurrentWellConditionViewOutput;
import pps.core.prediction.service.data.wellhead_daily_production_situation.GetWellheadDailyProductionSituationInput; import pps.core.prediction.service.data.wellhead_daily_production_situation.GetWellheadDailyProductionSituationInput;
import pps.core.prediction.service.data.wellhead_daily_production_situation.GetWellheadDailyProductionSituationOutput; import pps.core.prediction.service.data.wellhead_daily_production_situation.GetWellheadDailyProductionSituationOutput;
import pps.core.prediction.service.data.wellhead_daily_production_situation.QueryWellheadDailyProductionSituationInput; import pps.core.prediction.service.data.wellhead_daily_production_situation.QueryWellheadDailyProductionSituationInput;
...@@ -29,15 +26,16 @@ import xstartup.annotation.XText; ...@@ -29,15 +26,16 @@ import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.base.XStartup; import xstartup.base.XStartup;
import xstartup.base.util.XCopyUtils; import xstartup.base.util.XCopyUtils;
import xstartup.base.util.XHttpUtils;
import xstartup.data.XListResult; import xstartup.data.XListResult;
import xstartup.data.XPageResult; import xstartup.data.XPageResult;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
import xstartup.feature.api.annotation.XApiGet; import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
import java.util.*; import java.util.Collections;
import java.util.stream.Collectors; import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* 井口生产情况模块 * 井口生产情况模块
...@@ -107,567 +105,11 @@ public class WellheadDailyProductionSituationService { ...@@ -107,567 +105,11 @@ public class WellheadDailyProductionSituationService {
return XListResult.success(outputs); return XListResult.success(outputs);
} }
@XText("井口生产情况--test")
@XApiGet(anonymous = true)
public XServiceResult test(XContext context) {
context.getLogger().info("---------------------------cqToken---------------------------");
String cqToken = "";
String api;
try {
cqToken = ServiceUtil.getToken(context);
context.getLogger().info("cqToken: " + cqToken);
} catch (Exception e) {
e.printStackTrace();
}
String url = XStartup.getCurrent().getProperty("third-party.chang-qing.url");
Map<String, String> header = new HashMap<>(4);
header.put("token", cqToken);
HttpRequestClient client = new HttpRequestClient(cqToken);
context.getLogger().info("---------------------------CQ_WELL_TECH_DAILY---------------------------");
try {
api = url + ThirdPartyApiConstant.CQ_WELL_TECH_DAILY;
Map<String, Object> param = new HashMap<>(4);
param.put("Calc_Date", "2024-03-18");
String s = client.doPostForm(api, param);
context.getLogger().info("CQ_WELL_TECH_DAILY: " + s);
} catch (Exception e) {
e.printStackTrace();
}
context.getLogger().info("---------------------------CQ_WELL_STATION_PV_DATA---------------------------");
try {
api = url + ThirdPartyApiConstant.CQ_WELL_STATION_PV_DATA;
String s = client.doPostForm(api, new HashMap<>(4));
context.getLogger().info("CQ_WELL_STATION_PV_DATA: " + s);
} catch (Exception e) {
e.printStackTrace();
}
context.getLogger().info("---------------------------CQ_RPT_SYSTEM_START_STOP---------------------------");
try {
api = url + ThirdPartyApiConstant.CQ_RPT_SYSTEM_START_STOP;
Map<String, Object> param = new HashMap<>(4);
param.put("WELL_NAME", "王101-23");
String s = client.doPostForm(api, param);
context.getLogger().info("CQ_RPT_SYSTEM_START_STOP: " + s);
} catch (Exception e) {
e.printStackTrace();
}
context.getLogger().info("---------------------------CQ_WELL_REAL_PV_DATA---------------------------");
try {
api = url + ThirdPartyApiConstant.CQ_WELL_REAL_PV_DATA;
String s = client.doPostForm(api, new HashMap<>(4));
context.getLogger().info("CQ_WELL_REAL_PV_DATA: " + s);
} catch (Exception e) {
e.printStackTrace();
}
context.getLogger().info("---------------------------CQ_STATION_DAILY_PV_DATA---------------------------");
try {
api = url + ThirdPartyApiConstant.CQ_STATION_DAILY_PV_DATA;
Map<String, Object> param = new HashMap<>(4);
param.put("Calc_Date", "2024-03-18");
String s = client.doPostForm(api, param);
context.getLogger().info("CQ_STATION_DAILY_PV_DATA: " + s);
} catch (Exception e) {
e.printStackTrace();
}
context.getLogger().info("---------------------------JI_CHENG_TOKEN---------------------------");
try {
String t = "http://10.59.249.10:8183/admin-api/system/auth/login";
Map<String, String> param = new HashMap<>(4);
param.put("username", "31b5604627e345ebb48175de8f2ee0bdem55ajAwMQ==kj");
param.put("password", "sdSktfem55ajAwMSFAIzEw8ef354f215d44c0eafd403ab7a1ce74a");
String result = XHttpUtils.postAsJson(t, JSON.toJSONString(param));
context.getLogger().info("JI_CHENG_TOKEN: " + JSON.toJSONString(param));
context.getLogger().info("JI_CHENG_TOKEN: " + result);
} catch (Exception e) {
e.printStackTrace();
}
context.getLogger().info("---------------------------CQ_GROUP_REAL_PV_DATA---------------------------");
try {
api = url + ThirdPartyApiConstant.CQ_GROUP_REAL_PV_DATA;
String s = client.doPostForm(api, new HashMap<>(4));
context.getLogger().info("CQ_GROUP_REAL_PV_DATA: " + s);
} catch (Exception e) {
e.printStackTrace();
}
context.getLogger().info("---------------------------CQ_AVG_ACTIVE_POWER---------------------------");
try {
api = url + ThirdPartyApiConstant.CQ_AVG_ACTIVE_POWER;
String s = client.doPostForm(api, new HashMap<>(4));
context.getLogger().info("CQ_AVG_ACTIVE_POWER: " + s);
} catch (Exception e) {
e.printStackTrace();
}
return XServiceResult.OK;
}
@XText("有功功率历史数据导入") @XText("有功功率历史数据导入")
@XApiGet(anonymous = true) @XApiGet
public XServiceResult importHistory(XContext context) { public XServiceResult importHistory(XContext context) {
String fileName = "D:\\home\\历史数据汇总.xlsx"; String fileName = "D:\\home\\历史数据汇总.xlsx";
EasyExcel.read(fileName, ThirdActivePowerExcelData.class, new ThirdActivePowerDataListener(context)).sheet().doRead(); EasyExcel.read(fileName, ThirdActivePowerExcelData.class, new ThirdActivePowerDataListener(context)).sheet().doRead();
return XServiceResult.OK; return XServiceResult.OK;
} }
@XText("井口")
@XApiGet(anonymous = true)
public XServiceResult wellTest(XContext context) {
String wellResult = "[\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"王侧11-8\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"reaL_LIQUID_DAILY\": 2.11,\n" +
"\t\t\"starthours\": 5.5,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"2024-05-14T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"塞侧29-4\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山31-14\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山33-13\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山33-14\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山34-13\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山36-13\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山37-12\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山39-12\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山40-11\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山41-9\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山43-5\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"午249-9\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"午252-10\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"午252-9\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"午291\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"午侧249-8\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"午平231-04\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山30-15\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山35-12\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山38-13\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山39-11\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山41-6\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山43-9\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"reaL_LIQUID_DAILY\": 2.22,\n" +
"\t\t\"starthours\": 4,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"2024-05-13T16:30:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"午250-10\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"午251-10\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山37-11\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山33-15\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"午222-210X\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山37-13\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山35-14\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山35-15\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山38-11\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山42-9\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"午246-216\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"山32-13\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"沙27-23\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"reaL_LIQUID_DAILY\": 0.26,\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"停井\",\n" +
"\t\t\"next_ExecDate\": \"2024-05-14T04:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"沙30-23\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"塬64-82\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"reaL_LIQUID_DAILY\": 3.74,\n" +
"\t\t\"starthours\": 0.26666666666666669,\n" +
"\t\t\"status\": \"停井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"塬342-103\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"塬50-91\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0.6666666666666666,\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"塬48-93\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"reaL_LIQUID_DAILY\": 1.03,\n" +
"\t\t\"starthours\": 0.36666666666666666,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"塬40-96\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"塬341-103\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"沙24-13\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"塬49-92\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"reaL_LIQUID_DAILY\": 3.8,\n" +
"\t\t\"starthours\": 0.36666666666666666,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"塬42-94\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"reaL_LIQUID_DAILY\": 2.35,\n" +
"\t\t\"starthours\": 0.38333333333333338,\n" +
"\t\t\"status\": \"开井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"沙侧28-22\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"成62-16\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"reaL_LIQUID_DAILY\": 1.9,\n" +
"\t\t\"starthours\": 0.26666666666666669,\n" +
"\t\t\"status\": \"停井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"沙25-12\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"status\": \"停井\",\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"沙侧30-24\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"黄120\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"塬平57-17\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t},\n" +
"\t{\n" +
"\t\t\"welL_ID\": 0,\n" +
"\t\t\"welL_NAME\": \"塬47-92\",\n" +
"\t\t\"caL_DATE\": \"0001-01-01T00:00:00\",\n" +
"\t\t\"starthours\": 0,\n" +
"\t\t\"next_ExecDate\": \"0001-01-01T00:00:00\"\n" +
"\t}\n" +
"]";
List<GetThirdCurrentWellConditionViewOutput> wellList = JSON.parseArray(wellResult, GetThirdCurrentWellConditionViewOutput.class);
Set<String> collect = ServiceUtil.getBaseWellheadList(context, DynamicQueryBaseWellheadInput.builder()
.build()).stream()
.map(DynamicQueryBaseWellheadOutput::getWellNumber).collect(Collectors.toSet());
Set<String> apiCollect = wellList.stream().map(GetThirdCurrentWellConditionViewOutput::getWellNumber).collect(Collectors.toSet());
System.out.println("-------------------系统里的井口:");
for (String output : collect) {
System.out.println(output);
}
System.out.println("-------------------长庆接口里的井口:");
for (GetThirdCurrentWellConditionViewOutput output : wellList) {
System.out.println(output.getWellNumber());
}
System.out.println("-------------------系统有长庆没有的井口:");
for (String s : collect) {
if (!apiCollect.contains(s)) {
System.out.println(s);
}
}
System.out.println("-------------------长庆接口有系统里没有的井口:");
for (String s : apiCollect) {
if (!collect.contains(s)) {
System.out.println(s);
}
}
return XServiceResult.OK;
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment