|
@@ -135,6 +135,8 @@ public class FrontServiceImpl implements IFrontService {
|
|
* 9 碳源投加量-#2-计算投药量
|
|
* 9 碳源投加量-#2-计算投药量
|
|
* 10 碳源投加量-#1-组态反馈
|
|
* 10 碳源投加量-#1-组态反馈
|
|
* 11 碳源投加量-#2-组态反馈
|
|
* 11 碳源投加量-#2-组态反馈
|
|
|
|
+ * 12 #1缺氧硝酸盐
|
|
|
|
+ * 13 #2缺氧硝酸盐
|
|
* @param timeBegin
|
|
* @param timeBegin
|
|
* @param timeEnd
|
|
* @param timeEnd
|
|
* @return
|
|
* @return
|
|
@@ -185,6 +187,13 @@ public class FrontServiceImpl implements IFrontService {
|
|
result.put("7", tShuju1List.stream()
|
|
result.put("7", tShuju1List.stream()
|
|
.map(o -> new ChartBasic(o.getTIME(), o.getScJsZongdan()))
|
|
.map(o -> new ChartBasic(o.getTIME(), o.getScJsZongdan()))
|
|
.collect(Collectors.toList()));
|
|
.collect(Collectors.toList()));
|
|
|
|
+ //2024年11月21日15:18:46 新增的返回数据
|
|
|
|
+ result.put("12", tShuju1List.stream()
|
|
|
|
+ .map(o -> new ChartBasic(o.getTIME(), o.getJqr1QyXiaodan()))
|
|
|
|
+ .collect(Collectors.toList()));
|
|
|
|
+ result.put("13", tShuju1List.stream()
|
|
|
|
+ .map(o -> new ChartBasic(o.getTIME(), o.getJqr2QyXiaodan()))
|
|
|
|
+ .collect(Collectors.toList()));
|
|
//处理投加信息
|
|
//处理投加信息
|
|
List<TXlhtAddRecord> tXlhtAddRecords = xlhtAddRecordMapper.selectTXlhtAddRecordList(TXlhtAddRecord.builder().timeBegin(timeBegin).timeEnd(timeEnd).build());
|
|
List<TXlhtAddRecord> tXlhtAddRecords = xlhtAddRecordMapper.selectTXlhtAddRecordList(TXlhtAddRecord.builder().timeBegin(timeBegin).timeEnd(timeEnd).build());
|
|
result.put("8", tXlhtAddRecords.stream()
|
|
result.put("8", tXlhtAddRecords.stream()
|