Commit 0f3e964c authored by 周亚武's avatar 周亚武

小程序接口更新

parent 9aaf0041
......@@ -27,4 +27,8 @@ public class FavoriteReq extends BaseReq {
*/
private long staffId;
/**
* 分类Id
*/
private int typeId;
}
package com.mortals.xhx.busiz.applets.rsp;
import lombok.Data;
import java.util.Date;
@Data
public class FavoriteTypeListInfo {
public FavoriteTypeListInfo(int id, String title) {
this.id = id;
this.title = title;
}
/**
* id
*/
private int id;
/**
* 标题
*/
private String title;
}
......@@ -98,8 +98,6 @@ public class CompanyApiController extends AbstractBaseController<CompanyReq>{
String busiDesc = "公司详情";
log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(companyReq));
Rest<Object> rest = Rest.ok(busiDesc + " 【成功】");
Context context = this.getContext();
Map<String, Object> model = new HashMap<>();
try {
if (ObjectUtils.isEmpty(companyReq.getCompanyId())) {
throw new AppException("详细查询id不能为空!");
......
......@@ -11,12 +11,21 @@ import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.busiz.applets.req.FavoriteReq;
import com.mortals.xhx.busiz.applets.req.LoginReq;
import com.mortals.xhx.busiz.applets.req.UserInfoReq;
import com.mortals.xhx.module.favorites.model.FavoritesBusinesscardEntity;
import com.mortals.xhx.module.favorites.model.FavoritesNewsEntity;
import com.mortals.xhx.module.favorites.model.FavoritesProductEntity;
import com.mortals.xhx.busiz.applets.rsp.FavoriteTypeListInfo;
import com.mortals.xhx.module.bussinesscard.model.BussinesscardEntity;
import com.mortals.xhx.module.bussinesscard.model.BussinesscardQuery;
import com.mortals.xhx.module.bussinesscard.service.BussinesscardService;
import com.mortals.xhx.module.favorites.model.*;
import com.mortals.xhx.module.favorites.service.FavoritesBusinesscardService;
import com.mortals.xhx.module.favorites.service.FavoritesNewsService;
import com.mortals.xhx.module.favorites.service.FavoritesProductService;
import com.mortals.xhx.module.favorites.web.FavoritesBusinesscardController;
import com.mortals.xhx.module.news.model.NewsEntity;
import com.mortals.xhx.module.news.model.NewsQuery;
import com.mortals.xhx.module.news.service.NewsService;
import com.mortals.xhx.module.product.model.ProductEntity;
import com.mortals.xhx.module.product.model.ProductQuery;
import com.mortals.xhx.module.product.service.ProductService;
import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.model.StaffQuery;
import com.mortals.xhx.module.staff.service.StaffService;
......@@ -27,7 +36,9 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
......@@ -49,10 +60,18 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{
private IAuthTokenService authTokenService;
@Autowired
private UserService userService;
@Autowired
private ProductService productService;
@Autowired
private NewsService newsService;
@Autowired
private BussinesscardService bussinesscardService;
@RequestMapping("favorite")
public Rest<Object> favoritesProduct(@RequestBody FavoriteReq favoriteReq) throws Exception {
String busiDesc = "收藏产品";
public Rest<Object> favorites(@RequestBody FavoriteReq favoriteReq) throws Exception {
String busiDesc = "收藏产品/新闻/名片";
Rest<Object> rest = Rest.ok();
try {
IUser iUser = authTokenService.getLoginUser(request);
......@@ -104,4 +123,116 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{
return rest;
}
/**
* 查询收藏分类
* @return
* @throws Exception
*/
@RequestMapping("myFavoriteType")
public Rest<Object> myFavoriteType() {
String busiDesc = "我的收藏";
Rest<Object> rest = Rest.ok();
try {
List<FavoriteTypeListInfo> list = new ArrayList<>();
list.add(new FavoriteTypeListInfo(1,"产品收藏"));
list.add(new FavoriteTypeListInfo(2,"新闻收藏"));
list.add(new FavoriteTypeListInfo(3,"名片收藏"));
rest.setData(list);
}catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
/**
* 查询我的收藏
* @return
* @throws Exception
*/
@RequestMapping("myFavorite")
public Rest<Object> myFavorites(@RequestBody FavoriteReq favoriteReq) {
String busiDesc = "我的收藏";
Rest<Object> rest = Rest.ok();
try {
IUser iUser = authTokenService.getLoginUser(request);
long userId = iUser.getId();
if(ObjectUtils.isEmpty(iUser)){
rest = Rest.fail("获取个人信息失败");
}else {
if(!ObjectUtils.isEmpty(favoriteReq) && favoriteReq.getTypeId() != 0){
switch (favoriteReq.getTypeId()){
case 1: //产品收藏
List<FavoritesProductEntity> productList = favoritesProductService.find(new FavoritesProductQuery().id(userId));
if(!ObjectUtils.isEmpty(productList)){
List<ProductEntity> list = new ArrayList<>();
for (int i = 0; i < productList.size(); i++) {
long id = productList.get(i).getProductId();
ProductEntity productEntity = productService.selectOne(new ProductQuery().id(id));
if(!ObjectUtils.isEmpty(productEntity)){
list.add(productEntity);
}
}
rest.setData(list);
}else {
rest.setMsg("未收藏产品");
}
break;
case 2: //新闻收藏
List<FavoritesNewsEntity> newsList = favoritesNewsService.find(new FavoritesNewsQuery().id(userId));
if(!ObjectUtils.isEmpty(newsList)){
List<NewsEntity> list = new ArrayList<>();
for (int i = 0; i < newsList.size(); i++) {
long id = newsList.get(i).getNewsId();
NewsEntity newsEntity = newsService.selectOne(new NewsQuery().id(id));
if(!ObjectUtils.isEmpty(newsEntity)){
list.add(newsEntity);
}
}
rest.setData(list);
}else {
rest.setMsg("未收藏新闻");
}
break;
case 3: //名片收藏
List<FavoritesBusinesscardEntity> cardList = favoritesBusinesscardService.find(new FavoritesBusinesscardQuery().id(userId));
if(!ObjectUtils.isEmpty(cardList)){
List<BussinesscardEntity> list = new ArrayList<>();
for (int i = 0; i < cardList.size(); i++) {
long id = cardList.get(i).getStaffId();
BussinesscardEntity bussinesscardEntity = bussinesscardService.selectOne(new BussinesscardQuery().id(id));
if(!ObjectUtils.isEmpty(bussinesscardEntity)){
list.add(bussinesscardEntity);
}
}
rest.setData(list);
}else {
rest.setMsg("未收藏名片");
}
break;
default:
rest = Rest.fail("传入类型id错误");
break;
}
}else {
rest = Rest.fail("必须传入类型id");
}
}
}catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
}
package com.mortals.xhx.busiz.applets.web;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
......
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