From a7a8a50f48c1bff5ddc52b3bad1782328f8043d8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 12 四月 2024 18:50:20 +0800
Subject: [PATCH] 基础数据配置接口修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbDeptController.java | 114 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 86 insertions(+), 28 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbDeptController.java
index ef97d4f..4454b26 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbDeptController.java
@@ -1,27 +1,35 @@
package com.ruoyi.web.controller.api;
+import com.alibaba.excel.EasyExcel;
import com.ruoyi.common.basic.PageDTO;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.exception.GlobalException;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.BeanUtils;
-import com.ruoyi.common.utils.ExcelUtil;
-import com.ruoyi.system.domain.TbDept;
+import com.ruoyi.common.utils.CollUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.dto.update.DeptFocusDTO;
import com.ruoyi.system.dto.update.DeptUpdateDTO;
import com.ruoyi.system.query.DeptQuery;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TbDeptService;
import com.ruoyi.system.vo.DeptVO;
+import com.ruoyi.web.controller.excel.DeptExcel;
+import com.ruoyi.web.controller.lisenter.DeptImportListener;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Objects;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.Optional;
/**
* <p>
@@ -40,7 +48,7 @@
private final HttpServletResponse response;
private final TbDeptService tbDeptService;
-
+ private final ISysUserService sysUserService;
/**
* 导入模板下载
*/
@@ -48,11 +56,18 @@
@ApiOperation("模板下载")
public void download() {
try {
- ArrayList<TbDept> list = new ArrayList<>();
- ExcelUtil.exportExcel(list, "部门导入模板", "部门导入模板", TbDept.class, "部门导入模板", response);
+ //ArrayList<TbDept> list = new ArrayList<>();
+ //ExcelUtil.exportExcel(list, "部门导入模板", "部门导入模板", TbDept.class, "部门导入模板", response);
+ // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
+ String fileName = URLEncoder.encode("部门导入模板", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), DeptExcel.class).sheet("模板").doWrite(CollUtils.emptyList());
} catch (Exception e) {
log.error("模板下载异常",e);
- throw new GlobalException("模板下载失败,请联系管理员！");
+ throw new ServiceException("模板下载失败,请联系管理员！");
}
}
@@ -63,10 +78,17 @@
*/
@PostMapping("/import")
@ApiOperation("导入")
- public R<Object> importExcel(@RequestPart("file")MultipartFile file) {
+ @Transactional(rollbackFor = Exception.class)
+ public R<Void> importExcel(@RequestPart("file")MultipartFile file) {
try {
- tbDeptService.importExcel(file);
+ //tbDeptService.importExcel(file);
+ InputStream inputStream = file.getInputStream();
+ EasyExcel.read(inputStream, DeptExcel.class, new DeptImportListener(sysUserService)).sheet().doRead();
+ inputStream.close();
} catch (Exception e) {
+ if (e instanceof ServiceException) {
+ return R.fail(e.getMessage());
+ }
log.error("导入失败", e);
throw new RuntimeException(e.getMessage());
}
@@ -80,20 +102,39 @@
*/
@PostMapping("/page")
@ApiOperation("分页条件查询")
- public R<PageDTO<DeptVO>> page(@RequestBody DeptQuery query) {
- return R.ok(tbDeptService.queryPage(query));
+ public R<PageDTO<DeptVO>> page(@Validated @RequestBody DeptQuery query) {
+ try {
+ return R.ok(tbDeptService.queryPage(query));
+ } catch (Exception e) {
+ if (e instanceof ServiceException) {
+ return R.fail(e.getMessage());
+ }
+ log.error("分页条件查询异常", e);
+ return R.fail();
+ }
}
/**
* 根据id查询部门详情
- * @param id 部门id
+ * @param userId 部门id
* @return DeptVO
*/
@GetMapping("/get-details")
@ApiOperation("根据id查询部门详情")
- public R<DeptVO> getDetails(@RequestParam Integer id) {
- TbDept dept = tbDeptService.getById(id);
- return R.ok(BeanUtils.copyBean(dept,DeptVO.class));
+ public R<DeptVO> getDetails(@RequestParam Long userId) {
+ try {
+ Optional<SysUser> sysUser = sysUserService.lambdaQuery().eq(SysUser::getUserId, userId).oneOpt();
+ if (sysUser.isPresent()) {
+ return R.ok(BeanUtils.copyBean(sysUser.get(),DeptVO.class));
+ }
+ } catch (Exception e) {
+ if (e instanceof ServiceException) {
+ return R.fail(e.getMessage());
+ }
+ log.error("根据id查询部门详情异常", e);
+ return R.fail();
+ }
+ return R.ok(new DeptVO());
}
/**
@@ -103,9 +144,23 @@
*/
@PostMapping("/edit")
@ApiOperation("编辑")
- public R<Object> edit(@RequestBody DeptUpdateDTO dto){
- TbDept tbDept = BeanUtils.copyBean(dto, TbDept.class);
- tbDeptService.updateById(tbDept);
+ public R<Void> edit(@RequestBody DeptUpdateDTO dto){
+ try {
+ dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ sysUserService.lambdaUpdate().set(SysUser::getAreaAlias, dto.getAreaAlias())
+ .set(SysUser::getPersonInCharge, dto.getPersonInCharge())
+ .set(SysUser::getPhoneNumber, dto.getPhoneNumber())
+ .set(SysUser::getUserName, dto.getUserName())
+ .set(SysUser::getPassword, dto.getPassword())
+ .eq(SysUser::getUserId, dto.getUserId())
+ .update();
+ } catch (Exception e) {
+ if (e instanceof ServiceException) {
+ return R.fail(e.getMessage());
+ }
+ log.error("编辑异常", e);
+ return R.fail();
+ }
return R.ok();
}
@@ -117,15 +172,18 @@
@PostMapping("/focus")
@ApiOperation("重点关注")
public R<Object> focus(@RequestBody DeptFocusDTO dto){
- TbDept dept = tbDeptService.getById(dto.getId());
- if (Objects.isNull(dept)) {
- throw new RuntimeException("非法参数");
- }
- tbDeptService.lambdaUpdate()
- .eq(TbDept::getId, dto.getId())
- .set(TbDept::getFocussed, dto.getFocussed())
- .update();
+ tbDeptService.focus(dto);
return R.ok();
}
+
+ /**
+ * 部门未上传季度数据提示
+ * @return Void
+ */
+ @PostMapping("/reporting-message")
+ @ApiOperation(value = "部门未上传季度数据提示",notes = "code=200不展示，code=500 展示返回的msg")
+ public R<Void> reportingMessage(){
+ return tbDeptService.reportingMessage();
+ }
}
--
Gitblit v1.7.1