feat: 移除无用的类

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmPageApiServiceImpl.java

@@ -17,6 +17,7 @@ import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO;
 import com.gic.haoban.manage.service.pojo.qo.HmPageTemplateQO;
 import com.gic.haoban.manage.service.service.hm.HmLinkService;
 import com.gic.haoban.manage.service.service.hm.HmPageService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -119,6 +121,12 @@ public class HmPageApiServiceImpl implements HmPageApiService {
         pageInfo.setPageNum(relationQueryDTO.getPageNum());
         pageInfo.setPageSize(relationQueryDTO.getPageSize());
         Page<HmLinkBO> hmLinkBOPage = linkService.queryPageRelationList(relationQueryDTO.getPageId(), relationQueryDTO.getEnterpriseId(), relationQueryDTO.getSearchText(), pageInfo);
+        if (CollectionUtils.isEmpty(hmLinkBOPage.getResult())) {
+            Page<HmPageRelationDTO> empty = new Page<>();
+            empty.setResult(Collections.emptyList());
+            return ServiceResponse.success(empty);
+        }
+        Page<HmPageRelationDTO> pageRelationDTOPage = PageUtil.changeToCurrentPage(hmLinkBOPage, HmPageRelationDTO.class);
         List<HmPageRelationDTO> pageRelations = hmLinkBOPage.getResult().stream()
                 .map(item -> {
                     HmPageRelationDTO pageRelation = new HmPageRelationDTO();
@@ -127,7 +135,6 @@ public class HmPageApiServiceImpl implements HmPageApiService {
                     pageRelation.setReleationId(item.getLinkCode());
                     return pageRelation;
                 }).collect(Collectors.toList());
-        Page<HmPageRelationDTO> pageRelationDTOPage = PageUtil.changeToCurrentPage(hmLinkBOPage, HmPageRelationDTO.class);
         pageRelationDTOPage.setResult(pageRelations);
         return ServiceResponse.success(pageRelationDTOPage);
     }

haoban-manage3-service/src/test/java/HmPageServiceTest.java

@@ -47,7 +47,7 @@ public class HmPageServiceTest {
     @Test
     public void queryPageList(){
         HmPageRelationQDTO pageRelationQDTO = new HmPageRelationQDTO();
-        pageRelationQDTO.setPageId(418460224953786370L);
+        pageRelationQDTO.setPageId(418487207246970883L);
         pageRelationQDTO.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000");
         pageRelationQDTO.setSearchText("LJ01419636016144465921");
         ServiceResponse<Page<HmPageRelationDTO>> pageServiceResponse = pageService.queryPageRelation(pageRelationQDTO);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java

@@ -152,7 +152,7 @@ public class WelcomeController extends WebBaseController {
      * @author : YongEn
      * @date : 2022/2/11
      */
-    @RequestMapping(value = "/remove", method = RequestMethod.GET)
+    @RequestMapping(value = "/remove")
     public RestResponse<Boolean> removeWelcome(@RequestParam("welcomeId") String welcomeId) {
         if (StringUtils.isEmpty(welcomeId)) {
             RestResponse.failure(Constant.STRING_1, "欢迎语id为空", Boolean.FALSE);
@@ -294,7 +294,7 @@ public class WelcomeController extends WebBaseController {
     }
 
     @RequestMapping(path = "/relation/list")
-    public RestResponse<PageResult2<HmWelcomeRelationDTO>> queryWelcomeRelationList(@RequestParam("welcomeId") String welcomeId,
+    public RestResponse<Page<HmWelcomeRelationDTO>> queryWelcomeRelationList(@RequestParam("welcomeId") String welcomeId,
                                                                                     @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         QueryWelcomeRelationQDTO queryWelcomeRelationQDTO = new QueryWelcomeRelationQDTO();
@@ -304,7 +304,7 @@ public class WelcomeController extends WebBaseController {
         ServiceResponse<Page<HmWelcomeRelationDTO>> serviceResponse = welcomeRelationApiService.queryWelcomeRelation(queryWelcomeRelationQDTO);
         if (serviceResponse.isSuccess()) {
             Page<HmWelcomeRelationDTO> result = serviceResponse.getResult();
-            return RestResponse.successResult(PageUtil.getPageInfo(result));
+            return RestResponse.successResult(result);
         }
         return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -113,6 +113,4 @@
 					 timeout="10000" retries="0" check="false" />
 	<dubbo:reference id="hmQrcodeApiService" interface="com.gic.haoban.manage.api.service.hm.HmQrcodeApiService"
 					 timeout="10000" retries="0" check="false" />
-	<dubbo:reference id="hmClerkRelationApiService" interface="com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService"
-					 timeout="10000" retries="0" check="false" />
 </beans>