From eae74e1ce252e9ff48207d2c2aea36756858b157 Mon Sep 17 00:00:00 2001 From: YUJT Date: Sat, 23 Apr 2022 10:32:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=8F=AF=E8=A7=86=E5=8C=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=BB=9F=E4=B8=80=E6=94=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PowerAxisStructViewController.java | 78 ---------- ...owerAxiskernelHouseholdViewController.java | 52 ------- .../PowerViewServiceStationController.java | 37 ----- .../PowerAxisDataVisualController.java | 136 ++++++++++++++++++ 4 files changed, 136 insertions(+), 167 deletions(-) delete mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java delete mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java delete mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java deleted file mode 100644 index f398dbd..0000000 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.epmet.plugin.power.modules.axis.ViewController; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.axis.ResultDTO; -import com.epmet.plugin.power.dto.axis.form.PowerAxisLeaderDetailFormDTO; - -import com.epmet.plugin.power.dto.axis.form.PowerAxisStructStructTreeFormDTO; -import com.epmet.plugin.power.dto.axis.form.PowerAxisStructViewFormDTO; -import com.epmet.plugin.power.dto.axis.result.*; -import com.epmet.plugin.power.modules.axis.service.PowerAxisLeaderService; -import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/data/axis") -public class PowerAxisStructViewController { - - @Autowired - private PowerAxisStructService powerAxisStructService; - - @Autowired - private PowerAxisLeaderService powerAxisLeaderService; - - /** - * 关键指标统计 - * @param form - * @return com.epmet.commons.tools.utils.Result - * @author LZN - * @date 2022/4/23 10:20 - */ - @PostMapping("/statistics") - public Result getStatistics(@RequestBody PowerAxisStructViewFormDTO form){ - PowerAxisStructViewResultDTO result = powerAxisStructService.getStatistics(form); - return new Result().ok(result); - } - - /** - * 动力主轴负责人详细信息 - * @param form - * @return com.epmet.commons.tools.utils.Result - * @author LZN - * @date 2022/4/23 10:20 - */ - @PostMapping("/leader") - public Result getLeaderDetail(@RequestBody PowerAxisLeaderDetailFormDTO form){ - PowerAxisLeaderDetailResultDTO dto = powerAxisLeaderService.getLeaderDetail(form); - return new Result().ok(dto); - } - - /** - * 动力主轴结构树 - * @param form - * @return com.epmet.commons.tools.utils.Result - * @author LZN - * @date 2022/4/23 10:20 - */ - @PostMapping("/structTree") - public Result getStructTree(@RequestBody PowerAxisStructStructTreeFormDTO form){ - List dto = powerAxisStructService.getStructTree(form); - return new Result().ok(dto); - } - - /** - * 动力主轴节点坐标集合 - * @param structLevel - * @return com.epmet.plugin.power.dto.axis.ResultDTO - * @author LZN - * @date 2022/4/23 10:19 - */ - @PostMapping("/{structLevel}/listPosition") - public ResultDTO getListPosition(@PathVariable int structLevel){ - List list = powerAxisStructService.getListPosition(structLevel); - return ResultDTO.success("成功",list,powerAxisStructService.queryTotal(structLevel)); - } -} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java deleted file mode 100644 index 186d03f..0000000 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.epmet.plugin.power.modules.axis.ViewController; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.axis.ResultDTO; -import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseHoldViewListFormDTO; -import com.epmet.plugin.power.dto.axis.form.PowerKernelListPostitionFormDTO; -import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO; -import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO; -import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - - -@RestController -@RequestMapping("/data/kernelHousehold") -public class PowerAxiskernelHouseholdViewController { - - @Autowired - private PowerKernelHouseholdService powerKernelHouseholdService; - - - /** - * 党员中心户列表 - * @param form - * @return com.epmet.plugin.power.dto.axis.ResultDTO - * @author LZN - * @date 2022/4/23 10:20 - */ - @PostMapping("/list") - public ResultDTO getList(@RequestBody PowerKernelHouseHoldViewListFormDTO form){ - List dto = powerKernelHouseholdService.getList(form); - return ResultDTO.success("查询成功",dto,powerKernelHouseholdService.getTotal(form)); - } - - /** - * 党员中心户坐标集合 - * @param form - * @return com.epmet.plugin.power.dto.axis.ResultDTO - * @author LZN - * @date 2022/4/23 10:20 - */ - @PostMapping("/listPosition") - public ResultDTO getListPosition(@RequestBody PowerKernelListPostitionFormDTO form){ - List dto = powerKernelHouseholdService.getListPosition(form); - return ResultDTO.success("成功",dto,powerKernelHouseholdService.getListTotal(form)); - } -} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java deleted file mode 100644 index 308d597..0000000 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.epmet.plugin.power.modules.axis.ViewController; - -import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.GBaseDialect; -import com.epmet.plugin.power.dto.axis.ResultDTO; -import com.epmet.plugin.power.dto.axis.form.PowerAxisServiceStationFormDTO; -import com.epmet.plugin.power.dto.axis.result.PowerAxisServiceStationResultDTO; -import com.epmet.plugin.power.modules.axis.service.PowerServiceStationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.xml.transform.Result; -import java.util.List; - -@RestController -@RequestMapping("/data/serviceStation") -public class PowerViewServiceStationController { - - @Autowired - private PowerServiceStationService powerServiceStationService; - - /** - * 党群服务站集合坐标 - * @param form - * @return com.epmet.plugin.power.dto.axis.ResultDTO - * @author LZN - * @date 2022/4/22 19:53 - */ - @PostMapping("/listPosition") - public ResultDTO getListPostition(@RequestBody PowerAxisServiceStationFormDTO form){ - List list = powerServiceStationService.getListPosition(form); - return ResultDTO.success("成功",list,powerServiceStationService.queryTotal(form)); - } - -} 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 new file mode 100644 index 0000000..b98a9c2 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java @@ -0,0 +1,136 @@ +package com.epmet.plugin.power.modules.axis.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.plugin.power.dto.axis.ResultDTO; +import com.epmet.plugin.power.dto.axis.form.*; +import com.epmet.plugin.power.dto.axis.result.*; +import com.epmet.plugin.power.modules.axis.service.PowerAxisLeaderService; +import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService; +import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService; +import com.epmet.plugin.power.modules.axis.service.PowerServiceStationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/*** + * 动力主轴相关数据可视化接口 + * @author work@yujt.net.cn + * @date 2022/4/23/0023 10:27 + */ +@RestController +@RequestMapping("data") +public class PowerAxisDataVisualController { + + @Autowired + private PowerAxisStructService powerAxisStructService; + + @Autowired + private PowerAxisLeaderService powerAxisLeaderService; + + @Autowired + private PowerServiceStationService powerServiceStationService; + + @Autowired + private PowerKernelHouseholdService powerKernelHouseholdService; + + /** + * 党群服务站集合坐标 + * + * @param form + * @return com.epmet.plugin.power.dto.axis.ResultDTO + * @author LZN + * @date 2022/4/22 19:53 + */ + @PostMapping("serviceStation/listPosition") + public ResultDTO getListPostition(@RequestBody PowerAxisServiceStationFormDTO form) { + List list = powerServiceStationService.getListPosition(form); + return ResultDTO.success("成功", list, powerServiceStationService.queryTotal(form)); + } + + /** + * 关键指标统计 + * + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/4/23 10:20 + */ + @PostMapping("axis/statistics") + public Result getStatistics(@RequestBody PowerAxisStructViewFormDTO form) { + PowerAxisStructViewResultDTO result = powerAxisStructService.getStatistics(form); + return new Result().ok(result); + } + + /** + * 动力主轴负责人详细信息 + * + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/4/23 10:20 + */ + @PostMapping("axis/leader") + public Result getLeaderDetail(@RequestBody PowerAxisLeaderDetailFormDTO form) { + PowerAxisLeaderDetailResultDTO dto = powerAxisLeaderService.getLeaderDetail(form); + return new Result().ok(dto); + } + + /** + * 动力主轴结构树 + * + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/4/23 10:20 + */ + @PostMapping("axis/structTree") + public Result getStructTree(@RequestBody PowerAxisStructStructTreeFormDTO form) { + List dto = powerAxisStructService.getStructTree(form); + return new Result().ok(dto); + } + + /** + * 动力主轴节点坐标集合 + * + * @param structLevel + * @return com.epmet.plugin.power.dto.axis.ResultDTO + * @author LZN + * @date 2022/4/23 10:19 + */ + @PostMapping("axis/{structLevel}/listPosition") + public ResultDTO getListPosition(@PathVariable int structLevel) { + List list = powerAxisStructService.getListPosition(structLevel); + return ResultDTO.success("成功", list, powerAxisStructService.queryTotal(structLevel)); + } + + + /** + * 党员中心户列表 + * + * @param form + * @return com.epmet.plugin.power.dto.axis.ResultDTO + * @author LZN + * @date 2022/4/23 10:20 + */ + @PostMapping("kernelHousehold/list") + public ResultDTO getList(@RequestBody PowerKernelHouseHoldViewListFormDTO form) { + List dto = powerKernelHouseholdService.getList(form); + return ResultDTO.success("查询成功", dto, powerKernelHouseholdService.getTotal(form)); + } + + /** + * 党员中心户坐标集合 + * + * @param form + * @return com.epmet.plugin.power.dto.axis.ResultDTO + * @author LZN + * @date 2022/4/23 10:20 + */ + @PostMapping("kernelHousehold/listPosition") + public ResultDTO getListPosition(@RequestBody PowerKernelListPostitionFormDTO form) { + List dto = powerKernelHouseholdService.getListPosition(form); + return ResultDTO.success("成功", dto, powerKernelHouseholdService.getListTotal(form)); + } + +}