|
@@ -3,6 +3,7 @@ package com.gyee.runeconomy.service.Application;
|
|
|
import com.gyee.common.contant.ContantXk;
|
|
|
import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
|
|
|
import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
|
|
|
+import com.gyee.runeconomy.util.MathUtil;
|
|
|
import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -78,11 +79,11 @@ public class CompanylossesService {
|
|
|
double rxdssdl = rxdtjss + rxdjclss;
|
|
|
double rslssdl = rcwsldwss + rcwsltqss;
|
|
|
|
|
|
- map.put("rgzssdl",rgzssdl /10000);
|
|
|
- map.put("rwhssdl",rwhssdl /10000);
|
|
|
- map.put("rxnssdl",rxnssdl1 /10000);
|
|
|
- map.put("rxdssdl",rxdssdl /10000);
|
|
|
- map.put("rslssdl",rslssdl /10000);
|
|
|
+ map.put("rgzssdl",MathUtil.twoBit(rgzssdl /10000));
|
|
|
+ map.put("rwhssdl",MathUtil.twoBit(rwhssdl /10000));
|
|
|
+ map.put("rxnssdl",MathUtil.twoBit(rxnssdl1 /10000));
|
|
|
+ map.put("rxdssdl",MathUtil.twoBit(rxdssdl /10000));
|
|
|
+ map.put("rslssdl",MathUtil.twoBit(rslssdl /10000));
|
|
|
|
|
|
double ygzss = 0.0;
|
|
|
double ycnslgzss = 0.0;
|
|
@@ -138,11 +139,11 @@ public class CompanylossesService {
|
|
|
double yxnssdl = ydjss + yqxjclss + ysdtjss + yxnss;
|
|
|
double yxdssdl = yxdtjss + yxdjclss;
|
|
|
double yslssdl = ycwsldwss + ycwsltqss;
|
|
|
- map.put("ygzssdl",ygzssdl /10000);
|
|
|
- map.put("ywhssdl",ywhssdl /10000);
|
|
|
- map.put("yxnssdl",yxnssdl /10000);
|
|
|
- map.put("yxdssdl",yxdssdl /10000);
|
|
|
- map.put("yslssdl", yslssdl /10000);
|
|
|
+ map.put("ygzssdl",MathUtil.twoBit(ygzssdl /10000));
|
|
|
+ map.put("ywhssdl",MathUtil.twoBit(ywhssdl /10000));
|
|
|
+ map.put("yxnssdl",MathUtil.twoBit(yxnssdl /10000));
|
|
|
+ map.put("yxdssdl",MathUtil.twoBit(yxdssdl /10000));
|
|
|
+ map.put("yslssdl",MathUtil.twoBit(yslssdl /10000));
|
|
|
double ngzss = 0.0;
|
|
|
double ncnsslgzss = 0.0;
|
|
|
double njxss = 0.0;
|
|
@@ -196,11 +197,11 @@ public class CompanylossesService {
|
|
|
double nxnssdl = ndjss + nqxjclss + nsdtjssdl + nxnss;
|
|
|
double nxdssdl = nxdjclss + nxdtjss;
|
|
|
double nslssdl = ncwsldwss + ncwsltqss;
|
|
|
- map.put("ngzssdl",ngzssdl /10000);
|
|
|
- map.put("nwhssdl",nwhssdl /10000);
|
|
|
- map.put("nxnssdl",nxnssdl /10000);
|
|
|
- map.put("nxdssdl",nxdssdl /10000);
|
|
|
- map.put("nslssdl",nslssdl /10000);
|
|
|
+ map.put("ngzssdl",MathUtil.twoBit(ngzssdl /10000));
|
|
|
+ map.put("nwhssdl",MathUtil.twoBit(nwhssdl /10000));
|
|
|
+ map.put("nxnssdl",MathUtil.twoBit(nxnssdl /10000));
|
|
|
+ map.put("nxdssdl",MathUtil.twoBit(nxdssdl /10000));
|
|
|
+ map.put("nslssdl",MathUtil.twoBit(nslssdl /10000));
|
|
|
|
|
|
return map;
|
|
|
}
|