From ffa25d2aa13b431de00a5852e26cd75f578e07b5 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 28 Jul 2022 10:45:59 +0800 Subject: [PATCH] asd --- .../modules/visit/controller/VisitVisitorController.java | 4 ++-- .../epmet/plugin/power/modules/visit/dao/VisitVisitorDao.java | 4 +++- .../power/modules/visit/service/VisitVisitorService.java | 2 +- .../modules/visit/service/impl/VisitVisitorServiceImpl.java | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/controller/VisitVisitorController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/controller/VisitVisitorController.java index 22f42fb..843ca47 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/controller/VisitVisitorController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/controller/VisitVisitorController.java @@ -91,10 +91,10 @@ public class VisitVisitorController { @NoRepeatSubmit @PostMapping("chart/traffic") - public Result getTraffic(@RequestBody VisitVisitorChartFormDTO dto) { + public Result> getTraffic(@RequestBody VisitVisitorChartFormDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - return new Result().ok(visitVisitorService.getTraffic(dto)); + return new Result>().ok(visitVisitorService.getTraffic(dto)); } } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/dao/VisitVisitorDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/dao/VisitVisitorDao.java index 1f07b9b..11c10b9 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/dao/VisitVisitorDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/dao/VisitVisitorDao.java @@ -6,6 +6,8 @@ import com.epmet.plugin.power.dto.visit.result.VisitVisitorChartResultDTO; import com.epmet.plugin.power.modules.visit.entity.VisitVisitorEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 租客表 * @@ -23,5 +25,5 @@ public interface VisitVisitorDao extends BaseDao { * @author generator * @date 2022-07-26 */ - VisitVisitorChartResultDTO getTraffic(VisitVisitorChartFormDTO dto); + List getTraffic(VisitVisitorChartFormDTO dto); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/VisitVisitorService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/VisitVisitorService.java index 8264fc8..46efafa 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/VisitVisitorService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/VisitVisitorService.java @@ -97,7 +97,7 @@ public interface VisitVisitorService extends BaseService { * @author generator * @date 2022-07-26 */ - VisitVisitorChartResultDTO getTraffic(VisitVisitorChartFormDTO dto); + List getTraffic(VisitVisitorChartFormDTO dto); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/impl/VisitVisitorServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/impl/VisitVisitorServiceImpl.java index 4623b03..b4b1a57 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/impl/VisitVisitorServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/impl/VisitVisitorServiceImpl.java @@ -133,7 +133,7 @@ public class VisitVisitorServiceImpl extends BaseServiceImpl getTraffic(VisitVisitorChartFormDTO dto) { if (StringUtils.isBlank(dto.getDate())) { dto.setDate(LocalDate.now().toString()); }