Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

# Conflicts:
#	xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/AppApplication.java

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

+package com.github.wxiaoqi.security.common.vo;
+
+
+import lombok.Data;
+
+
+/**
+ * 首页商品列表
+ */
+@Data
+public  class GoodDataVO{
+
+    private  Integer id;
+
+    private  String name;
+
+    private  String imgUrl;
+
+    private String  name1;
+
+    private  String price;
+
+}

xx-app/xx-app-api/pom.xml

@@ -11,4 +11,12 @@
     <groupId>com.xxfc.platform</groupId>
     <artifactId>xx-app-api</artifactId>
 
+    <dependencies>
+    <dependency>
+        <groupId>com.xxfc.platform</groupId>
+        <artifactId>xx-campsite-api</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </dependency>
+   </dependencies>
+
 </project>
\ No newline at end of file

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppHomeController.java

+package com.xxfc.platform.app.rest;
+
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.GoodDataVO;
+import com.xxfc.platform.app.biz.CofigBiz;
+import com.xxfc.platform.app.entity.Cofig;
+import com.xxfc.platform.campsite.feign.CampsiteFeign;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("home")
+@IgnoreClientToken
+@Slf4j
+public class AppHomeController extends BaseController<CofigBiz,Cofig> {
+
+
+    @Autowired
+    CampsiteFeign campsiteFeign;
+
+    @RequestMapping(value ="/app/unauth/goodList",method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse<List<GoodDataVO>> goodList(
+            @RequestParam(value = "page", defaultValue = "1") Integer page,
+            @RequestParam(value = "limit",defaultValue = "4") Integer limit,
+            @RequestParam(value = "type",defaultValue = "1") Integer type
+    ){
+        List<GoodDataVO> list=new ArrayList<>();
+        if (type==2){
+            list=campsiteFeign.goodList(page,limit);
+        }else if (type==3){
+
+        }
+        return  new ObjectRestResponse<>().rel(true).data(list);
+    }
+}
\ No newline at end of file

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/feign/CampsiteFeign.java

+package com.xxfc.platform.campsite.feign;
+
+
+import com.github.wxiaoqi.security.common.vo.GoodDataVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * Created by ace on 2017/9/15.
+ */
+//@FeignClient(value = "${auth.serviceId}",configuration = {})
+@FeignClient("xx-campsite")
+public interface CampsiteFeign {
+
+    @ApiOperation("首页营地列表")
+    @GetMapping(value = "/campsiteShop/app/shopList")
+    public List<GoodDataVO> goodList(@RequestParam(value = "page", defaultValue = "1") Integer page,
+                                     @RequestParam(value = "limit",defaultValue = "4") Integer limit);
+
+}

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.campsite.biz;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.campsite.dto.*;
 import com.xxfc.platform.campsite.vo.*;
@@ -342,6 +343,16 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
         return s;
     }
 
+    /**
+     * 首页营地列表
+     * @param page
+     * @param limit
+     * @return
+     */
+    public  List<GoodDataVO> getAllByHome(Integer page, Integer limit){
+        return  mapper.findAllByHome((page-1)*limit,limit);
+    };
+
 
 
 }
\ No newline at end of file

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/mapper/CampsiteShopMapper.java

 package com.xxfc.platform.campsite.mapper;
 
+import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.xxfc.platform.campsite.dto.CampsiteShopAdminFindDTO;
 import com.xxfc.platform.campsite.dto.CampsiteShopAdminPageDTO;
 import com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO;
@@ -26,6 +27,14 @@ public interface CampsiteShopMapper extends Mapper<CampsiteShop> {
      */
     List<CampsiteShopPageDTO> findAllCampsiteShopsByType(@Param("typeId") Integer typeId);
 
+    /**
+     * 首页营地列表
+     * @param start
+     * @param size
+     * @return
+     */
+    List<GoodDataVO> findAllByHome(@Param("start") Integer start, @Param("size") Integer size);
+
     /**
      * 根据店铺id查询
      * @param id

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteShopController.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.campsite.rest;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.sun.org.apache.regexp.internal.RE;
 import com.xxfc.platform.campsite.biz.CampsiteShopBiz;
@@ -15,6 +16,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author libin
  * @version 1.0
@@ -51,5 +54,12 @@ public class CampsiteShopController extends BaseController<CampsiteShopBiz, Camp
         return ObjectRestResponse.succ(campsiteShopDetailVo);
     }
 
+    @ApiOperation("首页营地列表")
+    @GetMapping(value = "/app/shopList")
+    public List<GoodDataVO> goodList(@RequestParam(value = "page", defaultValue = "1") Integer page,
+                                     @RequestParam(value = "limit",defaultValue = "4") Integer limit) {
+        return getBaseBiz().getAllByHome(page,limit);
+    }
+
 
 }
\ No newline at end of file

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

@@ -47,6 +47,15 @@
         </if>
     </select>
 
+    <!--首页查询全部-->
+    <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`
+        FROM `campsite_shop`  cs
+        where cs.sale_state=1
+        order  by cs.hot desc
+        limit #{start,jdbcType=INTEGER},#{size,jdbcType=INTEGER}
+    </select>
+
     <!--根据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`,

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodController.java

@@ -6,9 +6,12 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.tour.biz.TourGoodBiz;
 import com.xxfc.platform.tour.dto.GoodSearchDTO;
 import com.xxfc.platform.tour.entity.TourGood;
+import com.xxfc.platform.tour.vo.TourGoodVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("tourGood")
 public class TourGoodController extends BaseController<TourGoodBiz, TourGood> {
@@ -41,5 +44,11 @@ public class TourGoodController extends BaseController<TourGoodBiz, TourGood> {
         return ObjectRestResponse.succ(baseBiz.getOne(id));
     }
 
+    @ApiOperation("首页查询旅游路线列表")
+    @RequestMapping(value = "/app/goodList", method = RequestMethod.POST)
+    public List<TourGoodVo> goodList(@RequestBody GoodSearchDTO dto) {
+        return baseBiz.getAll(dto).getData();
+    }
+
 
 }
\ No newline at end of file