From 8b48c2084ec86a1a8ce542352275fb70f68a53c2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 12 十二月 2024 11:34:37 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java |   81 +++++++++++++++++-----------------------
 1 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
index e54df6f..45e0748 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
@@ -1,13 +1,18 @@
 package com.doumee.cloud.web;
 
-import com.doumee.cloud.web.ApiController;
+import com.doumee.api.BaseController;
 import com.doumee.config.annotation.LoginNoRequired;
+import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
 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.system.dto.LoginDTO;
 import com.doumee.dao.web.reqeust.AccountLoginDTO;
 import com.doumee.dao.web.reqeust.AuditApproveDTO;
 import com.doumee.dao.web.reqeust.VisitMemberDTO;
@@ -16,13 +21,19 @@
 import com.doumee.service.business.ApproveService;
 import com.doumee.service.business.MemberService;
 import com.doumee.service.business.VisitsService;
+import com.doumee.service.system.SystemLoginService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ServerWebExchange;
+
+import javax.annotation.Resource;
 
 /**
  * Created by IntelliJ IDEA.
@@ -31,13 +42,13 @@
  * @create 2023/12/28 14:31
  */
 
-@Api(tags = "銆愬叕浼楀彿銆戝唴閮ㄥ姵鍔′汉鍛�")
+@Api(tags = "銆愬叕浼楀彿銆戝唴閮ㄤ汉鍛�")
 @Trace(exclude = true)
 @RestController
 @RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/member")
 @Slf4j
 @LoginNoRequired
-public class InternalWebController extends ApiController {
+public class InternalWebController extends BaseController {
 
     @Autowired
     private MemberService memberService;
@@ -48,69 +59,47 @@
     @Autowired
     private ApproveService approveService;
 
-    @ApiOperation(value = "浜哄憳鐧诲綍", notes = "H5")
-    @PostMapping("/accountLogin")
-    public ApiResponse<WxAuthorizeVO> accountLogin(@RequestBody AccountLoginDTO accountLoginDTO) {
-        WxAuthorizeVO wxAuthorizeVO = memberService.accountLogin(accountLoginDTO);
-        return ApiResponse.success("鐧诲綍鎴愬姛",wxAuthorizeVO);
-    }
 
-    @ApiOperation(value = "鍐呴儴浜哄憳棣栭〉", notes = "H5")
-    @GetMapping("/internalHome")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
-    public ApiResponse<InternalHomeVO> internalHome() {
-        return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeData(getMemberId()));
-    }
-
+//    @ApiOperation(value = "鍐呴儴浜哄憳棣栭〉", notes = "H5")
+//    @GetMapping("/internalHome")
+//    public ApiResponse<InternalHomeVO> internalHome(@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+//        return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeData(getLoginUser(token).getMemberId()));
+//    }
 
     @ApiOperation("浠诲姟涓績")
     @PostMapping("/taskCenter")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
-    public ApiResponse<PageData<VisitRecordVO>> taskCenter (@RequestBody PageWrap<VisitRecordDTO> pageWrap) {
-        pageWrap.getModel().setMemberId(getMemberId());
+    public ApiResponse<PageData<VisitRecordVO>> taskCenter (@RequestBody PageWrap<VisitRecordDTO> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        pageWrap.getModel().setMemberId(getLoginUser(token).getMemberId());
         return ApiResponse.success(visitsService.taskCenter(pageWrap));
     }
 
-    @ApiOperation("璁垮璁板綍璇︽儏")
-    @GetMapping("/visitDetail")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "璁板綍涓婚敭", required = true)
-    })
-    public ApiResponse<VisitDetailVO> visitDetail (@RequestParam Integer id) {
-        return ApiResponse.success(visitsService.getVisitDetail(id));
-    }
+//    @ApiOperation("璁垮璁板綍璇︽儏")
+//    @GetMapping("/visitDetail")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+//            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "璁板綍涓婚敭", required = true)
+//    })
+//    public ApiResponse<VisitDetailVO> visitDetail (@RequestParam Integer id) {
+//        return ApiResponse.success(visitsService.getVisitDetail(id));
+//    }
 
 
     @ApiOperation(value = "浜哄憳鍒嗛〉",notes = "鍙嫓璁垮唴閮ㄤ汉鍛�")
     @PostMapping("/memberList")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
-    public ApiResponse<PageData<MemberVO>> memberList (@RequestBody PageWrap<VisitMemberDTO> pageWrap) {
+    public ApiResponse<PageData<MemberVO>> memberList (@RequestBody PageWrap<VisitMemberDTO> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success(memberService.getVisitedMemberList(pageWrap));
     }
 
     @ApiOperation(value = "璁垮璁板綍鎻愪氦", notes = "鍐呴儴浜哄憳鎻愪氦")
     @PostMapping("/createVisit")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
-    public ApiResponse createVisit(@RequestBody Visits visits) {
-        visits.setCreateMemberId(getMemberId());
-        return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.createFk(visits,false));
+    public ApiResponse createVisit(@RequestBody Visits visits,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        visits.setCreateMemberId(getLoginUser(token).getMemberId());
+        return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.createFk(visits,false,Constants.ZERO));
     }
 
     @ApiOperation(value = "瀹℃壒娴佽褰曞鎵�", notes = "鍐呴儴浜哄憳")
     @PostMapping("/auditApprove")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
-    public ApiResponse auditApprove(@RequestBody AuditApproveDTO auditApproveDTO) {
+    public ApiResponse auditApprove(@RequestBody AuditApproveDTO auditApproveDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         visitsService.auditApprove(auditApproveDTO);
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }

--
Gitblit v1.9.3