diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java index 99f741f..556e614 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java @@ -246,6 +246,7 @@ public class ZhipingController extends BaseController { item.setCcll(String.valueOf(pull.getCcll())); item.setEquipId(pull.getCmdid()); item.setPointId(pull.getCmdid() + "_" + pull.getPhase()); + item.setT_Sensor_Num(String.valueOf(pull.getCount())); item.calculate(); result.add(item); } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPulls.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPulls.java index 56cb092..3576f1c 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPulls.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPulls.java @@ -678,6 +678,8 @@ public class LeadPulls { private String phase; @ExcelIgnore private Integer ccll; + @ExcelIgnore + private Integer count; public String getCmdid() { return cmdid; @@ -710,4 +712,12 @@ public class LeadPulls { public void setCcll(Integer ccll) { this.ccll = ccll; } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } } \ No newline at end of file diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/HenanServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/HenanServiceImpl.java index c84b7cc..5f65fbe 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/HenanServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/HenanServiceImpl.java @@ -58,7 +58,9 @@ public class HenanServiceImpl implements HenanService { old.setMaxpullPull(old.getMaxpullPull() + item.getMaxpullPull()); old.setMaxpullWind(old.getMaxpullWind() + item.getMaxpullWind()); old.setMaxpullTilt(old.getMaxpullTilt() + item.getMaxpullTilt()); + old.setCount(old.getCount() + 1); } else { + item.setCount(1); map.put(key, item); result.add(item); }