Skip to content

A
amos-boot-biz
Commit f91d5c2b authored by tangwei's avatar tangwei
Browse files
Options

修改监盘计算系数

parent 264f0dbd
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 46 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
View file @ f91d5c2b
......@@ -458,7 +458,7 @@ public class JpStationController extends BaseController {
List<Map<String,Object>> powerRatio=new ArrayList<>();
Map<String,Object> map=new HashMap<>();
if(jpStation!=null&&jpStation.getRealTimePower()!=null&&jpStation.getRatedPower()!=null&&jpStation.getRatedPower()>0){
map.put("value",String.format("%.4f",jpStation.getRealTimePower()/jpStation.getRatedPower()));
map.put("value",String.format("%.4f",jpStation.getRealTimePower()/(jpStation.getCapacity()*FDXSS)));
}else{
jpStation=new JpStationDto();
map.put("value",0);
......@@ -553,9 +553,9 @@ public class JpStationController extends BaseController {
map4.put("name1","累计电量(MWh)");
map4.put("name2","累计收益(万元)");
//炭
map4.put("value1",format2.format(jpStation.getYearGenerate()));
map4.put("value1",format2.format(jpStation.getAccumulatedPower()));
//硫
map4.put("value2",format2.format(jpStation.getYearIncome()));
map4.put("value2",format2.format(jpStation.getCumulativeIncome()));
date.add(map);
date.add(map2);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java
View file @ f91d5c2b
......@@ -383,7 +383,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
//权限
List<String> statioId=new ArrayList();
List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
if(reviewDto.getThirdStationIds()==null){
if(reviewDto.getThirdStationIds()==null||reviewDto.getThirdStationIds().isEmpty()){
for (JpStation jpStation : dataJpStation) {
statioId.add(jpStation.getThirdStationId());
}
......@@ -393,6 +393,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
List<JpStationDto> list = null;
int count=0;
if(dataJpStation!=null&&dataJpStation.size()>0){
switch (type){
case"day":
LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
......@@ -429,6 +430,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
list = getJpStationDtoAlldto(listJ);
}
}
com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto>();
pagenew.setCurrent(pageNum);
pagenew.setTotal(count);
......@@ -564,7 +566,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
//权限
List<String> statioId=new ArrayList();
List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
if(reviewDto.getThirdStationIds()==null){
if(reviewDto.getThirdStationIds()==null||reviewDto.getThirdStationIds().isEmpty()){
for (JpStation jpStation : dataJpStation) {
statioId.add(jpStation.getThirdStationId());
}
......@@ -574,50 +576,51 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
List<JpStationDto> list = null;
try {
if(dataJpStation!=null&&dataJpStation.size()>0) {
switch (type) {
case "day":
LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
wapper.in(DayGenerate::getThirdStationId, reviewDto.getThirdStationIds());
wapper.eq(reviewDto.getTimeDate() != null, DayGenerate::getDayTime, reviewDto.getTimeDate());
List<DayGenerate> listday = dayGenerateMapper.selectList(wapper);
List<DayGenerateEX> listne = getJpStationDtodaynew(dataJpStation, listday);
setResponseHeadForDowload(response, "电站日报表.xls");
EasyExcel.write(response.getOutputStream()).head(DayGenerateEX.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
.doWrite(listne);
break;
case "month":
LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
wapper1.in(MonthGenerate::getThirdStationId, reviewDto.getThirdStationIds());
wapper1.eq(reviewDto.getTimeDate() != null, MonthGenerate::getMonthTime, reviewDto.getTimeDate());
switch (type){
case"day":
LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
wapper.in(DayGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper.eq(reviewDto.getTimeDate()!=null,DayGenerate::getDayTime,reviewDto.getTimeDate());
List<DayGenerate> listday= dayGenerateMapper.selectList(wapper);
List<DayGenerateEX> listne = getJpStationDtodaynew( dataJpStation, listday);
setResponseHeadForDowload(response,"电站日报表.xls");
EasyExcel.write(response.getOutputStream()).head(DayGenerateEX.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
.doWrite(listne);
break;
case"month":
LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
wapper1.in(MonthGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper1.eq(reviewDto.getTimeDate()!=null,MonthGenerate::getMonthTime,reviewDto.getTimeDate());
List<MonthGenerate> listmonth= monthGenerateMapper.selectList(wapper1);
List<MonthGenerateEX> lo = getJpStationDtomonthnew( dataJpStation, listmonth);
setResponseHeadForDowload(response,"电站月报表.xls");
EasyExcel.write(response.getOutputStream()).head(MonthGenerateEX.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
.doWrite(lo);
break;
case"year":
LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
wapper2.in(YearGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper2.eq(reviewDto.getTimeDate()!=null,YearGenerate::getYear,reviewDto.getTimeDate());
List<YearGenerate> listyear= yearGenerateMapper.selectList(wapper2);
List<YearGenerateEX> listy = getJpStationDtoyearnew( dataJpStation, listyear);
setResponseHeadForDowload(response,"电站年报表.xls");
EasyExcel.write(response.getOutputStream()).head(YearGenerateEX.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
List<MonthGenerate> listmonth = monthGenerateMapper.selectList(wapper1);
List<MonthGenerateEX> lo = getJpStationDtomonthnew(dataJpStation, listmonth);
setResponseHeadForDowload(response, "电站月报表.xls");
EasyExcel.write(response.getOutputStream()).head(MonthGenerateEX.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
.doWrite(listy);
break;
default:
list = getJpStationDtoAll(dataJpStation);
setResponseHeadForDowload(response,"电站累计报表.xls");
EasyExcel.write(response.getOutputStream()).head(JpStationDto.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
.doWrite(lo);
break;
case "year":
LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
wapper2.in(YearGenerate::getThirdStationId, reviewDto.getThirdStationIds());
wapper2.eq(reviewDto.getTimeDate() != null, YearGenerate::getYear, reviewDto.getTimeDate());
List<YearGenerate> listyear = yearGenerateMapper.selectList(wapper2);
List<YearGenerateEX> listy = getJpStationDtoyearnew(dataJpStation, listyear);
setResponseHeadForDowload(response, "电站年报表.xls");
EasyExcel.write(response.getOutputStream()).head(YearGenerateEX.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
.doWrite(listy);
break;
default:
list = getJpStationDtoAll(dataJpStation);
setResponseHeadForDowload(response, "电站累计报表.xls");
EasyExcel.write(response.getOutputStream()).head(JpStationDto.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
.doWrite(list);
}
.doWrite(list);
}
}
} catch (IOException e) {
throw new RuntimeException(e);
}
......
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