fix: 补上传感器个数

dev
huangfeng 12 months ago
parent e77b337fdd
commit 8a39bb2b4c

@ -246,6 +246,7 @@ public class ZhipingController extends BaseController {
item.setCcll(String.valueOf(pull.getCcll())); item.setCcll(String.valueOf(pull.getCcll()));
item.setEquipId(pull.getCmdid()); item.setEquipId(pull.getCmdid());
item.setPointId(pull.getCmdid() + "_" + pull.getPhase()); item.setPointId(pull.getCmdid() + "_" + pull.getPhase());
item.setT_Sensor_Num(String.valueOf(pull.getCount()));
item.calculate(); item.calculate();
result.add(item); result.add(item);
} }

@ -678,6 +678,8 @@ public class LeadPulls {
private String phase; private String phase;
@ExcelIgnore @ExcelIgnore
private Integer ccll; private Integer ccll;
@ExcelIgnore
private Integer count;
public String getCmdid() { public String getCmdid() {
return cmdid; return cmdid;
@ -710,4 +712,12 @@ public class LeadPulls {
public void setCcll(Integer ccll) { public void setCcll(Integer ccll) {
this.ccll = ccll; this.ccll = ccll;
} }
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
} }

@ -58,7 +58,9 @@ public class HenanServiceImpl implements HenanService {
old.setMaxpullPull(old.getMaxpullPull() + item.getMaxpullPull()); old.setMaxpullPull(old.getMaxpullPull() + item.getMaxpullPull());
old.setMaxpullWind(old.getMaxpullWind() + item.getMaxpullWind()); old.setMaxpullWind(old.getMaxpullWind() + item.getMaxpullWind());
old.setMaxpullTilt(old.getMaxpullTilt() + item.getMaxpullTilt()); old.setMaxpullTilt(old.getMaxpullTilt() + item.getMaxpullTilt());
old.setCount(old.getCount() + 1);
} else { } else {
item.setCount(1);
map.put(key, item); map.put(key, item);
result.add(item); result.add(item);
} }

Loading…
Cancel
Save