|
|
@@ -10,7 +10,6 @@ import com.gyee.runeconomy.model.fitting.ProEconInPowerCurveFitting;
|
|
|
import com.gyee.runeconomy.service.auto.*;
|
|
|
import com.gyee.runeconomy.service.fitting.IProBasicOrganizeEquipmentService;
|
|
|
import com.gyee.runeconomy.service.fitting.IProEconInPowerCurveFittingService;
|
|
|
-import com.gyee.runeconomy.service.fitting.ProBasicOrganizeEquipmentServiceImpl;
|
|
|
import com.gyee.runeconomy.service.realtimelibrary.TheoreticalPowerService;
|
|
|
import com.gyee.runeconomy.util.redis.RedisService;
|
|
|
import org.slf4j.Logger;
|
|
|
@@ -548,7 +547,7 @@ public class CacheContext implements CommandLineRunner {
|
|
|
|
|
|
//树形线路
|
|
|
lnls = proBasicOrganizeTrees.stream().filter(i -> StringUtils.isNotNull(pjmap.get(i.getParentCode()))).collect(Collectors.toList());
|
|
|
- /*lnls.stream().forEach(l -> {
|
|
|
+ lnls.stream().forEach(l -> {
|
|
|
lnmap.put(l.getId(), l);
|
|
|
if (prolinemap.containsKey(l.getOrgType().contains("EG"))) {
|
|
|
prolinemap.get(l.getOrgType().contains("EG")).add(l);
|
|
|
@@ -561,7 +560,7 @@ public class CacheContext implements CommandLineRunner {
|
|
|
Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(lnString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
|
|
|
});
|
|
|
linepointmap.put(l.getId(), stringWindpowerstationpointnewMap);
|
|
|
- });*/
|
|
|
+ });
|
|
|
|
|
|
|
|
|
for (ProBasicOrganizeTree wp : wpls) {
|
