From 3fd5e7962120c530d145b2d0571cd208d8720563 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 07 三月 2024 17:55:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_web/src/main/java/com/doumee/api/web/VisitorController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_web/src/main/java/com/doumee/api/web/VisitorController.java b/server/dmvisit_web/src/main/java/com/doumee/api/web/VisitorController.java
index a930855..92ded6e 100644
--- a/server/dmvisit_web/src/main/java/com/doumee/api/web/VisitorController.java
+++ b/server/dmvisit_web/src/main/java/com/doumee/api/web/VisitorController.java
@@ -1,11 +1,13 @@
package com.doumee.api.web;
+import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.response.MemberVO;
+import com.doumee.dao.web.response.VisitDetailVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.VisitsService;
@@ -14,7 +16,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -59,11 +61,17 @@
}
- @ApiOperation(value = "璁垮璁板綍鎻愪氦", notes = "璁垮璁板綍鎻愪氦")
+ @ApiOperation(value = "璁垮璁板綍鎻愪氦", notes = "璁垮鎻愪氦")
@PostMapping("/createFk")
public ApiResponse createFk(@RequestBody Visits visits) {
- return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.createFk(visits));
+ visits.setSourceType(Constants.ZERO);
+ return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.createFk(visits,false));
}
+ @ApiOperation(value = "璁垮璁板綍璇︽儏", notes = "璁垮璁板綍璇︽儏")
+ @GetMapping("/detail")
+ public ApiResponse<VisitDetailVO> detail(@RequestParam Integer id) {
+ return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.getVisitDetail(id));
+ }
}
--
Gitblit v1.9.3