寄点定时任务修改
This commit is contained in:
@ -261,11 +261,13 @@ public class ShipEnergyService {
|
|||||||
String stations = getStations();
|
String stations = getStations();
|
||||||
JSONArray jsonStation = JSON.parseArray(stations);
|
JSONArray jsonStation = JSON.parseArray(stations);
|
||||||
String finalBeginTime = beginTime;
|
String finalBeginTime = beginTime;
|
||||||
|
log.info("传入参数-统计时间:{}",beginTime);
|
||||||
jsonStation.forEach(i->{
|
jsonStation.forEach(i->{
|
||||||
JSONObject jsonObj = (JSONObject) i;
|
JSONObject jsonObj = (JSONObject) i;
|
||||||
Integer stationId = jsonObj.getInteger("stationId");
|
Integer stationId = jsonObj.getInteger("stationId");
|
||||||
String incomeHis = getIncomeHis(stationId, finalBeginTime);
|
String incomeHis = getIncomeHis(stationId, finalBeginTime);
|
||||||
JSONArray incomes = JSON.parseArray(incomeHis);
|
JSONArray incomes = JSON.parseArray(incomeHis);
|
||||||
|
log.info("远程查询-历史收益数据:{}",incomes);
|
||||||
incomes.forEach(j->{
|
incomes.forEach(j->{
|
||||||
JSONObject income = (JSONObject) j;
|
JSONObject income = (JSONObject) j;
|
||||||
String date = income.getString("date");
|
String date = income.getString("date");
|
||||||
@ -275,6 +277,7 @@ public class ShipEnergyService {
|
|||||||
List<ElecMeterValue> elecList = new ArrayList<>();
|
List<ElecMeterValue> elecList = new ArrayList<>();
|
||||||
BigDecimal inTotalIncome = BigDecimal.ZERO;
|
BigDecimal inTotalIncome = BigDecimal.ZERO;
|
||||||
BigDecimal outTotalIncome = BigDecimal.ZERO;
|
BigDecimal outTotalIncome = BigDecimal.ZERO;
|
||||||
|
log.info("远程查询-统计日期:{}",date);
|
||||||
if(finalBeginTime.equals(date)){
|
if(finalBeginTime.equals(date)){
|
||||||
//收益-充-尖
|
//收益-充-尖
|
||||||
EarningsCalculate inSharp = new EarningsCalculate();
|
EarningsCalculate inSharp = new EarningsCalculate();
|
||||||
|
|||||||
Reference in New Issue
Block a user