From eb82684152ffb0acddf67da92e4533a0190eb258 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 10 十月 2025 18:27:31 +0800
Subject: [PATCH] 对接口
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
index 3ed8c63..151b50f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
@@ -5,10 +5,10 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
-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.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Visits;
@@ -16,11 +16,9 @@
import com.doumee.service.business.impl.hksync.fhk.HkSyncVisitFromHKServiceImpl;
import com.doumee.service.system.SystemUserService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.Repeat;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -54,7 +52,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:visits:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- visitsService.deleteById(id);
+ visitsService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -78,11 +76,27 @@
visitsService.updateById(visits);
return ApiResponse.success(null);
}
+// @ApiOperation("鎵嬪姩绛剧")
+// @GetMapping("/visitCancel")
+// @CloudRequiredPermission("business:visits:cancel")
+// public ApiResponse visitCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+// visitsService.visitCancel(visitId);
+// return ApiResponse.success(null);
+// }
+
+
+ /**
+ * 2025-3-25 14:14:34 鍔犲叆鍙栨秷棰勭害 寰呭鎵广�佸鎵逛腑銆佸凡瀹℃壒
+ * @param visitId
+ * @param token
+ * @return
+ */
@ApiOperation("鍙栨秷棰勭害")
- @GetMapping("/visitCancel")
- @CloudRequiredPermission("business:visits:cancel")
- public ApiResponse visitCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- visitsService.visitCancel(visitId);
+ @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);
}
@@ -129,6 +143,7 @@
@ApiOperation(value = "PC绔瀹㈣褰曟彁浜�", notes = "璁垮鎻愪氦")
@PostMapping("/createFk")
+ @PreventRepeat(interval = 2000)
public ApiResponse createFk(@RequestBody Visits visits) {
visits.setSourceType(Constants.ZERO);
return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.createFk(visits,false,Constants.ONE));
@@ -143,6 +158,7 @@
visits.setMemberId(loginUserInfo.getMemberId());
visits.setCreateMemberId(loginUserInfo.getMemberId());
visits.setReceptMemberId(visits.getMemberId());
+ visits.setLoginUserInfo(loginUserInfo);
return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.visitReporting(visits));
}
--
Gitblit v1.9.3