|
@@ -10,12 +10,10 @@ import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
|
|
|
import com.gyee.generation.model.auto.ProEconPowerstationInfoDay2;
|
|
|
import com.gyee.generation.service.auto.IProEconPowerstationInfoDay2Service;
|
|
|
import com.gyee.generation.util.PointUtil;
|
|
|
-import com.gyee.generation.util.realtimesource.EdosUtil;
|
|
|
import com.gyee.generation.util.realtimesource.IEdosUtil;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
-import javax.smartcardio.CardChannel;
|
|
|
import java.util.*;
|
|
|
|
|
|
/*
|
|
@@ -93,10 +91,10 @@ public class CalculationService {
|
|
|
double nfdl = edosUtil.getSectionData(nfdlPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
double yllfdl = edosUtil.getSectionData(yllfdlPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
double rfdl = edosUtil.getSectionData(rfdlPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- jym = yfdl * 0.37;
|
|
|
- jys = yfdl * 3.05;
|
|
|
- jyeyht = yfdl * 0.8568;
|
|
|
- jyeyhl = yfdl * 0.0059;
|
|
|
+ jym = yfdl * 0.37 / 1000;
|
|
|
+ jys = yfdl * 3.05 / 1000;
|
|
|
+ jyeyht = yfdl * 0.8568 / 1000;
|
|
|
+ jyeyhl = yfdl * 0.0059 / 1000;
|
|
|
rlyxs = rfdl / (wp.getJrwindCapacity()+wp.getJrCapacity());
|
|
|
ylyxs = yfdl / (wp.getJrwindCapacity()+wp.getJrCapacity());
|
|
|
nlyxs = nfdl / (wp.getJrwindCapacity()+wp.getJrCapacity());
|