dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
374 changed files with 55297 additions and 1120 deletions
Showing only changes of commit 2c9cc1f1d4 - Show all commits

View File

@ -259,14 +259,15 @@ public class StrategyPoller {
for (EmsPointMatch pointMatch : pointMatchList) { for (EmsPointMatch pointMatch : pointMatchList) {
WriteTagConfig writeTag = new WriteTagConfig(); WriteTagConfig writeTag = new WriteTagConfig();
writeTag.setAddress(pointMatch.getIpAddress()); writeTag.setAddress(pointMatch.getIpAddress());
if (ChargeStatus.CHARGING.equals(chargeStatus)) { // if (ChargeStatus.CHARGING.equals(chargeStatus)) {
writeTag.setValue(chargeDischargePower); // writeTag.setValue(chargeDischargePower);
} else if (ChargeStatus.DISCHARGING.equals(chargeStatus)) { // } else if (ChargeStatus.DISCHARGING.equals(chargeStatus)) {
writeTag.setValue(chargeDischargePower.negate()); // writeTag.setValue(chargeDischargePower);
} else { // } else {
// 待机状态-电池簇PCS有功功率给定置0 // // 待机状态-电池簇PCS有功功率给定置0
writeTag.setValue(chargeDischargePower); // writeTag.setValue(chargeDischargePower);
} // }
writeTag.setValue(chargeDischargePower);
writeTags.add(writeTag); writeTags.add(writeTag);
} }
return writeTags; return writeTags;