Merge branches 'master-seo-fix-feature' and 'master-ucc-feature' into base-modify

ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/GoodDataVO.java

@@ -39,4 +39,13 @@ public  class GoodDataVO{
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopAdminDTO.java

@@ -168,4 +168,12 @@ public class CampsiteShopAdminDTO {
     @ApiModelProperty("seo*html标签优化")
     private String alt;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopDetailDTO.java

@@ -79,5 +79,13 @@ public class CampsiteShopDetailDTO {
     @ApiModelProperty("seo*html标签优化")
     private String alt;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/entity/CampsiteShop.java

@@ -216,4 +216,16 @@ public class CampsiteShop implements Serializable {
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+
+    @Column(name = "img_title")
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @Column(name = "img_keyword")
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @Column(name = "img_desc")
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopAdminVO.java

@@ -175,4 +175,13 @@ public class CampsiteShopAdminVO {
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopPageVo.java

@@ -99,4 +99,16 @@ public class CampsiteShopPageVo implements Serializable {
 
     @ApiModelProperty("地址")
     private String address;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -33,6 +33,9 @@
         <result property="hot" column="hot"/>
         <result property="saleState" column="sale_state"/>
         <result property="alt" column="alt"/>
+        <result property="imgTitle" column="img_title"/>
+        <result property="imgKeyword" column="img_keyword"/>
+        <result property="imgDesc" column="img_desc"/>
     </resultMap>
 
     <!--根据类型查询全部-->
@@ -77,7 +80,7 @@
 
     <!--首页查询全部-->
     <select id="findAllByHome" resultType="com.github.wxiaoqi.security.common.vo.GoodDataVO">
-        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude,cs.alt
+        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude,cs.alt,cs.img_title as `imgTitle`,cs.img_keyword as `imgKeyword`,cs.img_desc as `imgDesc`
         FROM `campsite_shop`  cs
         where cs.sale_state=1 and cs.is_del=0
         order  by cs.hot desc
@@ -85,7 +88,7 @@
     </select>
 
     <select id="findAll" resultType="com.github.wxiaoqi.security.common.vo.GoodDataVO">
-        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude,cs.alt
+        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude,cs.alt,cs.img_title as `imgTitle`,cs.img_keyword as `imgKeyword`,cs.img_desc as `imgDesc`
         FROM `campsite_shop`  cs
         where cs.sale_state=1 and cs.is_del=0
         order  by cs.hot desc
@@ -94,7 +97,7 @@
     <!--根据id查询详情-->
     <select id="findCampsiteShopDetailById" resultType="com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO">
         select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,`logo` as `logo`,`poster_background` as `posterBackground` ,
-        `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude`,`alt` from `campsite_shop` where `id`=#{id}
+        `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude`,`alt`,cs.img_title as `imgTitle`,cs.img_keyword as `imgKeyword`,cs.img_desc as `imgDesc` from `campsite_shop` where `id`=#{id}
     </select>
 
     <!--根据查询条件分页查询-->

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/TourGoodDTO.java

@@ -115,4 +115,12 @@ public class TourGoodDTO {
 	@ApiModelProperty("seo*html标签优化")
 	private String alt;
 
+	@ApiModelProperty("seo*html标签优化")
+	private String imgTitle;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String imgKeyword;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String imgDesc;
 }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGood.java

@@ -137,4 +137,16 @@ public class TourGood implements Serializable {
 
 	@ApiModelProperty("seo*html标签优化")
 	private String alt;
+
+	@Column(name = "img_title")
+	@ApiModelProperty("seo*html标签优化")
+	private String imgTitle;
+
+	@Column(name = "img_keyword")
+	@ApiModelProperty("seo*html标签优化")
+	private String imgKeyword;
+
+	@Column(name = "img_desc")
+	@ApiModelProperty("seo*html标签优化")
+	private String imgDesc;
 }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodDetailVo.java

@@ -133,4 +133,12 @@ public class TourGoodDetailVo {
 	@ApiModelProperty("seo*html标签优化")
 	private String alt;
 
+	@ApiModelProperty("seo*html标签优化")
+	private String imgTitle;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String imgKeyword;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String imgDesc;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SummitActivitySaveDTO.java

@@ -106,4 +106,13 @@ public class SummitActivitySaveDTO implements Serializable {
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/entity/SummitActivity.java

@@ -244,4 +244,16 @@ public class SummitActivity implements Serializable {
     @ApiModelProperty("seo*html标签优化")
     private String alt;
 
+    @Column(name = "img_title")
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @Column(name = "img_keyword")
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @Column(name = "img_desc")
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
+
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityAdminVo.java

@@ -125,4 +125,13 @@ public class SummitActivityAdminVo implements Serializable {
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityDetailVo.java

@@ -85,4 +85,13 @@ public class SummitActivityDetailVo implements Serializable {
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityVo.java

@@ -61,4 +61,13 @@ public class SummitActivityVo implements Serializable {
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
+
 }

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) {

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/SearchController.java

@@ -2,14 +2,14 @@ package com.xxfc.platform.uccn.rest;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.uccn.biz.SearchBiz;
+import com.xxfc.platform.uccn.comstnt.ServiceConstant;
 import com.xxfc.platform.uccn.vo.SearchResultVo;
+import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
+import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author libin
@@ -23,11 +23,49 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "官网*综合搜索")
 public class SearchController {
 
-     private final SearchBiz searchBiz;
+    private final SearchBiz searchBiz;
+
+    private final VehicleModelController vehicleModelController;
+
+    private final GwTourController gwTourController;
+
+    private final CampsiteUccnController campsiteUccnController;
+
+    private final ArticleController articleController;
+
+    private final SummitActivityController summitActivityController;
+
+    private final BranchCompanyController branchCompanyController;
 
     @GetMapping
-    public ObjectRestResponse<SearchResultVo> search(@RequestParam(value = "keyword",required = false) String keyWord ){
-        SearchResultVo searchResultVo = searchBiz.searchWithKeyWords(keyWord);
-        return ObjectRestResponse.succ(searchResultVo);
+    public ObjectRestResponse search(@RequestParam(value = "type", required = false,defaultValue = "") String type,
+                                     @RequestParam(value = "keyword", required = false) String keyWord,
+                                     @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
+                                     @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit) {
+        switch (type) {
+            case ServiceConstant.VEHICLE:
+                VehicleModelQueryCondition vehicleModelQueryCondition = new VehicleModelQueryCondition();
+                vehicleModelQueryCondition.setPage(page);
+                vehicleModelQueryCondition.setLimit(limit);
+                vehicleModelQueryCondition.setVehicleName(keyWord);
+                return vehicleModelController.findVehicleModelPageUnauthfind(vehicleModelQueryCondition);
+            case ServiceConstant.BRANCH_COMPANY:
+                BranchCompanyFindDTO branchCompanyFindDTO = new BranchCompanyFindDTO();
+                branchCompanyFindDTO.setPage(page);
+                branchCompanyFindDTO.setLimit(limit);
+                branchCompanyFindDTO.setName(keyWord);
+                return branchCompanyController.listBranchCompanyWithPage(branchCompanyFindDTO);
+            case ServiceConstant.TROUR:
+                return gwTourController.getGoodList(page, limit, null, keyWord);
+            case ServiceConstant.CAMPSITE:
+                return campsiteUccnController.findCampsiteShopPageByType(null, page, limit, keyWord);
+            case ServiceConstant.NEWS:
+                return articleController.getArticleList(page, limit, null, keyWord);
+            case ServiceConstant.ACTIVITY:
+                return summitActivityController.findSummitActivityWithPage(page, limit, null, keyWord);
+            default:
+                SearchResultVo searchResultVo = searchBiz.searchWithKeyWords(keyWord);
+                return ObjectRestResponse.succ(searchResultVo);
+        }
     }
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -169,4 +169,16 @@ public class VehicleModel implements Serializable {
 
 	@ApiModelProperty("seo*html标签优化")
 	private String alt;
+
+	@Column(name = "img_title")
+	@ApiModelProperty("seo*html标签优化")
+	private String imgTitle;
+
+	@Column(name = "img_keyword")
+	@ApiModelProperty("seo*html标签优化")
+	private String imgKeyword;
+
+	@Column(name = "img_desc")
+	@ApiModelProperty("seo*html标签优化")
+	private String imgDesc;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelVo.java

@@ -56,4 +56,13 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 	@ApiModelProperty("seo*html标签优化")
 	private String alt;
 
+	@ApiModelProperty("seo*html标签优化")
+	private String imgTitle;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String imgKeyword;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String imgDesc;
+
 }