This commit is contained in:
2025-05-30 11:34:16 +08:00
parent 5d2cf4fd31
commit 0d5aabe317
16 changed files with 24 additions and 13 deletions

View File

@ -10,7 +10,7 @@ import java.util.Map;
@Data
public class BaseContextHandler {
public static ThreadLocal<Map<String, Object>> threadLocal = new ThreadLocal();
public static ThreadLocal<Map<String, Object>> threadLocal = new ThreadLocal<>();
public BaseContextHandler() {
}

View File

@ -39,7 +39,7 @@ AppFaceController {
*/
@ApiOperation("人脸照片上传")
@PostMapping("/faceUPload")
public ApiResponse faceUpload(@RequestParam("file")MultipartFile file, @RequestParam("scenicId") Long scenicId) {
public ApiResponse<FaceRecognizeResp> faceUpload(@RequestParam("file")MultipartFile file, @RequestParam("scenicId") Long scenicId) {
//获取用户id
JwtInfo worker = JwtTokenUtil.getWorker();
Long userId = worker.getUserId();
@ -61,12 +61,12 @@ AppFaceController {
}
@DeleteMapping("/{faceId}")
public ApiResponse deleteFace(@PathVariable("faceId") Long faceId) {
public ApiResponse<String> deleteFace(@PathVariable("faceId") Long faceId) {
return faceService.deleteFace(faceId);
}
@PostMapping("/{faceId}/match")
public ApiResponse match(@PathVariable("faceId") Long faceId) {
public ApiResponse<String> match(@PathVariable("faceId") Long faceId) {
faceService.matchFaceId(faceId);
return ApiResponse.success("");
}

View File

@ -64,7 +64,7 @@ public class AppMemberController {
@ApiOperation("新增或修改景区服务通知状态")
@GetMapping("/updateScenicServiceNoticeStatus")
public ApiResponse updateScenicServiceNoticeStatus(Long scenicId) {
public ApiResponse<String> updateScenicServiceNoticeStatus(Long scenicId) {
return memberService.updateScenicServiceNoticeStatus(scenicId);
}

View File

@ -3,6 +3,7 @@ package com.ycwl.basic.controller.mobile;
import com.ycwl.basic.annotation.IgnoreToken;
import com.ycwl.basic.model.jwt.JwtInfo;
import com.ycwl.basic.model.pc.printer.resp.MemberPrintResp;
import com.ycwl.basic.model.pc.printer.resp.PrinterResp;
import com.ycwl.basic.model.printer.req.FromSourceReq;
import com.ycwl.basic.service.printer.PrinterService;
import com.ycwl.basic.storage.StorageFactory;
@ -30,7 +31,7 @@ public class AppPrinterController {
private PrinterService printerService;
@GetMapping("/listFor/{scenicId}")
@IgnoreToken
public ApiResponse<List> listFor(@PathVariable("scenicId") Long scenicId) {
public ApiResponse<List<PrinterResp>> listFor(@PathVariable("scenicId") Long scenicId) {
return ApiResponse.success(printerService.listByScenicId(scenicId));
}

View File

@ -61,7 +61,7 @@ public class AppStatisticsController {
@ApiOperation("统计数据记录")
@PostMapping("/addStatistics")
@IgnoreToken
public ApiResponse addStatistics(@RequestBody StatisticsRecordAddReq req) {
public ApiResponse<String> addStatistics(@RequestBody StatisticsRecordAddReq req) {
return statisticsService.addStatistics(req);
}

View File

@ -6,6 +6,7 @@ import com.ycwl.basic.model.common.BaseQueryParameterReq;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
@ -15,6 +16,7 @@ import java.util.Date;
* @Date2024/12/02 10:24
* 景区管理表
*/
@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel("景区列表查询参数")
public class ScenicReqQuery extends BaseQueryParameterReq {

View File

@ -6,6 +6,7 @@ import com.ycwl.basic.model.common.BaseQueryParameterReq;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
@ -15,6 +16,7 @@ import java.util.Date;
* @Date2024/12/02 11:29
* 视频源
*/
@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel(value = "视频源查询对象")
public class SourceReqQuery extends BaseQueryParameterReq {

View File

@ -6,6 +6,7 @@ import com.ycwl.basic.model.common.BaseQueryParameterReq;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@ -14,6 +15,7 @@ import java.util.Date;
* @Date2024/12/02 14:10
* 任务列表
*/
@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel("任务列表查询参数")
public class TaskReqQuery extends BaseQueryParameterReq {

View File

@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
@ -16,6 +17,7 @@ import java.util.Date;
* @Date2024/12/02 14:10
* 模版
*/
@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel("模版查询请求类")
public class TemplateReqQuery extends BaseQueryParameterReq {

View File

@ -6,6 +6,7 @@ import com.ycwl.basic.model.common.BaseQueryParameterReq;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@ -14,6 +15,7 @@ import java.util.Date;
* @Date2024/12/2 15:28
* 视频成片
*/
@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel("成片查询请求类")
public class VideoReqQuery extends BaseQueryParameterReq {

View File

@ -52,7 +52,7 @@ public interface AppMemberService {
ApiResponse<?> agreement();
ApiResponse updateScenicServiceNoticeStatus(Long scenicId);
ApiResponse<String> updateScenicServiceNoticeStatus(Long scenicId);
ApiResponse<Integer> getScenicServiceNoticeStatus(Long scenicId);
}

View File

@ -22,5 +22,5 @@ public interface AppStatisticsService {
ApiResponse<AppStatisticsFunnelVO> userConversionFunnel(CommonQueryReq query);
ApiResponse addStatistics(StatisticsRecordAddReq req);
ApiResponse<String> addStatistics(StatisticsRecordAddReq req);
}

View File

@ -167,7 +167,7 @@ public class AppMemberServiceImpl implements AppMemberService {
}
@Override
public ApiResponse updateScenicServiceNoticeStatus(Long scenicId) {
public ApiResponse<String> updateScenicServiceNoticeStatus(Long scenicId) {
JwtInfo worker = JwtTokenUtil.getWorker();
Integer scenicServiceNoticeStatus = memberMapper.getScenicServiceNoticeStatus(scenicId, worker.getUserId());
//没有就初始化为开启

View File

@ -219,7 +219,7 @@ public class AppStatisticsServiceImpl implements AppStatisticsService {
}
@Override
public ApiResponse addStatistics(StatisticsRecordAddReq req) {
public ApiResponse<String> addStatistics(StatisticsRecordAddReq req) {
// req.setId(SnowFlakeUtil.getLongId());
if (req.getMemberId() == null) {
try {

View File

@ -31,7 +31,7 @@ public interface FaceService {
SearchFaceRespVo matchFaceId(Long faceId, boolean isNew);
ApiResponse deleteFace(Long faceId);
ApiResponse<String> deleteFace(Long faceId);
List<ContentPageVO> faceContentList(Long faceId);

View File

@ -310,7 +310,7 @@ public class FaceServiceImpl implements FaceService {
}
@Override
public ApiResponse deleteFace(Long faceId) {
public ApiResponse<String> deleteFace(Long faceId) {
FaceEntity face = faceRepository.getFace(faceId);
faceMapper.deleteById(faceId);
faceRepository.clearFaceCache(faceId);