Merge remote-tracking branch 'origin/base-modify' into base-modify

# Conflicts:
#	xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourUserController.java

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java

@@ -2,6 +2,9 @@ package com.xxfc.platform.tour.biz;
 
 import com.github.pagehelper.PageHelper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.constant.RestCode;
+import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.tour.mapper.TourGoodMapper;
@@ -37,9 +40,9 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
      * @param distance
      * @return
      */
-    public PageDataVO<TourGood> getGoodList(int page, int limit , String query , Double latitude, Double longitude, Integer tagId, Double distance){
+    public ObjectRestResponse<TourGood> getGoodList(int page, int limit , String query , Double latitude, Double longitude, Integer tagId, Double distance){
         Map<String, Object> params = initParam(page, limit, query, latitude, longitude, tagId, distance);
-        return  PageDataVO.pageInfo(page, limit, () -> mapper.getGoodList(params));
+        return new ObjectRestResponse().status(RestCode.SUCCESS.getStatus()).msg(RestCode.SUCCESS.getMsg()).data(PageDataVO.pageInfo(page, limit, () -> mapper.getGoodList(params)));
     }
 
     private Map<String, Object> initParam(int page, int limit, String query, Double latitude, Double longitude, Integer tagId, Double distance) {

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBiz.java

@@ -37,7 +37,6 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
     @Autowired
     private TourTagBiz tagBiz;
 
-    @Cache(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG)
     public List<TourTag> getHotTag() {
 
         TourTag tag = new TourTag();

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

@@ -27,12 +27,12 @@ public class TourBannerController extends BaseController<TourBannerBiz,TourBanne
      * @return
      */
     @GetMapping("/app/unauth/findBannerlist")
-    public ListRestResponse findBannerlist(){
+    public ObjectRestResponse findBannerlist(){
 
         List<TourBanner> bannerList = bannerBiz.findBannerList();
 
 
-        return new ListRestResponse().result(bannerList).count(bannerList.size());
+        return  ObjectRestResponse.succ(bannerList);
     }
 
 

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

@@ -8,6 +8,7 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.biz.TourGoodBiz;
 import com.xxfc.platform.tour.entity.TourGood;
+import com.xxfc.platform.tour.entity.TourTag;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -32,10 +33,10 @@ public class TourGoodController extends BaseController<TourGoodBiz, TourGood> {
     @RequestMapping(value = "/app/unauth/getGoodList", method = RequestMethod.GET)
     @IgnoreClientToken
     @ResponseBody
-    public PageDataVO<TourGood> getGoodList(@RequestParam(value = "page", required = true) Integer page, @RequestParam(value = "limit", required = true) Integer limit,
-                                            @RequestParam(value = "query", required = false) String query, @RequestParam(value = "latitude", required = false) Double latitude,
-                                            @RequestParam(value = "longitude", required = false) Double longitude, @RequestParam(value = "tagId", required = false) Integer tagId,
-                                            @RequestParam(value = "distance", defaultValue = "10.00") Double distance) {
+    public ObjectRestResponse<TourGood> getGoodList(@RequestParam(value = "page", required = true) Integer page, @RequestParam(value = "limit", required = true) Integer limit,
+                                          @RequestParam(value = "query", required = false) String query, @RequestParam(value = "latitude", required = false) Double latitude,
+                                          @RequestParam(value = "longitude", required = false) Double longitude, @RequestParam(value = "tagId", required = false) Integer tagId,
+                                          @RequestParam(value = "distance", defaultValue = "10.00") Double distance) {
         return baseBiz.getGoodList(page, limit, query, latitude, longitude, tagId, distance);
     }
 

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

 package com.xxfc.platform.tour.rest;
 
 import com.github.wxiaoqi.security.common.msg.ListRestResponse;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.tour.biz.TourTagBannerBiz;
 import com.xxfc.platform.tour.entity.TourTagBanner;
@@ -19,10 +20,10 @@ public class TourTagBannerController extends BaseController<TourTagBannerBiz,Tou
     private TourTagBannerBiz tagBannerBiz;
 
     @GetMapping("/app/unauth/findById/{tid}")
-    public ListRestResponse findById(@PathVariable long tid){
+    public ObjectRestResponse findById(@PathVariable long tid) {
 
-       List<TourTagBanner> tourTagBanners = tagBannerBiz.findById(tid);
-       return new ListRestResponse().result(tourTagBanners).count(tourTagBanners.size());
+        List<TourTagBanner> tourTagBanners = tagBannerBiz.findById(tid);
+        return ObjectRestResponse.succ(tourTagBanners);
     }
 
 

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

@@ -23,10 +23,10 @@ public class TourTagController extends BaseController<TourTagBiz,TourTag> {
     private TourTagBiz tagBiz;
 
     @GetMapping("/app/unauth/getTagList")
-    public ListRestResponse getTagList(pageDTO dto){
+    public ObjectRestResponse getTagList(pageDTO dto){
 
         if (dto==null) {
-            new ListRestResponse<>().result("错误");
+            return ObjectRestResponse.createDefaultFail();
         }
 
         Integer hot = dto.getHot();
@@ -35,13 +35,13 @@ public class TourTagController extends BaseController<TourTagBiz,TourTag> {
 
         if (hot==1){
             List<TourTag> hotTag = tagBiz.getHotTag();
-            return new ListRestResponse().result(hotTag).count(hotTag.size());
+            return ObjectRestResponse.succ(hotTag);
         }
 
 
         PageDataVO<TourTag> all = tagBiz.findAll(BeanUtil.beanToMap(dto));
 
-        return new ListRestResponse().result(all).count(all.getData().size());
+        return ObjectRestResponse.succ(all);
 
     }
 

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.tour.rest;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.msg.ListRestResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.tour.biz.TourUserBiz;
 import com.xxfc.platform.tour.common.TourBaseController;
@@ -28,11 +29,12 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
     private TourUserBiz tourUserBiz;
 
     @GetMapping("/app/unauth/getTourUser/{isChild}")
-    public ListRestResponse getTourUser(@PathVariable int isChild){
+    public ObjectRestResponse getTourUser(@PathVariable int isChild){
         AppUserDTO userInfo = getUserInfo();
         Integer id = userInfo.getId();
-        List<TourUser> tourUsers= baseBiz.getTourUser(id,isChild);
-       return new ListRestResponse().result(tourUsers).count(tourUsers.size());
+       List<TourUser> tourUsers= baseBiz.getTourUser(id,isChild);
+
+       return ObjectRestResponse.succ(tourUsers);
     }
 
     @GetMapping("/app/unauth/getTourUsers")