q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加“景区内容（成片、未成片模版、源素材)列表”接口

Browse Source
This commit is contained in:
longbinbin
2024-12-10 16:16:43 +08:00
parent 4c51e1be08
commit 3b94b34cf6
29 changed files with 246 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java
View File

@ -1,14 +1,14 @@
package com.ycwl.basic.controller.mobile;
import com.ycwl.basic.model.jwt.JwtInfo;
import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
import com.ycwl.basic.service.pc.FaceService;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.JwtTokenUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
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.*;
import org.springframework.web.multipart.MultipartFile;
/**
@ -40,6 +40,12 @@ AppFaceController {
return faceService.faceUPload(file,scenicId);
}
@GetMapping("/getFaceData")
public ApiResponse<FaceRespVO> getFaceData() {
JwtInfo worker = JwtTokenUtil.getWorker();
return faceService.getFaceByMemberId(worker.getUserId());
}
}

14
src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java
View File

@ -1,5 +1,6 @@
package com.ycwl.basic.controller.mobile;
import com.ycwl.basic.model.jwt.JwtInfo;
import com.ycwl.basic.model.mobile.goods.GoodsDetailVO;
import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq;
import com.ycwl.basic.model.mobile.goods.GoodsReqQuery;
@ -7,6 +8,7 @@ import com.ycwl.basic.model.mobile.goods.GoodsPageVO;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
import com.ycwl.basic.service.mobile.GoodsService;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.JwtTokenUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -51,4 +53,16 @@ public class AppGoodsController {
public ApiResponse<BigDecimal> queryPrice(@RequestBody GoodsPriceQueryReq queryPriceData) {
return goodsService.queryPrice(queryPriceData);
}
/**
* 查询用户当前景区的视频合成任务状态
* @param scenicId 景区id
* @return 1 合成中 2 合成成功
*/
@ApiOperation("查询用户当前景区的视频合成任务状态 1 合成中 2 合成成功 ")
@GetMapping("/getTaskStatus/{scenicId}")
public ApiResponse<Integer> getTaskStatus(@PathVariable("scenicId") Long scenicId) {
JwtInfo worker = JwtTokenUtil.getWorker();
return goodsService.getTaskStatus(worker.getUserId(),scenicId);
}
}

3
src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java
View File

