启动配置修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -811,6 +811,7 @@ public class BenchmarkingService {
                 vo.setOrdernum(station.get(i.getWindpowerstationId()).doubleValue());
             } else if (type.equals(TYPE_PROJECT)) {
                 vo.setId(i.getProjectId());
+
                 vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getAname());
                 vo.setOrdernum(CacheContext.pjmap.get(i.getProjectId().trim()).getOrderNum().doubleValue());
             } else if (type.equals(TYPE_LINE)) {

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -1319,7 +1319,7 @@ public class MonitorService {
 
 
             for (ProBasicPowerstation wp : wplist) {
-                if (wpId.contains(wp.getId()) && wp.getSpare4().equals("1")) {
+                if (wpId.contains(wp.getId()) && wp.getWindType().equals("-1")) {
                     //清洁能源风电装机容量
                     qjny_fd_zjrl += null != wp.getWindCapacity() ? wp.getWindCapacity() : 0.0;
 
@@ -1336,7 +1336,7 @@ public class MonitorService {
                     cblpoint.put("jr_fd_zjrl", StringUtils.round(jr_fd_zjrl / 1000, 2));
                     cblpoint.put("qjny_fj_ts", StringUtils.round(qjny_fj_ts, 2));
                     cblpoint.put("jr_fj_ts", StringUtils.round(jr_fj_ts, 2));
-                } else if (wpId.contains(wp.getId()) && wp.getSpare4().equals("2")) {
+                } else if (wpId.contains(wp.getId()) && wp.getWindType().equals("-2")) {
 
                     //清洁能源光伏装机容量
                     qjny_gf_zjrl += null != wp.getCapacity() ? wp.getCapacity() : 0.0;

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/StationMonitorService.java

@@ -233,7 +233,7 @@ public class StationMonitorService {
         nfdl = new BigDecimal(nfdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
         nfdl1 = nfdl1.divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP);
         resultMap.put("nfdl", nfdl1.add(BigDecimal.valueOf(rfdl)));
-        if (proBasicPowerstation.getSpare4().equals("1")) {
+        if (proBasicPowerstation.getWindType().equals("-1")) {
             resultMap.put("sspjfsgzd", realData.get(24).getPointValueInDouble());
         }else {
             resultMap.put("sspjfsgzd", realData1.get(0).getPointValueInDouble());