From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffSysController.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffSysController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffSysController.java
index f9df96f..d76847d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffSysController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffSysController.java
@@ -2,26 +2,30 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
import com.ruoyi.system.api.domain.dto.StaffPageDto;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.domain.dto.MgtSysStaffImportDto;
import com.ruoyi.system.domain.dto.StaffUseSuggestDto;
-import com.ruoyi.system.domain.pojo.staff.SysStaff;
+import com.ruoyi.system.api.domain.poji.sys.SysStaff;
import com.ruoyi.system.domain.vo.StaffSuggestPageVo;
import com.ruoyi.system.domain.vo.StaffUserGetVo;
import com.ruoyi.system.service.config.StaffSuggestService;
import com.ruoyi.system.service.staff.SysStaffService;
+import com.ruoyi.system.service.sys.ISysPermissionService;
import com.ruoyi.system.service.sys.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.List;
+import java.util.Set;
+
+import static com.ruoyi.common.core.web.domain.AjaxResult.success;
/**
* @author jqs34
@@ -44,6 +48,9 @@
@Resource
private StaffSuggestService staffSuggestService;
+ @Resource
+ private ISysPermissionService permissionService;
+
@RequestMapping(value = "/getStaffShopInfo", method = RequestMethod.POST)
@ApiOperation(value = "获取员工端商户信息")
public R<StaffUserGetVo> getStaffShopInfo() {
@@ -58,6 +65,15 @@
staffUserGetVo.setStaffDept(sysUser.getDept().getDeptName());
staffUserGetVo.setStaffPost(sysStaff.getStaffPost());
return R.ok(staffUserGetVo);
+ }
+
+ @RequestMapping(value = "/getStaffPermissions", method = RequestMethod.POST)
+ @ApiOperation(value = "获取员工端权限")
+ public R<Set<String>> getStaffPermissions() {
+ Long userId = SecurityUtils.getUserId();
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ Set<String> permissions = permissionService.getStaffClientMenuPermission(sysUser);
+ return R.ok(permissions);
}
@RequestMapping(value = "/staffSuggest", method = RequestMethod.POST)
@@ -80,4 +96,15 @@
List<StaffSuggestPageVo> staffSuggestPageVoList = staffSuggestService.pageStaffShopSuggest(page,staffPageDto);
return R.ok(page.setRecords(staffSuggestPageVoList));
}
+
+ @ApiOperation(value = "导入员工")
+ @PostMapping("/importSysStaffData")
+ public AjaxResult importGoodsTagData(@RequestPart("file")MultipartFile file) throws Exception
+ {
+ ExcelUtil<MgtSysStaffImportDto> util = new ExcelUtil<MgtSysStaffImportDto>(MgtSysStaffImportDto.class);
+ List<MgtSysStaffImportDto> tagList = util.importExcel(file.getInputStream());
+ String message = sysStaffService.importSysStaff(tagList);
+ return success(message);
+ }
+
}
--
Gitblit v1.7.1