Commit e0627c2c authored by youjj's avatar youjj

修改返回对象

parent fb07a5c0
...@@ -27,12 +27,12 @@ public class TourBannerController extends BaseController<TourBannerBiz,TourBanne ...@@ -27,12 +27,12 @@ public class TourBannerController extends BaseController<TourBannerBiz,TourBanne
* @return * @return
*/ */
@GetMapping("/app/unauth/findBannerlist") @GetMapping("/app/unauth/findBannerlist")
public ListRestResponse findBannerlist(){ public ObjectRestResponse findBannerlist(){
List<TourBanner> bannerList = bannerBiz.findBannerList(); List<TourBanner> bannerList = bannerBiz.findBannerList();
return new ListRestResponse().result(bannerList).count(bannerList.size()); return ObjectRestResponse.succ(bannerList);
} }
......
package com.xxfc.platform.tour.rest; package com.xxfc.platform.tour.rest;
import com.github.wxiaoqi.security.common.msg.ListRestResponse; 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.github.wxiaoqi.security.common.rest.BaseController;
import com.xxfc.platform.tour.biz.TourTagBannerBiz; import com.xxfc.platform.tour.biz.TourTagBannerBiz;
import com.xxfc.platform.tour.entity.TourTagBanner; import com.xxfc.platform.tour.entity.TourTagBanner;
...@@ -19,10 +20,10 @@ public class TourTagBannerController extends BaseController<TourTagBannerBiz,Tou ...@@ -19,10 +20,10 @@ public class TourTagBannerController extends BaseController<TourTagBannerBiz,Tou
private TourTagBannerBiz tagBannerBiz; private TourTagBannerBiz tagBannerBiz;
@GetMapping("/app/unauth/findById/{tid}") @GetMapping("/app/unauth/findById/{tid}")
public ListRestResponse findById(@PathVariable long tid){ public ObjectRestResponse findById(@PathVariable long tid) {
List<TourTagBanner> tourTagBanners = tagBannerBiz.findById(tid); List<TourTagBanner> tourTagBanners = tagBannerBiz.findById(tid);
return new ListRestResponse().result(tourTagBanners).count(tourTagBanners.size()); return ObjectRestResponse.succ(tourTagBanners);
} }
......
...@@ -23,10 +23,10 @@ public class TourTagController extends BaseController<TourTagBiz,TourTag> { ...@@ -23,10 +23,10 @@ public class TourTagController extends BaseController<TourTagBiz,TourTag> {
private TourTagBiz tagBiz; private TourTagBiz tagBiz;
@GetMapping("/app/unauth/getTagList") @GetMapping("/app/unauth/getTagList")
public ListRestResponse getTagList(pageDTO dto){ public ObjectRestResponse getTagList(pageDTO dto){
if (dto==null) { if (dto==null) {
new ListRestResponse<>().result("错误"); return ObjectRestResponse.createDefaultFail();
} }
Integer hot = dto.getHot(); Integer hot = dto.getHot();
...@@ -35,13 +35,13 @@ public class TourTagController extends BaseController<TourTagBiz,TourTag> { ...@@ -35,13 +35,13 @@ public class TourTagController extends BaseController<TourTagBiz,TourTag> {
if (hot==1){ if (hot==1){
List<TourTag> hotTag = tagBiz.getHotTag(); 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)); PageDataVO<TourTag> all = tagBiz.findAll(BeanUtil.beanToMap(dto));
return new ListRestResponse().result(all).count(all.getData().size()); return ObjectRestResponse.succ(all);
} }
......
...@@ -2,6 +2,7 @@ package com.xxfc.platform.tour.rest; ...@@ -2,6 +2,7 @@ package com.xxfc.platform.tour.rest;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO; import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
import com.github.wxiaoqi.security.common.msg.ListRestResponse; import com.github.wxiaoqi.security.common.msg.ListRestResponse;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.xxfc.platform.tour.biz.TourUserBiz; import com.xxfc.platform.tour.biz.TourUserBiz;
import com.xxfc.platform.tour.common.TourBaseController; import com.xxfc.platform.tour.common.TourBaseController;
import com.xxfc.platform.tour.entity.TourUser; import com.xxfc.platform.tour.entity.TourUser;
...@@ -18,12 +19,12 @@ public class TourUserController extends TourBaseController<TourUserBiz> { ...@@ -18,12 +19,12 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
@GetMapping("/app/unauth/getTourUser/{isChild}") @GetMapping("/app/unauth/getTourUser/{isChild}")
public ListRestResponse getTourUser(@PathVariable int isChild){ public ObjectRestResponse getTourUser(@PathVariable int isChild){
AppUserDTO userInfo = getUserInfo(); AppUserDTO userInfo = getUserInfo();
Integer id = userInfo.getId(); Integer id = userInfo.getId();
List<TourUser> tourUsers= baseBiz.getTourUser(id,isChild); List<TourUser> tourUsers= baseBiz.getTourUser(id,isChild);
return new ListRestResponse().result(tourUsers).count(tourUsers.size()); return ObjectRestResponse.succ(tourUsers);
} }
......
...@@ -23,7 +23,7 @@ spring: ...@@ -23,7 +23,7 @@ spring:
cloud: cloud:
nacos: nacos:
config: config:
server-addr: 10.1.37.192:8848 server-addr: 127.0.0.1:8848
--- ---
spring: spring:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment