Skip to content

G
gf_back
Commit 68b5956f 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 b4f8cb22
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 265 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseDieselGeneratorService.java
View file @ 68b5956f
......@@ -175,9 +175,9 @@ public class BaseDieselGeneratorService {
.in(CollUtil.isNotEmpty(allListByOuId), BaseDieselGeneratorEnt::getOuId, allListByOuId);
}
queryWrapper.lambda()
.eq(BaseDieselGeneratorEnt::getIsDeleted, BusinessConstant.ONE)
.like(CharSequenceUtil.isNotEmpty(ouName), BaseDieselGeneratorEnt::getOuName, ouName)
.like(CharSequenceUtil.isNotEmpty(deviceName), BaseDieselGeneratorEnt::getDeviceName, deviceName)
.eq(BaseDieselGeneratorEnt::getIsDeleted, BusinessConstant.ONE)
.orderByAsc(BaseDieselGeneratorEnt::getOuName, BaseDieselGeneratorEnt::getDeviceName);
return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseDieselGeneratorOutput.class);
}
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseEnergyStorageDeviceService.java
View file @ 68b5956f
......@@ -175,9 +175,9 @@ public class BaseEnergyStorageDeviceService {
.in(CollUtil.isNotEmpty(allListByOuId), BaseEnergyStorageDeviceEnt::getOuId, allListByOuId);
}
queryWrapper.lambda()
.eq(BaseEnergyStorageDeviceEnt::getIsDeleted, BusinessConstant.ONE)
.like(CharSequenceUtil.isNotEmpty(ouName), BaseEnergyStorageDeviceEnt::getOuName, ouName)
.like(CharSequenceUtil.isNotEmpty(deviceName), BaseEnergyStorageDeviceEnt::getDeviceName, deviceName)
.eq(BaseEnergyStorageDeviceEnt::getIsDeleted, BusinessConstant.ONE)
.orderByAsc(BaseEnergyStorageDeviceEnt::getOuName, BaseEnergyStorageDeviceEnt::getDeviceName);
return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseEnergyStorageDeviceOutput.class);
}
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantMapeAdjService.java
View file @ 68b5956f
......@@ -2,7 +2,7 @@ package pps.core.base.service;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import pps.core.base.entity.BasePhotovoltaicPlantEnt;
import pps.core.base.entity.BasePhotovoltaicPlantMapeAdjEnt;
import pps.core.base.entity.BasePhotovoltaicPlantMapeAdjView;
......@@ -88,8 +88,7 @@ public class BasePhotovoltaicPlantMapeAdjService {
ent.setModifyById(session.getId());
ent.setModifyByName(session.getUserName());
ent.setModifyTime(new Date());
mapper.update(ent, new UpdateWrapper<BasePhotovoltaicPlantMapeAdjEnt>()
.lambda()
mapper.update(ent, new LambdaUpdateWrapper<BasePhotovoltaicPlantMapeAdjEnt>()
.eq(BasePhotovoltaicPlantMapeAdjEnt::getPlantId, input.getPlantId())
.eq(BasePhotovoltaicPlantMapeAdjEnt::getMapeType, input.getMapeType()));
return XServiceResult.OK;
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantService.java
View file @ 68b5956f
......@@ -50,6 +50,7 @@ import xstartup.feature.mybatis.helper.XMapperHelper;
import xstartup.helper.XTransactionHelper;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List;
import java.util.Map;
import java.util.Optional;
......@@ -217,7 +218,7 @@ public class BasePhotovoltaicPlantService {
} else {
mape = relMape;
}
output.setMape(mape.setScale(2, BigDecimal.ROUND_UP).toPlainString() + "%");
output.setMape(mape.setScale(2, RoundingMode.UP).toPlainString() + "%");
}
}
}
......@@ -259,8 +260,8 @@ public class BasePhotovoltaicPlantService {
.in(CollUtil.isNotEmpty(allListByOuId), BasePhotovoltaicPlantEnt::getOuId, allListByOuId);
}
queryWrapper.lambda()
.like(CharSequenceUtil.isNotEmpty(stationName), BasePhotovoltaicPlantEnt::getStationName, stationName)
.eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE)
.like(CharSequenceUtil.isNotEmpty(stationName), BasePhotovoltaicPlantEnt::getStationName, stationName)
.orderByAsc(BasePhotovoltaicPlantEnt::getOuName, BasePhotovoltaicPlantEnt::getStationName);
return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePhotovoltaicPlantOutput.class);
}
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineService.java
View file @ 68b5956f
......@@ -96,7 +96,7 @@ public class BasePowerLineService {
return XTransactionHelper.begin(context, () -> {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
BasePowerLineEnt entity = this.selectOneByLineId(lineId, mapper);
if (Objects.isNull(entity)) {
if (ObjectUtil.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound);
}
//删除井口关联信息
......@@ -305,14 +305,14 @@ public class BasePowerLineService {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
List<BasePowerLineEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePowerLineEnt>()
.select(BaseModel::getId, BasePowerLineEnt::getLineName)
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.eq(CharSequenceUtil.isNotBlank(lineId), BaseModel::getId, lineId)
.eq(CharSequenceUtil.isNotBlank(ouId), BasePowerLineEnt::getOuId, ouId)
.eq(CharSequenceUtil.isNotBlank(upperLineId), BasePowerLineEnt::getUpperLineId, upperLineId)
.like(CharSequenceUtil.isNotBlank(lineName), BasePowerLineEnt::getLineName, lineName)
.eq(CharSequenceUtil.isNotBlank(gridTypeKey), BasePowerLineEnt::getGridTypeKey, gridTypeKey)
.eq(CharSequenceUtil.isNotBlank(lineTypeKey), BasePowerLineEnt::getLineTypeKey, lineTypeKey)
.eq(CharSequenceUtil.isNotBlank(strategyId), BasePowerLineEnt::getStrategyId, strategyId)
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.like(CharSequenceUtil.isNotBlank(lineName), BasePowerLineEnt::getLineName, lineName)
.orderByAsc(BasePowerLineEnt::getLineTypeKey, BasePowerLineEnt::getLineName)
);
List<DynamicQueryBasePowerLineOutput> lineOutputList = XCopyUtils.copyNewList(selectList, DynamicQueryBasePowerLineOutput.class);
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyService.java
View file @ 68b5956f
......@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.github.pagehelper.PageInfo;
import com.github.pagehelper.page.PageMethod;
......@@ -103,15 +102,13 @@ public class BasePriceStrategyService {
.collect(Collectors.toList());
BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
//删除月信息
monthMapper.delete(new QueryWrapper<BasePriceStrategyMonthEnt>()
.lambda()
monthMapper.delete(new LambdaQueryWrapper<BasePriceStrategyMonthEnt>()
.eq(BasePriceStrategyMonthEnt::getStrategyId, strategyId)
.in(BasePriceStrategyMonthEnt::getStrategyMonth, collect)
);
BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
//删除详情
detailMapper.delete(new QueryWrapper<BasePriceStrategyDetailEnt>()
.lambda()
detailMapper.delete(new LambdaQueryWrapper<BasePriceStrategyDetailEnt>()
.eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId)
.in(BasePriceStrategyDetailEnt::getStrategyMonth, collect)
);
......@@ -281,10 +278,10 @@ public class BasePriceStrategyService {
List<BasePriceStrategyEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePriceStrategyEnt>()
.select(BaseModel::getId, BasePriceStrategyEnt::getPolicyName)
.eq(CharSequenceUtil.isNotBlank(id), BaseModel::getId, id)
.like(CharSequenceUtil.isNotBlank(policyName), BasePriceStrategyEnt::getPolicyName, policyName)
.eq(Objects.nonNull(areaCode), BasePriceStrategyEnt::getAreaCode, areaCode)
.eq(Objects.nonNull(strategyYear), BasePriceStrategyEnt::getStrategyYear, strategyYear)
.eq(Objects.nonNull(isFixedPrice), BasePriceStrategyEnt::getIsFixedPrice, isFixedPrice)
.like(CharSequenceUtil.isNotBlank(policyName), BasePriceStrategyEnt::getPolicyName, policyName)
.orderByDesc(BaseModel::getModifyTime)
);
List<DynamicQueryBasePriceStrategyOutput> strategyOutputList = XCopyUtils.copyNewList(selectList, DynamicQueryBasePriceStrategyOutput.class);
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWatherService.java
View file @ 68b5956f
package pps.core.base.service;
import cn.hutool.core.text.CharSequenceUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
......@@ -36,7 +37,7 @@ public class BaseWatherService {
Document document = Jsoup.parse(new URL(url), 30000);
Elements elements = document.getElementsByClass("mt15"); // 获取class name 是‘mt15’的都有元素对象
Element element;
if (elements == null || elements.size() <= 0) {
if (elements.isEmpty()) {
return;
} else {
element = elements.get(1); //根据页面结构获取到需要的元素对象
......@@ -57,7 +58,7 @@ public class BaseWatherService {
String dayTime;
BaseWatherEnt dao;
List<BaseWatherEnt> objList = new ArrayList<>();
if (tables != null && tables.size() > 0) {
if (!tables.isEmpty()) {
for (int i = 0; i < tables.size(); i++) {
calendar = Calendar.getInstance();
calendar.add(Calendar.DATE, i);
......@@ -73,7 +74,7 @@ public class BaseWatherService {
pressureArray = new ArrayList<>(); // 气压
humidityArray = new ArrayList<>(); // 湿度
cloudCoverArray = new ArrayList<>(); // 云量
if (trs != null && trs.size() > 0) {
if (!trs.isEmpty()) {
for (int j = 0; j < trs.size(); j++) { // 循环行
Elements tds = trs.get(j).select("td");
for (int k = 1; k < tds.size(); k++) { // 循环列
......@@ -133,11 +134,9 @@ public class BaseWatherService {
} else
continue;
// 5.执行SQL
QueryWrapper<BaseWatherEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BaseWatherEnt::getProvinceCode, dao.getProvinceCode())
mapper.delete(new LambdaQueryWrapper<BaseWatherEnt>().eq(BaseWatherEnt::getProvinceCode, dao.getProvinceCode())
.eq(BaseWatherEnt::getCityCode, dao.getCityCode())
.eq(BaseWatherEnt::getDataDate, dao.getDayTime() + ' ' + dao.getHourTime());
mapper.delete(queryWrapper);
.eq(BaseWatherEnt::getDataDate, dao.getDayTime() + ' ' + dao.getHourTime()));
dao.setDataDate(dao.getDayTime() + ' ' + dao.getHourTime());
mapper.insert(dao);
objList.add(dao);
......@@ -154,22 +153,22 @@ public class BaseWatherService {
dao.setProvinceName(provinceName);
dao.setWeather(objList.get(i).getWeather());
int I_i = i + 1;
Double temperature_1 = Double.parseDouble(objList.get(i).getTemperature());
Double temperature_2 = Double.parseDouble(objList.get(I_i).getTemperature());
double temperature_1 = Double.parseDouble(objList.get(i).getTemperature());
double temperature_2 = Double.parseDouble(objList.get(I_i).getTemperature());
dao.setTemperature((temperature_1 + (temperature_2 - temperature_1) * (0.3 * y)) + "℃");
dao.setPrecipitation(objList.get(i).getPrecipitation());
Double windspeed_1 = Double.parseDouble(objList.get(i).getWindSpeed());
Double windspeed_2 = Double.parseDouble(objList.get(I_i).getWindSpeed());
double windspeed_1 = Double.parseDouble(objList.get(i).getWindSpeed());
double windspeed_2 = Double.parseDouble(objList.get(I_i).getWindSpeed());
dao.setWindSpeed((windspeed_1 + (windspeed_2 - windspeed_1) * (0.3 * y)) + "m/s");
dao.setWindDirection(objList.get(i).getWindDirection());
Double pressure_1 = Double.parseDouble(objList.get(i).getPressure());
Double pressure_2 = Double.parseDouble(objList.get(I_i).getPressure());
double pressure_1 = Double.parseDouble(objList.get(i).getPressure());
double pressure_2 = Double.parseDouble(objList.get(I_i).getPressure());
dao.setPressure((pressure_1 + (pressure_2 - pressure_1) * (0.3 * y)) + "hPa");
Double humidity_1 = Double.parseDouble(objList.get(i).getHumidity());
Double humidity_2 = Double.parseDouble(objList.get(I_i).getHumidity());
double humidity_1 = Double.parseDouble(objList.get(i).getHumidity());
double humidity_2 = Double.parseDouble(objList.get(I_i).getHumidity());
dao.setHumidity((humidity_1 + (humidity_2 - humidity_1) * (0.3 * y)) + "%");
Double cloudcover_1 = Double.parseDouble(objList.get(i).getCloudCover());
Double cloudcover_2 = Double.parseDouble(objList.get(I_i).getCloudCover());
double cloudcover_1 = Double.parseDouble(objList.get(i).getCloudCover());
double cloudcover_2 = Double.parseDouble(objList.get(I_i).getCloudCover());
dao.setCloudCover((cloudcover_1 + (cloudcover_2 - cloudcover_1) * (0.3 * y)) + "%");
if (23 == LocalTime.parse(objList.get(i).getHourTime()).getHour()) {
date = sdf.parse(objList.get(i).getDayTime());
......@@ -190,11 +189,10 @@ public class BaseWatherService {
dao.setHourTime(Hour);
}
// 5.执行SQL
QueryWrapper<BaseWatherEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BaseWatherEnt::getProvinceCode, dao.getProvinceCode())
mapper.delete(new LambdaQueryWrapper<BaseWatherEnt>()
.eq(BaseWatherEnt::getProvinceCode, dao.getProvinceCode())
.eq(BaseWatherEnt::getCityCode, dao.getCityCode())
.eq(BaseWatherEnt::getDataDate, dao.getDayTime() + ' ' + dao.getHourTime());
mapper.delete(queryWrapper);
.eq(BaseWatherEnt::getDataDate, dao.getDayTime() + ' ' + dao.getHourTime()));
dao.setDataDate(dao.getDayTime() + ' ' + dao.getHourTime());
mapper.insert(dao);
}
......@@ -216,23 +214,23 @@ public class BaseWatherService {
//解析省份列表字符串，把字符串解析成json对象
JSONObject jsonObject = JSONObject.parseObject(provinceStr);
//处理json对象，变为数组
String[] provinceList = jsonObject.getString("data").split("\\|");
String[] provinceList = CharSequenceUtil.splitToArray(jsonObject.getString("data"), '|');
for (String proStr : provinceList) {
if (proStr != null && proStr != "") {
String[] pro = proStr.split(",");
if (CharSequenceUtil.isNotBlank(proStr)) {
String[] pro = CharSequenceUtil.splitToArray(proStr, ',');
String provinceCode = pro[0];//省编码
String provinceName = pro[1];//省名称
//甘肃 .陕西 （全国周期抓取耗费时间超长，共有2400个城市）
if (provinceCode.equals("AJL")) {
if (CharSequenceUtil.equals(provinceCode, "AJL")) {
//请求省份下的区信息
String cityString = HttpUtils.send2(cityUrl + provinceCode, "");
//解析区json，把字符串解析成json对象
JSONObject cityObj = JSONObject.parseObject(cityString);
//处理json对象，变为数组
String[] cityList = cityObj.getString("data").split("\\|");
String[] cityList = CharSequenceUtil.splitToArray(cityObj.getString("data"), '|');
for (String cityStr : cityList) {
if (cityStr != null && cityStr != "") {
String[] city = cityStr.split(",");
if (CharSequenceUtil.isNotBlank(cityStr)) {
String[] city = CharSequenceUtil.splitToArray(cityStr, ',');
String cityCode = city[0];//区编码
String cityName = city[1];//区名称
XThreadHelper.async(() -> insertData(context, provinceCode, provinceName, cityCode, cityName, 1));
......@@ -242,7 +240,7 @@ public class BaseWatherService {
}
}
} catch (Exception e) {
context.getLogger().error(e.getMessage());
}
return XServiceResult.OK;
}
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWeatherCloudServiceImpl.java
View file @ 68b5956f
......@@ -422,7 +422,8 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
);
// 5.执行SQL
allList.add(dao);
PlantPredictedPowerDataEnt isExit = objList.stream().filter(item ->
PlantPredictedPowerDataEnt isExit = objList.stream()
.filter(item ->
CharSequenceUtil.equals(item.getYearTime(), dao.getYearTime()) &&
CharSequenceUtil.equals(item.getMonthTime(), dao.getMonthTime()) &&
CharSequenceUtil.equals(item.getDayTime(), dao.getDayTime()) &&
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWellheadCloudServiceImpl.java
View file @ 68b5956f
......@@ -77,4 +77,4 @@ public class BaseWellheadCloudServiceImpl implements IBaseWellheadCloudService {
);
return XSingleResult.success(XCopyUtils.copyNewObject(one, DynamicQueryBaseWellheadOutput.class));
}
}
}
\ No newline at end of file
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWellheadService.java
View file @ 68b5956f
......@@ -246,4 +246,4 @@ public class BaseWellheadService {
);
return count > 0;
}
}
}
\ No newline at end of file
C09-base/pps-core-base/src/main/java/pps/core/base/service/ExcelService.java
View file @ 68b5956f
......@@ -125,9 +125,8 @@ public class ExcelService {
.registerWriteHandler(new CascadeWriteHandler(provNameList, siteMap))
.autoCloseStream(Boolean.TRUE)
.build()
.write(list,
EasyExcelUtil.writeSelectedSheet(ExcelPhotovoltaicPlantTemplate.class, 0, "光伏电站配置")
).finish();
.write(list, EasyExcelUtil.writeSelectedSheet(ExcelPhotovoltaicPlantTemplate.class, 0, "光伏电站配置"))
.finish();
return XFileResult.success(XFileType.APPLICATION_XLSX, fileSavePath);
}
......@@ -171,9 +170,8 @@ public class ExcelService {
.registerWriteHandler(ExcelStyleTool.getStyleStrategy())
.autoCloseStream(Boolean.TRUE)
.build()
.write(list,
EasyExcelUtil.writeSelectedSheet(ExcelWellheadTemplate.class, 0, "井口配置")
).finish();
.write(list, EasyExcelUtil.writeSelectedSheet(ExcelWellheadTemplate.class, 0, "井口配置"))
.finish();
return XFileResult.success(XFileType.APPLICATION_XLSX, fileSavePath);
}
......@@ -218,9 +216,8 @@ public class ExcelService {
.registerWriteHandler(ExcelStyleTool.getStyleStrategy())
.autoCloseStream(Boolean.TRUE)
.build()
.write(list,
EasyExcelUtil.writeSelectedSheet(ExcelDieselGeneratorTemplate.class, 0, "柴发设备配置")
).finish();
.write(list, EasyExcelUtil.writeSelectedSheet(ExcelDieselGeneratorTemplate.class, 0, "柴发设备配置"))
.finish();
return XFileResult.success(XFileType.APPLICATION_XLSX, fileSavePath);
}
......@@ -268,9 +265,8 @@ public class ExcelService {
.registerWriteHandler(ExcelStyleTool.getStyleStrategy())
.autoCloseStream(Boolean.TRUE)
.build()
.write(list,
EasyExcelUtil.writeSelectedSheet(ExcelEnergyStorageDeviceTemplate.class, 0, "储能设备配置")
).finish();
.write(list, EasyExcelUtil.writeSelectedSheet(ExcelEnergyStorageDeviceTemplate.class, 0, "储能设备配置"))
.finish();
return XFileResult.success(XFileType.APPLICATION_XLSX, fileSavePath);
}
......@@ -320,9 +316,8 @@ public class ExcelService {
.registerWriteHandler(ExcelStyleTool.getStyleStrategy())
.autoCloseStream(Boolean.TRUE)
.build()
.write(list,
EasyExcelUtil.writeSelectedSheet(ExcelPriceStrategyTemplate.class, 0, "市电峰谷配置")
).finish();
.write(list, EasyExcelUtil.writeSelectedSheet(ExcelPriceStrategyTemplate.class, 0, "市电峰谷配置"))
.finish();
return XFileResult.success(XFileType.APPLICATION_XLSX, fileSavePath);
}
......@@ -350,8 +345,8 @@ public class ExcelService {
//封装并校验电站名称(校验电站名称是否重复,重复不导入),并插入数据
Set<String> collect = context.getBean(BasePhotovoltaicPlantMapper.class)
.selectList(new LambdaQueryWrapper<BasePhotovoltaicPlantEnt>()
.eq(BaseModel::getIsDeleted, 1)
).stream()
.eq(BaseModel::getIsDeleted, 1))
.stream()
.map(BasePhotovoltaicPlantEnt::getStationName)
.collect(Collectors.toSet());
List<Integer> errorRowList = new ArrayList<>(list.size());
......@@ -417,8 +412,8 @@ public class ExcelService {
//封装并校验井号(校验井号是否重复,重复不导入),并插入数据
Set<String> collect = context.getBean(BaseWellheadMapper.class)
.selectList(new LambdaQueryWrapper<BaseWellheadEnt>()
.eq(BaseModel::getIsDeleted, 1)
).stream()
.eq(BaseModel::getIsDeleted, 1))
.stream()
.map(BaseWellheadEnt::getWellNumber)
.collect(Collectors.toSet());
List<Integer> errorRowList = new ArrayList<>(list.size());
......@@ -477,8 +472,8 @@ public class ExcelService {
//封装并校验设备名称(校验设备名称是否重复,重复不导入),并插入数据
Set<String> collect = context.getBean(BaseDieselGeneratorMapper.class)
.selectList(new LambdaQueryWrapper<BaseDieselGeneratorEnt>()
.eq(BaseModel::getIsDeleted, 1)
).stream()
.eq(BaseModel::getIsDeleted, 1))
.stream()
.map(BaseDieselGeneratorEnt::getDeviceName)
.collect(Collectors.toSet());
List<Integer> errorRowList = new ArrayList<>(list.size());
......@@ -537,8 +532,8 @@ public class ExcelService {
//封装并校验设备名称(校验设备名称是否重复,重复不导入),并插入数据
Set<String> collect = context.getBean(BaseEnergyStorageDeviceMapper.class)
.selectList(new LambdaQueryWrapper<BaseEnergyStorageDeviceEnt>()
.eq(BaseModel::getIsDeleted, 1)
).stream()
.eq(BaseModel::getIsDeleted, 1))
.stream()
.map(BaseEnergyStorageDeviceEnt::getDeviceName)
.collect(Collectors.toSet());
List<Integer> errorRowList = new ArrayList<>(list.size());
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/SysPageInfoService.java
View file @ 68b5956f
......@@ -3,6 +3,7 @@ package pps.core.base.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import pps.core.base.entity.SysPageInfoEnt;
import pps.core.base.mapper.SysPageInfoMapper;
......@@ -49,8 +50,7 @@ public class SysPageInfoService {
public XServiceResult updateSysPageInfo(XContext context, UpdateSysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
SysPageInfoEnt entity = mapper.selectOne(new QueryWrapper<SysPageInfoEnt>()
.lambda()
SysPageInfoEnt entity = mapper.selectOne(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getId, input.getId()));
if (ObjectUtil.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound);
......@@ -75,8 +75,7 @@ public class SysPageInfoService {
@XApiPost
public XServiceResult deleteSysPageInfo(XContext context, DeleteSysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
SysPageInfoEnt entity = mapper.selectOne(new QueryWrapper<SysPageInfoEnt>()
.lambda()
SysPageInfoEnt entity = mapper.selectOne(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getId, input.getId()));
if (ObjectUtil.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound);
......@@ -89,8 +88,7 @@ public class SysPageInfoService {
@XApiGet
public XSingleResult<GetSysPageInfoOutput> getSysPageInfo(XContext context, GetSysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
SysPageInfoEnt entity = mapper.selectOne(new QueryWrapper<SysPageInfoEnt>()
.lambda()
SysPageInfoEnt entity = mapper.selectOne(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getId, input.getId()));
if (ObjectUtil.isNull(entity)) {
return XSingleResult.error(context, XError.NotFound);
......@@ -105,16 +103,11 @@ public class SysPageInfoService {
public XPageResult<QuerySysPageInfoOutput> querySysPageInfo(XContext context, QuerySysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
QueryWrapper<SysPageInfoEnt> queryWrapper = new QueryWrapper<>();
if (CharSequenceUtil.isNotBlank(input.getPageId())) {
queryWrapper.lambda().eq(SysPageInfoEnt::getPageId, input.getPageId());
}
if (CharSequenceUtil.isNotBlank(input.getPageName())) {
queryWrapper.lambda().like(SysPageInfoEnt::getPageName, input.getPageName());
}
if (ObjectUtil.isNotNull(input.getReleaseState())) {
queryWrapper.lambda().eq(SysPageInfoEnt::getReleaseState, input.getReleaseState());
}
queryWrapper.lambda().orderByDesc(SysPageInfoEnt::getCreateTime);
queryWrapper.lambda()
.eq(CharSequenceUtil.isNotBlank(input.getPageId()), SysPageInfoEnt::getPageId, input.getPageId())
.eq(ObjectUtil.isNotNull(input.getReleaseState()), SysPageInfoEnt::getReleaseState, input.getReleaseState())
.like(CharSequenceUtil.isNotBlank(input.getPageName()), SysPageInfoEnt::getPageName, input.getPageName())
.orderByDesc(SysPageInfoEnt::getCreateTime);
return XMapperHelper.query(mapper, input, queryWrapper, QuerySysPageInfoOutput.class);
}
......@@ -123,12 +116,10 @@ public class SysPageInfoService {
public XServiceResult releasePageInfo(XContext context, GetSysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
//根据id查询需要发布的数据
SysPageInfoEnt sysPageInfoEnt = mapper.selectOne(new QueryWrapper<SysPageInfoEnt>()
.lambda()
SysPageInfoEnt sysPageInfoEnt = mapper.selectOne(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getId, input.getId()));
//查询当前页面处于发布状态的版本删除
List<SysPageInfoEnt> sysPageInfos = mapper.selectList(new QueryWrapper<SysPageInfoEnt>()
.lambda()
List<SysPageInfoEnt> sysPageInfos = mapper.selectList(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getPageId, sysPageInfoEnt.getPageId())
.eq(SysPageInfoEnt::getReleaseVersion, 1));
if (CollUtil.isNotEmpty(sysPageInfos)) {
......@@ -136,16 +127,14 @@ public class SysPageInfoService {
mapper.deleteById(pageInfoEnt);
}
//查询发布的最大版本号
List<SysPageInfoEnt> sysPageInfoEnts = mapper.selectList(new QueryWrapper<SysPageInfoEnt>()
.lambda()
List<SysPageInfoEnt> sysPageInfoEnts = mapper.selectList(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getPageId, sysPageInfoEnt.getPageId())
.isNotNull(SysPageInfoEnt::getReleaseVersion)
.orderByDesc(SysPageInfoEnt::getReleaseVersion));
if (CollUtil.isNotEmpty(sysPageInfoEnts)) {
SysPageInfoEnt sysPageInfo = sysPageInfoEnts.get(0);
if (ObjectUtil.isNotNull(sysPageInfo.getReleaseVersion())) {
Integer version = sysPageInfo.getReleaseVersion() + 1;
sysPageInfoEnt.setReleaseVersion(version);
sysPageInfoEnt.setReleaseVersion(sysPageInfo.getReleaseVersion() + 1);
} else {
sysPageInfoEnt.setReleaseVersion(1);
}
......@@ -162,8 +151,7 @@ public class SysPageInfoService {
@XApiGet
public XSingleResult<GetSysPageInfoOutput> getSysPageInfoByPageId(XContext context, GetSysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
SysPageInfoEnt entity = mapper.selectOne(new QueryWrapper<SysPageInfoEnt>()
.lambda()
SysPageInfoEnt entity = mapper.selectOne(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getPageId, input.getPageId())
.eq(SysPageInfoEnt::getReleaseState, 1));
if (ObjectUtil.isNull(entity)) {
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/ThirdWeatherDataService.java
View file @ 68b5956f
......@@ -94,4 +94,4 @@ public class ThirdWeatherDataService {
private String getIconPath(Integer wep) {
return XStartup.getCurrent().getProperty("weather.file.icon") + File.separator + wep + "@1x.png";
}
}
}
\ No newline at end of file
C09-base/pps-core-base/src/main/java/pps/core/base/utils/ReceivedIMAPMail.java
View file @ 68b5956f
......@@ -23,8 +23,6 @@ import java.util.List;
*/
public class ReceivedIMAPMail {
public static String NORM_DATETIME_PATTERN = "yyyy-MM-dd hh:mm:ss";
private MimeMessage mimeMessage;
/**
......@@ -146,6 +144,7 @@ public class ReceivedIMAPMail {
for (Flags.Flag value : flag) {
if (value == Flags.Flag.SEEN) {
isNew = true;
break;
}
}
return isNew;
......
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