@ -3,6 +3,7 @@ package com.ycwl.basic.controller.mobile;
import com.github.pagehelper.PageInfo;
import com.ycwl.basic.annotation.IgnoreToken;
import com.ycwl.basic.constant.BaseContextHandler;
import com.ycwl.basic.model.mobile.order.OrderAppPageReq;
import com.ycwl.basic.model.mobile.order.RefundOrderReq;
import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq;
import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
@ -29,7 +30,7 @@ public class AppOrderController {
@ApiOperation("用户端订单列表查询")
@PostMapping("/page")
public ApiResponse<PageInfo<OrderAppRespVO>> pageQuery(@RequestBody OrderReqQuery orderReqQuery) {
public ApiResponse<PageInfo<OrderAppRespVO>> pageQuery(@RequestBody OrderAppPageReq orderReqQuery) {
String userId = BaseContextHandler.getUserId();
orderReqQuery.setMemberId(Long.valueOf(userId));
return orderService.appPageQuery(orderReqQuery);

11
src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java
View File

@ -1,8 +1,11 @@
package com.ycwl.basic.controller.mobile;
import com.github.pagehelper.PageInfo;
import com.ycwl.basic.model.mobile.goods.GoodsPageVO;
import com.ycwl.basic.model.mobile.goods.GoodsReqQuery;
import com.ycwl.basic.model.mobile.scenic.ScenicAppVO;
import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO;
import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO;
import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
import com.ycwl.basic.service.mobile.AppScenicService;
@ -13,6 +16,8 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @Author：longbinbin
* @Date：2024/12/5 10:22
@ -42,5 +47,11 @@ public class AppScenicController {
return appScenicService.deviceCountByScenicId(scenicId);
}
@ApiOperation("景区视频源素材列表")
@GetMapping("/contentList/{scenicId}")
public ApiResponse<List<ContentPageVO>> contentList(@PathVariable Long scenicId) {
return appScenicService.contentList(scenicId);
}
}

2
src/main/java/com/ycwl/basic/interceptor/AuthInterceptor.java
View File

@ -82,7 +82,7 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
}
BaseContextHandler.setToken(token);
BaseContextHandler.setName(jwtInfo.getName());
BaseContextHandler.setUserId(jwtInfo.getUserId());
BaseContextHandler.setUserId(String.valueOf(jwtInfo.getUserId()));
BaseContextHandler.setAccount(jwtInfo.getAccount());
BaseContextHandler.setPhone(jwtInfo.getPhone());
BaseContextHandler.setRoleId(jwtInfo.getRoleId());

2
src/main/java/com/ycwl/basic/mapper/pc/FaceMapper.java
View File

@ -22,5 +22,5 @@ public interface FaceMapper {
int deleteByIds(@Param("list") List<Long> ids);
int update(FaceEntity face);
FaceRespVO getByMemberId(String userId);
FaceRespVO getByMemberId(Long userId);
}

3
src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java
View File

@ -1,5 +1,6 @@
package com.ycwl.basic.mapper.pc;
import com.ycwl.basic.model.mobile.order.OrderAppPageReq;
import com.ycwl.basic.model.pc.order.entity.OrderItemEntity;
import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq;
import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
@ -31,7 +32,7 @@ public interface OrderMapper {
int getOrderCount(OrderReqQuery query);
List<OrderAppRespVO> appList(OrderReqQuery orderReqQuery);
List<OrderAppRespVO> appList(OrderAppPageReq orderReqQuery);
OrderAppRespVO appDetail(Long id);
}

3
src/main/java/com/ycwl/basic/mapper/pc/TaskMapper.java
View File

@ -3,6 +3,7 @@ package com.ycwl.basic.mapper.pc;
import com.ycwl.basic.model.pc.task.entity.TaskEntity;
import com.ycwl.basic.model.pc.task.req.TaskReqQuery;
import com.ycwl.basic.model.pc.task.resp.TaskRespVO;
import com.ycwl.basic.utils.ApiResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -47,4 +48,6 @@ public interface TaskMapper {
void assignToWorker(@Param("taskId") Long taskId, @Param("workerId") Long workerId);
void deassign(@Param("taskId") Long taskId);
int countTask(TaskReqQuery taskReqQuery);
}

2
src/main/java/com/ycwl/basic/model/jwt/JwtInfo.java
View File

@ -28,7 +28,7 @@ public class JwtInfo implements Serializable {
/**
* 用户ID
*/
private String userId;
private Long userId;
/**
* 角色ID

2
src/main/java/com/ycwl/basic/model/mobile/goods/GoodsReqQuery.java
View File

@ -13,7 +13,7 @@ import lombok.Data;
public class GoodsReqQuery {
@ApiModelProperty("是否已购买 0否 1是")
private Integer isBuy;
@ApiModelProperty("用户id")
@ApiModelProperty(value = "用户id", hidden = true)
private Long memberId;
@ApiModelProperty("景区id")
private Long scenicId;

34
src/main/java/com/ycwl/basic/model/mobile/scenic/content/ContentPageVO.java Normal file
View File

@ -0,0 +1,34 @@
package com.ycwl.basic.model.mobile.scenic.content;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @Author：longbinbin
* @Date：2024/12/5 15:10
*/
@Data
@ApiModel("景区内容（成片、待成片模版、源素材）列表响应信息")
public class ContentPageVO {
@ApiModelProperty("内容名称")
private String name;
// @ApiModelProperty("景区id")
// private Long scenicId;
// @ApiModelProperty("景区名称")
// private String scenicName;
// @ApiModelProperty("经度")
// private BigDecimal longitude;
// @ApiModelProperty("纬度")
// private BigDecimal latitude;
@ApiModelProperty("内容类型 0模版 1:成片视频 2:源素材 ")
private Integer contentType;
@ApiModelProperty("源素材类型 1:视频 2:图片")
private Integer sourceType;
@ApiModelProperty("内容id contentType为0或1时才有值")
private Long contentId;
@ApiModelProperty("模版封面图片 contentType为0或1时才有值")
private String templateCoverUrl;
}

2
src/main/java/com/ycwl/basic/model/pc/adminUser/entity/LoginEntity.java
View File

@ -4,7 +4,7 @@ import lombok.Data;
@Data
public class LoginEntity {
private String staffId;
private Long staffId;
private String staffName;
private String account;
private String password;

2
src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java
View File

@ -88,6 +88,8 @@ public class OrderAppRespVO {
*/
@ApiModelProperty("商品类型，1成片，2源素材")
private Integer goodsType;
@ApiModelProperty("封面图片（来自模版封面图片）")
private String coverUrl;
@ApiModelProperty("订单明细")
private List<OrderItemVO> orderItemList;
}

2
src/main/java/com/ycwl/basic/model/pc/template/req/TemplateReqQuery.java
View File

@ -19,6 +19,8 @@ import java.util.Date;
@Data
@ApiModel("模版查询请求类")
public class TemplateReqQuery extends BaseQueryParameterReq {
@ApiModelProperty("景区id")
private Long scenicId;
/**
* 模版名称
*/

2
src/main/java/com/ycwl/basic/service/impl/mobile/AppMemberServiceImpl.java
View File

@ -106,7 +106,7 @@ public class AppMemberServiceImpl implements AppMemberService {
} else {
BeanCopierUtils.copyProperties(list.get(NumberConstant.ZERO), memberRespVO);
}
jwtInfo.setUserId(memberRespVO.getId().toString());
jwtInfo.setUserId(memberRespVO.getId());
jwtInfo.setName(memberRespVO.getNickname());
jwtInfo.setPhone(memberRespVO.getPhone());

74
src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java
View File

@ -5,16 +5,26 @@ import com.github.pagehelper.PageInfo;
import com.ycwl.basic.constant.BaseContextHandler;
import com.ycwl.basic.constant.NumberConstant;
import com.ycwl.basic.mapper.pc.*;
import com.ycwl.basic.model.jwt.JwtInfo;
import com.ycwl.basic.model.mobile.goods.GoodsPageVO;
import com.ycwl.basic.model.mobile.index.TopStateResp;
import com.ycwl.basic.model.mobile.scenic.ScenicAppVO;
import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO;
import com.ycwl.basic.model.mobile.scenic.ScenicIndexVO;
import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO;
import com.ycwl.basic.model.pc.face.req.FaceReqQuery;
import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
import com.ycwl.basic.model.pc.source.req.SourceReqQuery;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
import com.ycwl.basic.model.pc.template.req.TemplateReqQuery;
import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
import com.ycwl.basic.model.pc.video.req.VideoReqQuery;
import com.ycwl.basic.model.pc.video.resp.VideoRespVO;
import com.ycwl.basic.service.mobile.AppScenicService;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.JwtTokenUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -22,6 +32,8 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
@ -42,6 +54,10 @@ public class AppScenicServiceImpl implements AppScenicService {
private SourceMapper sourceMapper;
@Autowired
private TaskMapper taskMapper;
@Autowired
private VideoMapper videoMapper;
@Autowired
private TemplateMapper templateMapper;
@Value("${face.score}")
private BigDecimal faceScore;
@ -103,4 +119,62 @@ public class AppScenicServiceImpl implements AppScenicService {
return ApiResponse.success(topStateResp);
}
@Override
public ApiResponse<List<ContentPageVO>> contentList(Long scenicId) {
JwtInfo worker = JwtTokenUtil.getWorker();
//查询原素材
List<ContentPageVO> contentList = new ArrayList<>();
HashMap<Long, String> videoMap = new HashMap<>();
VideoReqQuery videoReqQuery = new VideoReqQuery();
videoReqQuery.setScenicId(scenicId);
videoReqQuery.setMemberId(worker.getUserId());
//查询成片vlog
List<VideoRespVO> videoList = videoMapper.list(videoReqQuery);
videoList.forEach(videoRespVO -> {
ContentPageVO contentPageVO = new ContentPageVO();
contentPageVO.setName(videoRespVO.getTemplateName());
contentPageVO.setContentType(1);
contentPageVO.setContentId(videoRespVO.getId());
contentPageVO.setTemplateCoverUrl(videoRespVO.getTemplateCoverUrl());
contentList.add(contentPageVO);
videoMap.put(videoRespVO.getTemplateId(),"");
});
TemplateReqQuery templateReqQuery = new TemplateReqQuery();
templateReqQuery.setScenicId(scenicId);
List<TemplateRespVO> list = templateMapper.list(templateReqQuery);
list.forEach(templateRespVO -> {
Long templateId = templateRespVO.getId();
if (!videoMap.containsKey(templateId)) {
ContentPageVO contentPageVO = new ContentPageVO();
contentPageVO.setName(templateRespVO.getName());
contentPageVO.setContentType(0);
contentPageVO.setContentId(templateId);
contentPageVO.setTemplateCoverUrl(templateRespVO.getCoverUrl());
contentList.add(contentPageVO);
}
});
SourceReqQuery sourceReqQuery = new SourceReqQuery();
videoReqQuery.setScenicId(scenicId);
videoReqQuery.setMemberId(worker.getUserId());
//查询源素材
List<SourceRespVO> sourceList = sourceMapper.listGroupByType(sourceReqQuery);
sourceList.forEach(sourceRespVO -> {
ContentPageVO contentPageVO = new ContentPageVO();
Integer type = sourceRespVO.getType();
if(type==1){
contentPageVO.setName("原片集");
}else {
contentPageVO.setName("照片集");
}
contentPageVO.setContentType(2);
contentPageVO.setSourceType(type);
contentList.add(contentPageVO);
});
return ApiResponse.success(contentList);
}
}

29
src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java
View File

@ -2,7 +2,9 @@ package com.ycwl.basic.service.impl.mobile;
import com.ycwl.basic.mapper.pc.ScenicMapper;
import com.ycwl.basic.mapper.pc.SourceMapper;
import com.ycwl.basic.mapper.pc.TaskMapper;
import com.ycwl.basic.mapper.pc.VideoMapper;
import com.ycwl.basic.model.jwt.JwtInfo;
import com.ycwl.basic.model.mobile.goods.GoodsDetailVO;
import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq;
import com.ycwl.basic.model.mobile.goods.GoodsReqQuery;
@ -10,11 +12,13 @@ import com.ycwl.basic.model.mobile.goods.GoodsPageVO;
import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
import com.ycwl.basic.model.pc.source.req.SourceReqQuery;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
import com.ycwl.basic.model.pc.task.req.TaskReqQuery;
import com.ycwl.basic.model.pc.video.req.VideoReqQuery;
import com.ycwl.basic.model.pc.video.resp.VideoRespVO;
import com.ycwl.basic.service.mobile.GoodsService;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.DateUtils;
import com.ycwl.basic.utils.JwtTokenUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -33,15 +37,18 @@ public class GoodsServiceImpl implements GoodsService {
private SourceMapper sourceMapper;
@Autowired
private ScenicMapper scenicMapper;
@Autowired
private TaskMapper taskMapper;
public ApiResponse<List<GoodsPageVO>> goodsList(GoodsReqQuery query) {
JwtInfo worker = JwtTokenUtil.getWorker();
//查询原素材
List<GoodsPageVO> goodsList = new ArrayList<>();
VideoReqQuery videoReqQuery = new VideoReqQuery();
videoReqQuery.setScenicId(query.getScenicId());
videoReqQuery.setIsBuy(query.getIsBuy());
videoReqQuery.setMemberId(query.getMemberId());
videoReqQuery.setMemberId(worker.getUserId());
//查询成片vlog
List<VideoRespVO> videoList = videoMapper.list(videoReqQuery);
videoList.forEach(videoRespVO -> {
@ -179,4 +186,24 @@ public class GoodsServiceImpl implements GoodsService {
goodsDetailVO.setCreateTime(videoRespVO.getCreateTime());
return ApiResponse.success(goodsDetailVO);
}
/**
* 查询用户当前景区的视频合成任务状态
* @param scenicId 景区id
* @return 1 合成中 2 合成成功
*/
@Override
public ApiResponse<Integer> getTaskStatus(Long userId, Long scenicId) {
TaskReqQuery taskReqQuery = new TaskReqQuery();
taskReqQuery.setMemberId(userId);
taskReqQuery.setScenicId(scenicId);
taskReqQuery.setStatus(2);
int count=taskMapper.countTask(taskReqQuery);
if(count>0){
return ApiResponse.success(1);
}else {
return ApiResponse.success(2);
}
}
}

9
src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java
View File

@ -110,7 +110,7 @@ public class FaceServiceImpl implements FaceService {
//1、上传人脸照片
String facaeUrl = uploadFileALiOss(file, userId);
// 2、查看人脸是否已上传
FaceRespVO faceRespVO=faceMapper.getByMemberId(userId);
FaceRespVO faceRespVO=faceMapper.getByMemberId(Long.parseLong(userId));
FaceEntity faceEntity = new FaceEntity();
if (faceRespVO==null) {
@ -130,7 +130,7 @@ public class FaceServiceImpl implements FaceService {
BeanUtil.copyProperties(faceRespVO,faceEntity);
faceMapper.update(faceEntity);
}
SearchFaceRespVo faceRespVo = faceService.searchFace(scenicId, faceRespVO.getId());
SearchFaceRespVo faceRespVo = faceService.searchFace(scenicId, faceEntity.getId());
float score = faceRespVo.getScore();
if (score<faceScore) {
//校验失败，删除，提示重新上传
@ -146,6 +146,11 @@ public class FaceServiceImpl implements FaceService {
}
@Override
public ApiResponse<FaceRespVO> getFaceByMemberId(Long memberId) {
return ApiResponse.success(faceMapper.getByMemberId(memberId));
}
/**
* 阿里oss图片上传
*

3
src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java
View File

@ -14,6 +14,7 @@ import com.ycwl.basic.mapper.pc.SourceMapper;
import com.ycwl.basic.mapper.pc.VideoMapper;
import com.ycwl.basic.model.mobile.goods.GoodsDetailVO;
import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq;
import com.ycwl.basic.model.mobile.order.OrderAppPageReq;
import com.ycwl.basic.model.mobile.order.RefundOrderReq;
import com.ycwl.basic.model.pc.member.resp.MemberRespVO;
import com.ycwl.basic.model.pc.order.entity.OrderItemEntity;
@ -254,7 +255,7 @@ public class OrderServiceImpl implements OrderService {
}
@Override
public ApiResponse<PageInfo<OrderAppRespVO>> appPageQuery(OrderReqQuery orderReqQuery) {
public ApiResponse<PageInfo<OrderAppRespVO>> appPageQuery(OrderAppPageReq orderReqQuery) {
PageHelper.startPage(orderReqQuery.getPageNum(), orderReqQuery.getPageSize());
List<OrderAppRespVO> list = orderMapper.appList(orderReqQuery);
for (OrderAppRespVO appRespVO : list) {

8
src/main/java/com/ycwl/basic/service/impl/task/TaskFaceServiceImpl.java
View File

@ -10,6 +10,8 @@ import com.aliyuncs.facebody.model.v20191230.DeleteFaceEntityRequest;
import com.aliyuncs.facebody.model.v20191230.SearchFaceRequest;
import com.aliyuncs.facebody.model.v20191230.SearchFaceResponse;
import com.ycwl.basic.config.FaceDetectConfig;
import com.ycwl.basic.exception.BaseException;
import com.ycwl.basic.exception.BizException;
import com.ycwl.basic.mapper.pc.DeviceMapper;
import com.ycwl.basic.mapper.pc.FaceMapper;
import com.ycwl.basic.mapper.pc.FaceSampleMapper;
@ -22,6 +24,7 @@ import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;
import com.ycwl.basic.model.task.resp.AddFaceRespVo;
import com.ycwl.basic.model.task.resp.SearchFaceRespVo;
import com.ycwl.basic.service.task.TaskFaceService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -34,6 +37,7 @@ import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Slf4j
@Service
public class TaskFaceServiceImpl implements TaskFaceService {
@Autowired
@ -87,8 +91,10 @@ public class TaskFaceServiceImpl implements TaskFaceService {
return respVo;
} catch (Exception e) {
e.printStackTrace();
log.error("人脸搜索失败：{}", e.getMessage());
throw new BaseException(e.getMessage());
}
return null;
// return null;
}
@Override

4
src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java
View File

@ -99,7 +99,9 @@ public class TaskTaskServiceImpl implements TaskService {
// Template
String cacheJson = redisTemplate.opsForValue().get(TaskConstant.TASK_TEMPLATE_KEY_PFX + worker.getId());
if (cacheJson == null) {
List<TemplateRespVO> templateList = templateMapper.list(new TemplateReqQuery());
TemplateReqQuery templateReqQuery = new TemplateReqQuery();
templateReqQuery.setPid(0L);
List<TemplateRespVO> templateList = templateMapper.list(templateReqQuery);
for (TemplateRespVO template : templateList) {
template.setChildren(templateMapper.getByPid(template.getId()));
}

3
src/main/java/com/ycwl/basic/service/mobile/AppScenicService.java
View File

@ -5,6 +5,7 @@ import com.ycwl.basic.model.mobile.index.TopStateResp;
import com.ycwl.basic.model.mobile.scenic.ScenicAppVO;
import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO;
import com.ycwl.basic.model.mobile.scenic.ScenicIndexVO;
import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO;
import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
import com.ycwl.basic.utils.ApiResponse;
@ -36,4 +37,6 @@ public interface AppScenicService {
* @return
*/
ApiResponse<TopStateResp> topState();
ApiResponse<List<ContentPageVO>> contentList(Long scenicId);
}

7
src/main/java/com/ycwl/basic/service/mobile/GoodsService.java
View File

@ -43,4 +43,11 @@ public interface GoodsService {
* @return
*/
ApiResponse<GoodsDetailVO> videoGoodsDetail(Long goodsId);
/**
* 查询当前用户的成片合成任务状态
* @param userId
* @return
*/
ApiResponse<Integer> getTaskStatus(Long userId ,Long scenicId);
}

2
src/main/java/com/ycwl/basic/service/pc/FaceService.java
View File

@ -23,4 +23,6 @@ public interface FaceService {
ApiResponse<Integer> update(FaceEntity face);
ApiResponse faceUPload(MultipartFile file,Long scrnicId);
ApiResponse<FaceRespVO> getFaceByMemberId(Long memberId);
}

3
src/main/java/com/ycwl/basic/service/pc/OrderService.java
View File

@ -2,6 +2,7 @@ package com.ycwl.basic.service.pc;
import com.github.pagehelper.PageInfo;
import com.ycwl.basic.enums.OrderStateEnum;
import com.ycwl.basic.model.mobile.order.OrderAppPageReq;
import com.ycwl.basic.model.mobile.order.RefundOrderReq;
import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq;
import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
@ -32,7 +33,7 @@ public interface OrderService {
ApiResponse<Integer> getOrderCountByUserId(Long userId);
ApiResponse<PageInfo<OrderAppRespVO>> appPageQuery(OrderReqQuery orderReqQuery);
ApiResponse<PageInfo<OrderAppRespVO>> appPageQuery(OrderAppPageReq orderReqQuery);
ApiResponse<OrderAppRespVO> appDetail(Long id);

6
src/main/java/com/ycwl/basic/utils/JwtAnalysisUtil.java
View File

@ -72,8 +72,12 @@ public class JwtAnalysisUtil {
} catch (Exception e) {
e.printStackTrace();
}
Long userId = null;
if (body.get("userId")!=null) {
userId= (Long) body.get("userId");
}
return new JwtInfo(StringUtil.a(body.get("name")),
StringUtil.a(body.get("userId")),
userId,
StringUtil.a(body.get("roleId")),
body.getSubject(),
StringUtil.a(body.get("phone")),