From 48b4e46f22ec83843cb8a3087b8ec9511a7ea8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 06 五月 2024 10:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/VisitsCloudController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/VisitsCloudController.java
index 414be68..b0c771f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/VisitsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/VisitsCloudController.java
@@ -37,14 +37,14 @@
@ApiOperation("鏂板缓")
@PostMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/create")
@CloudRequiredPermission("business:visits:create")
- public ApiResponse create(@RequestBody Visits visits) {
+ public ApiResponse create(@RequestBody Visits visits,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(visitsService.create(visits));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:visits:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
visitsService.deleteById(id);
return ApiResponse.success(null);
}
@@ -52,10 +52,10 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:visits:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
- for (String id : idArray) {
+ for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
visitsService.deleteByIdInBatch(idList);
@@ -65,14 +65,14 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("business:visits:update")
- public ApiResponse updateById(@RequestBody Visits visits) {
+ public ApiResponse updateById(@RequestBody Visits visits,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
visitsService.updateById(visits);
return ApiResponse.success(null);
}
@ApiOperation("鍙栨秷棰勭害")
@GetMapping("/visitCancel")
@CloudRequiredPermission("business:visits:cancel")
- public ApiResponse visitCancel(@RequestParam Integer visitId) {
+ public ApiResponse visitCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
visitsService.visitCancel(visitId);
return ApiResponse.success(null);
}
@@ -80,7 +80,7 @@
@ApiOperation("鏍规嵁鏃ユ湡(starttime)鍚屾璁垮鏁版嵁")
@PostMapping("/syncByDate")
@CloudRequiredPermission("business:visits:sync")
- public ApiResponse syncByDate(@RequestBody Visits visits) {
+ public ApiResponse syncByDate(@RequestBody Visits visits,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
hkSyncVisitFromHKService.syncVistAppointData(visits.getStarttime());
return ApiResponse.success(null);
}
@@ -88,28 +88,28 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:visits:query")
- public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap) {
+ public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(visitsService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:visits:exportExcel")
- public void exportExcel (@RequestBody PageWrap<Visits> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<Visits> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
ExcelExporter.build(Visits.class).export(visitsService.findPage(pageWrap).getRecords(), "璁垮鐢宠淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:visits:query")
- public ApiResponse<Visits> findById(@PathVariable Integer id) {
+ public ApiResponse<Visits> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(visitsService.findById(id));
}
@ApiOperation("婊炵暀浜哄憳")
@PostMapping("/retentionPage")
@CloudRequiredPermission("business:visits:query")
- public ApiResponse<PageData<Visits>> retentionPage (@RequestBody PageWrap<Visits> pageWrap) {
+ public ApiResponse<PageData<Visits>> retentionPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
pageWrap.getModel().setLevelStatus(Constants.ZERO);
return ApiResponse.success(visitsService.retentionPage(pageWrap));
}
--
Gitblit v1.9.3