diff --git a/src/main/java/com/eactive/apim/portal/apps/main/controller/IndexController.java b/src/main/java/com/eactive/apim/portal/apps/main/controller/IndexController.java index a677c05..ce1c3e3 100644 --- a/src/main/java/com/eactive/apim/portal/apps/main/controller/IndexController.java +++ b/src/main/java/com/eactive/apim/portal/apps/main/controller/IndexController.java @@ -41,14 +41,7 @@ public class IndexController { @GetMapping("/") public String index(Model model) { - Map propertyMap = portalPropertyService.getPortalPropertiesAsMap("Portal"); - String serviceList = propertyMap.get("main.service.list"); - // Step 1: Fetch and sort API services - List apiServices = getSortedApiServices(null); - - // Step 2: Calculate total API count - int totalApiCount = calculateTotalApiCount(apiServices); - + List services = mainApiFacade.getOpenApiServices(); List hashTags = mainApiFacade.getHashTags(); ApiGroupSearch search = new ApiGroupSearch(); @@ -56,34 +49,19 @@ public class IndexController { int selectedApiCount = (int) searchResult.get("selectedApiCount"); - // 서비스 이용 수 int serviceCount = ((List) searchResult.get("services")).size(); // 승인된 기업 건수 int approvedOrgCount = mainApiFacade.getApprovedOrgCount(); - addAttributesToModel(model, apiServices, totalApiCount, hashTags, serviceCount, approvedOrgCount, selectedApiCount); + addAttributesToModel(model, services, hashTags, serviceCount, approvedOrgCount, selectedApiCount); return "apps/main/index"; } - private List getSortedApiServices(String apiId) { - List apiServices = mainApiFacade.getOpenApiServices(apiId); - apiServices.sort(Comparator.comparing(ApiServiceDTO::getDisplayOrder)); - return apiServices; - } - - private int calculateTotalApiCount(List apiServices) { - return apiServices.stream() - .mapToInt(service -> service.getApiGroupApiList().size()) - .sum(); - } - - private void addAttributesToModel(Model model, List apiServices, - int totalApiCount, List hashTags, int serviceCount, int approvedOrgCount, int selectedApiCount) { + private void addAttributesToModel(Model model, List apiServices, List hashTags, int serviceCount, int approvedOrgCount, int selectedApiCount) { model.addAttribute("services", apiServices); - model.addAttribute("totalApiCount", totalApiCount); model.addAttribute("hashtags", hashTags); model.addAttribute("serviceCount", serviceCount); diff --git a/src/main/java/com/eactive/apim/portal/apps/main/service/MainApiFacade.java b/src/main/java/com/eactive/apim/portal/apps/main/service/MainApiFacade.java index f0b07ba..d802bd4 100644 --- a/src/main/java/com/eactive/apim/portal/apps/main/service/MainApiFacade.java +++ b/src/main/java/com/eactive/apim/portal/apps/main/service/MainApiFacade.java @@ -7,17 +7,13 @@ import com.eactive.apim.portal.apps.apiservice.dto.ApiServiceDTO; import com.eactive.apim.portal.apps.apiservice.service.ApiServiceService; import com.eactive.apim.portal.apps.user.service.PortalOrgService; import com.eactive.apim.portal.portalproperty.service.PortalPropertyService; - import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; - import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; @Transactional @Service @@ -34,17 +30,13 @@ public class MainApiFacade { return portalOrgService.getActiveApprovedOrgCount(); } - public List getOpenApiServices(String serviceId) { + public List getOpenApiServices() { ApiGroupSearch search = new ApiGroupSearch(); Map property = portalPropertyService.getPortalPropertiesAsMap(PORTAL_PROPERTY); String services = property.getOrDefault("main.service.list", ""); - if (StringUtils.hasText(serviceId) && services.contains(serviceId)) { - search.setGroupIds(Collections.singletonList(serviceId)); - } else { - search.setGroupIds(Arrays.asList(services.split(","))); - } + search.setGroupIds(Arrays.asList(services.replace(" ", "").split(","))); return apiServiceService.searchApiGroups(search); } diff --git a/src/main/resources/templates/views/apps/main/index.html b/src/main/resources/templates/views/apps/main/index.html index 1f5b645..a27a593 100644 --- a/src/main/resources/templates/views/apps/main/index.html +++ b/src/main/resources/templates/views/apps/main/index.html @@ -147,44 +147,22 @@
-
-

금융서비스

+ +
+

API 서비스

- 금융 서비스 설명이 표시됩니다. 금융 서비스 설명이 표시됩니다. 금융 서비스 설명이 표시됩니다. + 서비스 설명 + + 광주은행 API 서비스를 이용해보세요. +

- 금융서비스 -
-
- -
-

대출금리비교

-

- 대출금리비교 설명이 표시됩니다. 대출금리비교 설명이 표시됩니다. 대출금리비교 설명이 표시됩니다. -

-
- 대출금리비교 -
-
- -
-

소액해외송금

-

- 소액해외송금 설명이 표시됩니다. 소액해외송금 설명이 표시됩니다. 소액해외송금 설명이 표시됩니다. -

-
- 소액해외송금 -
-
- - -
-

P2P투자대출

-

- P2P투자대출 설명이 표시됩니다. P2P투자대출 설명이 표시됩니다. P2P투자대출 설명이 표시됩니다. -

-
- 간편결제 + +
diff --git a/src/main/resources/templates/views/apps/mypage/updateCorporateManager.html b/src/main/resources/templates/views/apps/mypage/updateCorporateManager.html index cb42a3e..7bc2735 100644 --- a/src/main/resources/templates/views/apps/mypage/updateCorporateManager.html +++ b/src/main/resources/templates/views/apps/mypage/updateCorporateManager.html @@ -24,7 +24,7 @@