From 12e8eb9e345adea19972c34df471b28b51fa71dd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 21 五月 2024 15:34:11 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 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 6d923d2..69592d7 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
@@ -3,6 +3,7 @@
 import com.doumee.api.BaseController;
 import com.doumee.config.DataSyncConfig;
 import com.doumee.config.annotation.CloudRequiredPermission;
+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;
@@ -10,17 +11,22 @@
 import com.doumee.core.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.ResetPasswordDTO;
 import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.MemberRole;
 import com.doumee.service.business.MemberService;
 import com.doumee.service.business.ext.ERPSyncService;
 import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 /**
@@ -88,8 +94,8 @@
     @ApiOperation("鍛樺伐鏉冮檺涓嬪彂")
     @GetMapping("/roleAuth/{id}")
     @CloudRequiredPermission("business:empower:create")
-    public ApiResponse roleAuthById(@PathVariable Integer id) {
-        memberService.roleAuthById(id);
+    public ApiResponse roleAuthById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        memberService.roleAuthById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -97,7 +103,15 @@
     @ApiOperation("鍚屾浜鸿劯淇℃伅")
     @PostMapping("/updateFace")
     public ApiResponse updateFace(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        member.setLoginUserInfo(this.getLoginUser(token));
         memberService.updateFace(member);
+        return ApiResponse.success(null);
+    }
+    @ApiOperation("鎵归噺鎺堟潈涓嬪彂")
+    @PostMapping("/batchRoleAuth")
+    public ApiResponse batchRoleAuth(@RequestBody Member memberRole, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        memberRole.setLoginUserInfo(this.getLoginUser(token));
+        memberService.batchRoleAuth(memberRole);
         return ApiResponse.success(null);
     }
     @ApiOperation("寮哄埗鍒犻櫎瀹夐槻骞冲彴浜哄憳淇℃伅")
@@ -147,7 +161,16 @@
         return ApiResponse.success(null);
     }
 
-
+    @ApiOperation(value = "浜哄憳淇℃伅瀵煎叆" ,notes = "淇濆崟鐢宠")
+    @PostMapping("/importExcel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
+            @ApiImplicitParam(name = "缁勭粐绫诲瀷 0鐩稿叧鏂� 1鍐呴儴缁勭粐", value = "companyType", required = true, paramType = "query", dataType = "Integer",example = "0",dataTypeClass = Integer.class),
+    })
+    @CloudRequiredPermission("business:member:create")
+    public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file,@ApiParam(value = "companyType") Integer companyType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        return ApiResponse.success(memberService.importBatch(file,companyType,this.getLoginUser(token)));
+    }
 
     @ApiOperation("鎵归噺鎷夐粦")
     @GetMapping("/batchBlock")
@@ -295,7 +318,6 @@
         }
         return ApiResponse.success("鍚屾鎴愬姛");
     }
-
 
 
     @ApiOperation("娴嬭瘯浜哄憳鍐荤粨")

--
Gitblit v1.9.3