diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ScreenAgencyResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ScreenAgencyResultDTO.java new file mode 100644 index 0000000000..2a3406628d --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ScreenAgencyResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description 大屏 返回 + * @Author lc + * @Date + */ +@NoArgsConstructor +@Data +public class ScreenAgencyResultDTO implements Serializable { + private static final long serialVersionUID = -1098032063828430218L; + private String id; + private String level; + private String name; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 79299b691a..2e4097479f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -661,9 +661,9 @@ public class HouseController implements ResultDataResolver { * @Date: 2023/11/23 16:59 */ @GetMapping("getMicroGridHouseName") - public Result getMicroGridHouseName(String levelId,String level) { - String result = houseService.getMicroGridHouseName(levelId,level); - return new Result().ok(result); + public Result getMicroGridHouseName(String levelId,String level) { + ScreenAgencyResultDTO result = houseService.getMicroGridHouseName(levelId,level); + return new Result().ok(result); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index d53636a394..b58cea97b4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -200,7 +200,7 @@ public interface HouseService { boolean removeMicroGridHouse(HouseRemoveMicroGridFormDTO dto); - String getMicroGridHouseName(String levelId, String level); + ScreenAgencyResultDTO getMicroGridHouseName(String levelId, String level); List getStreeHouseStatistics(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 821cbfd8f2..411c61ee81 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1345,7 +1345,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } @Override - public String getMicroGridHouseName(String levelId, String level) { + public ScreenAgencyResultDTO getMicroGridHouseName(String levelId, String level) { + + ScreenAgencyResultDTO resultDTO = new ScreenAgencyResultDTO(); String result = ""; @@ -1358,7 +1360,11 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { }else if (level.equals("building")){ result = icBuildingDao.getMicroGridBuildingName(levelId); } - return result; + resultDTO.setName(result); + resultDTO.setId(levelId); + resultDTO.setLevel(level); + + return resultDTO; } @Override