From 4658e9353f7aa76a833d36ed988d77bf362ad0ea Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 21 五月 2024 11:54:12 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java index c31ca07..e27e0a7 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java @@ -1,8 +1,12 @@ package com.doumee.cloud.web; +import com.doumee.api.BaseController; import com.doumee.config.annotation.LoginNoRequired; import com.doumee.core.annotation.trace.Trace; import com.doumee.core.model.ApiResponse; +import com.doumee.core.model.LoginUserInfo; +import com.doumee.core.model.PageData; +import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.Visits; import com.doumee.dao.web.reqeust.CheckVisitedDTO; @@ -16,6 +20,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,7 +39,7 @@ @LoginNoRequired @RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/visitor") @Slf4j -public class VisitorWebController { +public class VisitorWebController extends BaseController { @Autowired private MemberService memberService; @@ -74,4 +79,16 @@ public ApiResponse<VisitDetailVO> detail(@RequestParam Integer id) { return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.getVisitDetail(id)); } + + + @ApiOperation("璁垮璁板綍 - 鍒嗛〉鍒楄〃") + @PostMapping("/visitPage") + public ApiResponse<PageData<Visits>> visitPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + LoginUserInfo loginUserInfo = getLoginUser(token); + pageWrap.getModel().setMemberId(loginUserInfo.getMemberId()); + return ApiResponse.success(visitsService.findPage(pageWrap)); + } + + + } -- Gitblit v1.9.3