From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 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 1739bfd..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,20 +1,15 @@
package com.doumee.cloud.web;
import com.doumee.api.BaseController;
-import com.doumee.cloud.web.ApiController;
+import com.doumee.config.annotation.CloudRequiredPermission;
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.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.system.dto.LoginDTO;
-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;
@@ -22,19 +17,11 @@
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.
@@ -48,7 +35,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/member")
@Slf4j
-@LoginNoRequired
+//@LoginNoRequired
public class InternalWebController extends BaseController {
@Autowired
@@ -61,11 +48,11 @@
private ApproveService approveService;
- @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(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")
@@ -95,7 +82,7 @@
@PostMapping("/createVisit")
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));
+ return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.createFk(visits,false,Constants.ZERO));
}
@ApiOperation(value = "瀹℃壒娴佽褰曞鎵�", notes = "鍐呴儴浜哄憳")
@@ -105,4 +92,19 @@
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