diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java index 8242c23..ffac0fa 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java @@ -68,6 +68,22 @@ public class PowerAxisDataVisualController { return new Result().ok(result); } + /** + * 关键指标统计 for 市北大屏 + * + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/4/23 10:20 + */ + @PostMapping("axis/screen/statistics") + public Result getStatisticsForScreen(@RequestBody PowerAxisStructViewFormDTO form) { + form.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1"); + ValidatorUtils.validateEntity(form); + PowerAxisStructViewResultDTO result = powerAxisStructService.getStatistics(form); + return new Result().ok(result); + } + /** * 动力主轴负责人详细信息 * @@ -96,6 +112,20 @@ public class PowerAxisDataVisualController { return new Result().ok(dto); } + /** + * 动力主轴结构树 + * + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/4/23 10:20 + */ + @PostMapping("axis/screen/structTree") + public Result getStructTreeForScreen(@RequestBody PowerAxisStructStructTreeFormDTO form) { + List dto = powerAxisStructService.getStructTreeForScreen(form); + return new Result().ok(dto); + } + /** * 动力主轴节点坐标集合 * diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java index 1e1c231..615bee1 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java @@ -165,4 +165,6 @@ public interface PowerAxisStructService extends BaseService getStructTreeForScreen(PowerAxisStructStructTreeFormDTO form); } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index da4ee30..1aee84b 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -274,4 +274,11 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl getStructTreeForScreen(PowerAxisStructStructTreeFormDTO form) { + form.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1"); + List dto = baseDao.getStructTree(form); + return TreeUtils.build(dto); + } }