Merge remote-tracking branch 'origin/dev' into dev

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SearchBiz.java

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -65,7 +66,7 @@ public class SearchBiz {
     /**
      * 业务个数
      */
-    private static final int SERVICE_COUNT = 5;
+    private static final int SERVICE_COUNT = 6;
 
     private final ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
@@ -95,8 +96,11 @@ public class SearchBiz {
                     pageDataVOs.getData().forEach(v -> {
                         v.setUccnCataList(initUccnCataCollect(v.getConfig()));
                     });
-                    vehicleModelVoServiceResultVo.setTotalCount(pageDataVOs.getTotalCount());
-                    vehicleModelVoServiceResultVo.setData(pageDataVOs.getData());
+
+                    long totalCount = pageDataVOs==null?0:pageDataVOs.getTotalCount()==null?0:pageDataVOs.getTotalCount();
+                    List<VehicleModelVo> result = pageDataVOs == null ? Collections.EMPTY_LIST : pageDataVOs.getData() == null ? Collections.EMPTY_LIST : pageDataVOs.getData();
+                    vehicleModelVoServiceResultVo.setTotalCount(totalCount);
+                    vehicleModelVoServiceResultVo.setData(result);
                     searchResultVo.put(ServiceConstant.VEHICLE, vehicleModelVoServiceResultVo);
                 } catch (Exception ex) {
                     ex.printStackTrace();
@@ -116,8 +120,11 @@ public class SearchBiz {
                     branchCompanyFindDTO.setLimit(ServiceConstant.BRANCH_COMPANY_LIMIT);
                     branchCompanyFindDTO.setName(keyWord);
                     PageDataVO<BranchCompanyListVO> branchCompanyWithPage = vehicleFeign.findBranchCompanyWithPage(branchCompanyFindDTO);
-                    branchCompanyListVOServiceResultVo.setTotalCount(branchCompanyWithPage.getTotalCount());
-                    branchCompanyListVOServiceResultVo.setData(branchCompanyWithPage.getData());
+
+                    long totalCount = branchCompanyWithPage==null?0:branchCompanyWithPage.getTotalCount()==null?0:branchCompanyWithPage.getTotalCount();
+                    List<BranchCompanyListVO> result = branchCompanyWithPage == null ? Collections.EMPTY_LIST : branchCompanyWithPage.getData() == null ? Collections.EMPTY_LIST : branchCompanyWithPage.getData();
+                    branchCompanyListVOServiceResultVo.setTotalCount(totalCount);
+                    branchCompanyListVOServiceResultVo.setData(result);
                     searchResultVo.put(ServiceConstant.BRANCH_COMPANY, branchCompanyListVOServiceResultVo);
                 } catch (Exception ex) {
                     ex.printStackTrace();
@@ -134,8 +141,10 @@ public class SearchBiz {
                     ServiceResultVo<TourGood> tourGoodServiceResultVo = new ServiceResultVo<>();
                     ObjectRestResponse<PageDataVO<TourGood>> goodList = tourFeign.getGoodList(1, ServiceConstant.TOUR_LIMIT, null, keyWord);
                     PageDataVO<TourGood> data = goodList.getData();
-                    tourGoodServiceResultVo.setData(data.getData());
-                    tourGoodServiceResultVo.setTotalCount(data.getTotalCount());
+                    long totalCount = data==null?0:data.getTotalCount()==null?0:data.getTotalCount();
+                    List<TourGood> result = data == null ? Collections.EMPTY_LIST : data.getData() == null ? Collections.EMPTY_LIST : data.getData();
+                    tourGoodServiceResultVo.setData(result);
+                    tourGoodServiceResultVo.setTotalCount(totalCount);
                     searchResultVo.put(ServiceConstant.TROUR, tourGoodServiceResultVo);
                 } catch (Exception ex) {
                     ex.printStackTrace();
@@ -158,8 +167,10 @@ public class SearchBiz {
                     campsiteShopFindDTO.setName(keyWord);
                     ObjectRestResponse<PageDataVO<CampsiteShopPageVo>> campsiteShopPageForUncc = campsiteFeign.findCampsiteShopPageForUncc(campsiteShopFindDTO);
                     PageDataVO<CampsiteShopPageVo> data = campsiteShopPageForUncc.getData();
-                    campsiteShopPageVoServiceResultVo.setData(data.getData());
-                    campsiteShopPageVoServiceResultVo.setTotalCount(data.getTotalCount());
+                    long totalCount = data==null?0:data.getTotalCount()==null?0:data.getTotalCount();
+                    List<CampsiteShopPageVo> result = data == null ? Collections.EMPTY_LIST : data.getData() == null ? Collections.EMPTY_LIST : data.getData();
+                    campsiteShopPageVoServiceResultVo.setData(result);
+                    campsiteShopPageVoServiceResultVo.setTotalCount(totalCount);
                     searchResultVo.put(ServiceConstant.CAMPSITE, campsiteShopPageVoServiceResultVo);
                 } catch (Exception ex) {
                     ex.printStackTrace();
@@ -175,8 +186,10 @@ public class SearchBiz {
                 try {
                     ServiceResultVo<SummitActivityVo> activityVoServiceResultVo = new ServiceResultVo<>();
                     PageDataVO<SummitActivityVo> summitActivityWithPage = summitActivityBiz.findSummitActivityWithPage(1, ServiceConstant.ACTIVITY_LIMIT, null, keyWord);
-                    activityVoServiceResultVo.setTotalCount(summitActivityWithPage.getTotalCount());
-                    activityVoServiceResultVo.setData(summitActivityWithPage.getData());
+                    long totalCount = summitActivityWithPage==null?0:summitActivityWithPage.getTotalCount()==null?0:summitActivityWithPage.getTotalCount();
+                    List<SummitActivityVo> result = summitActivityWithPage == null ? Collections.EMPTY_LIST : summitActivityWithPage.getData() == null ? Collections.EMPTY_LIST : summitActivityWithPage.getData();
+                    activityVoServiceResultVo.setTotalCount(totalCount);
+                    activityVoServiceResultVo.setData(result);
                     searchResultVo.put(ServiceConstant.ACTIVITY, activityVoServiceResultVo);
                 } catch (Exception ex) {
                     ex.printStackTrace();
@@ -192,7 +205,8 @@ public class SearchBiz {
                 try {
                     ServiceResultVo<Article> articleServiceResultVo = new ServiceResultVo<>();
                     PageInfo articleList = articleBiz.getArticleList(1, ServiceConstant.NEWS_LIMIT, 1, keyWord);
-                    articleServiceResultVo.setData(articleList.getList());
+                    List<Article> result = articleList == null ? Collections.EMPTY_LIST : articleList.getList() == null ? Collections.EMPTY_LIST : articleList.getList();
+                    articleServiceResultVo.setData(result);
                     articleServiceResultVo.setTotalCount(articleList.getTotal());
                     searchResultVo.put(ServiceConstant.NEWS, articleServiceResultVo);
                 } catch (Exception ex) {