From e3552c670fe7f2228d3d427e6bf3b4ab400ce8e2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期日, 04 一月 2026 08:53:22 +0800
Subject: [PATCH] 更改头部
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index d8220d6..46284c1 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -8,24 +8,21 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
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.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborMemberDTO;
-import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.business.dto.RegisterDriverDTO;
-import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.MemberRole;
import com.doumee.dao.system.dto.UpdatePwdDto;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromSelfServiceImpl;
+import com.taobao.api.ApiException;
import io.swagger.annotations.*;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -62,14 +59,11 @@
@PostMapping("/create")
@CloudRequiredPermission("business:member:create")
public ApiResponse create(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self){
member.setLoginUserInfo(this.getLoginUser(token));
Member insert = memberService.create(member);
//鍒涘缓浜鸿劯淇℃伅
return ApiResponse.success("鎿嶄綔鎴愬姛锛�");
- }else{
- return ApiResponse.failed("瀵逛笉璧凤紝鏃犳潈闄愭搷浣滐紒");
- }
+
}
@PreventRepeat
@@ -262,14 +256,18 @@
return ApiResponse.success(memberService.findDriveList(model));
}
-
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:member:exportExcel")
- public void exportExcel (@RequestBody PageWrap<MemberQuery> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-// pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
-// return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
- ExcelExporter.build(Member.class).export(memberService.findMemberInfoPage(pageWrap).getRecords(), "浜哄憳淇℃伅琛�", response);
+ public void exportExcel (@RequestBody PageWrap<MemberQuery> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ List<Member> memberList = new ArrayList<>();
+ if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
+ memberList = memberService.findVisitPage(pageWrap).getRecords();
+ }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
+ memberList = memberService.findMemberInfoPage(pageWrap).getRecords();
+ }
+ ExcelExporter.build(Member.class).export(memberList, "浜哄憳淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -326,7 +324,7 @@
@ApiOperation("鍏ㄩ噺淇℃伅鍚屾")
@PostMapping("/syncAll")
- @CloudRequiredPermission("business:member:sync")
+ @CloudRequiredPermission("business:member:create")
public ApiResponse sync(@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
erpSyncService.syncUsers(null);
@@ -334,6 +332,12 @@
hkSyncOrgUserFHKService.syncUserData(this.getLoginUser(token));
}else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self){
hkSyncOrgUserFromSelfService.syncUserData(this.getLoginUser(token));
+ return ApiResponse.success("鍚屾鎴愬姛");
+ }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.dingding){
+ memberService.syncDDUserInfo();
+ return ApiResponse.success("鍚屾鎴愬姛");
+ }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.jdy){
+ memberService.syncJdyUserInfo();
return ApiResponse.success("鍚屾鎴愬姛");
}
return ApiResponse.success("鍚屾鎴愬姛");
@@ -367,4 +371,7 @@
return ApiResponse.success(null);
}
+
+
+
}
--
Gitblit v1.9.3