From 1cbc3456ff88a4a2a3c41cdc969f8a2d738b654c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 14:03:12 +0800
Subject: [PATCH] 机构详情优化
---
drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
index 99ed673..616a110 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
@@ -16,6 +16,7 @@
*/
package org.sxkj.system.controller;
+import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -52,16 +53,15 @@
import org.sxkj.system.entity.Region;
import org.sxkj.system.entity.User;
import org.sxkj.system.enums.DictEnum;
-import org.sxkj.system.excel.DeptExcel;
-import org.sxkj.system.excel.DeptImporter;
-import org.sxkj.system.excel.RegionExcel;
-import org.sxkj.system.excel.RegionImporter;
+import org.sxkj.system.excel.*;
import org.sxkj.system.mapper.DeptMapper;
import org.sxkj.system.mapper.UserMapper;
import org.sxkj.system.param.DeptAddParam;
import org.sxkj.system.param.DeptExportParam;
import org.sxkj.system.param.DeptPageParam;
import org.sxkj.system.service.IDeptService;
+import org.sxkj.system.util.excel.DeptSheetWriteHandler;
+import org.sxkj.system.util.excel.RegionSheetWriteHandler;
import org.sxkj.system.vo.DeptVO;
import org.sxkj.system.wrapper.DeptWrapper;
import org.springframework.web.bind.annotation.*;
@@ -69,10 +69,10 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
import java.util.stream.Collectors;
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
@@ -102,8 +102,8 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入dept")
public R<DeptVO> detail(Dept dept) {
- Dept detail = deptService.getOne(Condition.getQueryWrapper(dept));
- return R.data(DeptWrapper.build().entityVO(detail));
+ DeptVO detail = deptService.getDetailWithAreaName(dept);
+ return R.data(detail);
}
/**
@@ -206,6 +206,8 @@
String times = OrderNumUtils.initOrderNum2(WordOrderConstant.ORG_CODE);
String deptCode = WordOrderConstant.ORG_PREFIX + times;
deptEntity.setDeptCode(deptCode);
+ deptEntity.setCreateTime(new Date());
+ deptEntity.setUpdateTime(new Date());
if (deptService.submit(deptEntity)) {
CacheUtil.clear(SYS_CACHE);
CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
@@ -349,7 +351,7 @@
@ApiOperation(value = "导入机构", notes = "传入excel")
public R importRegion(MultipartFile file, Integer isCovered) {
DeptImporter deptImporter = new DeptImporter(deptService, isCovered == 1);
- ExcelUtil.save(file, deptImporter, DeptExcel.class);
+ ExcelUtil.save(file, deptImporter, DeptImportExcel.class);
return R.success("操作成功");
}
@@ -370,9 +372,21 @@
@GetMapping("export-template")
@ApiOperationSupport(order = 16)
@ApiOperation(value = "导出模板")
- public void exportUser(HttpServletResponse response) {
- List<DeptExcel> list = new ArrayList<>();
- ExcelUtil.export(response, "机构模板", "机构表", list, DeptExcel.class);
+ public void exportUser(HttpServletResponse response) throws IOException {
+ // 设置响应头
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding(StandardCharsets.UTF_8.name());
+ String fileName = URLEncoder.encode("机构模板", StandardCharsets.UTF_8.name());
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+
+ // 准备空数据列表
+ List<DeptImportExcel> list = new ArrayList<>();
+
+ // 使用EasyExcel导出，并注册RegionSheetWriteHandler
+ EasyExcel.write(response.getOutputStream(), DeptImportExcel.class)
+ .registerWriteHandler(new DeptSheetWriteHandler())
+ .sheet("机构表")
+ .doWrite(list);
}
}
--
Gitblit v1.9.3