From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java | 96 ++++++++++++++++++++++--------------------------
1 files changed, 44 insertions(+), 52 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 509cf0a..c7f6ecf 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,14 +1,15 @@
package com.doumee.cloud.web;
-import com.doumee.cloud.web.ApiController;
+import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Visits;
-import com.doumee.dao.web.reqeust.AccountLoginDTO;
import com.doumee.dao.web.reqeust.AuditApproveDTO;
import com.doumee.dao.web.reqeust.VisitMemberDTO;
import com.doumee.dao.web.reqeust.VisitRecordDTO;
@@ -17,8 +18,6 @@
import com.doumee.service.business.MemberService;
import com.doumee.service.business.VisitsService;
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;
@@ -36,8 +35,8 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/member")
@Slf4j
-@LoginNoRequired
-public class InternalWebController extends ApiController {
+//@LoginNoRequired
+public class InternalWebController extends BaseController {
@Autowired
private MemberService memberService;
@@ -48,71 +47,64 @@
@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("鎿嶄綔鎴愬姛");
}
+ /**
+ * 2025-3-25 14:14:34 鍔犲叆鍙栨秷棰勭害 寰呭鎵广�佸鎵逛腑銆佸凡瀹℃壒
+ * @param visitId
+ * @param token
+ * @return
+ */
+ @ApiOperation("鍙栨秷棰勭害")
+ @GetMapping("/visitsCancel")
+// @CloudRequiredPermission("business:visits:cancel")
+ public ApiResponse visitsCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ visitsService.visitsCancel(visitId,loginUserInfo);
+ return ApiResponse.success(null);
+ }
+
}
--
Gitblit v1.9.3