From ac3aa60eb219ba2ada9539012b3bc04ff3241c10 Mon Sep 17 00:00:00 2001 From: ASxx <2075995406@qq.com> Date: Thu, 10 Aug 2023 15:17:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TcDataSourceController.java | 15 ++++++--------- .../zongzhi/controller/TcTownController.java | 15 +++++++++++++++ .../com/ruoyi/zongzhi/mapper/TcTownMapper.java | 4 ++++ .../ruoyi/zongzhi/service/ITcTownService.java | 10 ++++++++++ .../zongzhi/service/impl/TcTownServiceImpl.java | 16 ++++++++++++++++ .../resources/mapper/zongzhi/TcTownMapper.xml | 1 + 6 files changed, 52 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcDataSourceController.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcDataSourceController.java index a032791..07f3c51 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcDataSourceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcDataSourceController.java @@ -39,7 +39,7 @@ public class TcDataSourceController extends BaseController /** * 查询数据来源列表 */ - @PreAuthorize("@ss.hasPermi('zongzhi:source:list')") + @GetMapping("/list") public TableDataInfo list(TcDataSource tcDataSource) { @@ -51,7 +51,7 @@ public class TcDataSourceController extends BaseController /** * 导出数据来源列表 */ - @PreAuthorize("@ss.hasPermi('zongzhi:source:export')") + @Log(title = "数据来源", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TcDataSource tcDataSource) @@ -64,7 +64,7 @@ public class TcDataSourceController extends BaseController /** * 获取数据来源详细信息 */ - @PreAuthorize("@ss.hasPermi('zongzhi:source:query')") + @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -74,8 +74,6 @@ public class TcDataSourceController extends BaseController /** * 新增数据来源 */ - @PreAuthorize("@ss.hasPermi('zongzhi:source:add')") - @Log(title = "数据来源", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody TcDataSource tcDataSource) { @@ -85,8 +83,7 @@ public class TcDataSourceController extends BaseController /** * 修改数据来源 */ - @PreAuthorize("@ss.hasPermi('zongzhi:source:edit')") - @Log(title = "数据来源", businessType = BusinessType.UPDATE) + @PutMapping public AjaxResult edit(@RequestBody TcDataSource tcDataSource) { @@ -96,8 +93,8 @@ public class TcDataSourceController extends BaseController /** * 删除数据来源 */ - @PreAuthorize("@ss.hasPermi('zongzhi:source:remove')") - @Log(title = "数据来源", businessType = BusinessType.DELETE) + + @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcTownController.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcTownController.java index 467a971..6373557 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcTownController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcTownController.java @@ -22,6 +22,7 @@ import com.ruoyi.zongzhi.domain.TcTown; import com.ruoyi.zongzhi.service.ITcTownService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.web.multipart.MultipartFile; /** * 区域Controller @@ -62,6 +63,7 @@ public class TcTownController extends BaseController util.exportExcel(response, list, "区域数据"); } + /** * 获取区域详细信息 */ @@ -104,4 +106,17 @@ public class TcTownController extends BaseController { return toAjax(tcTownService.deleteTcTownByIds(ids)); } + + + @Log(title = "用户管理", businessType = BusinessType.IMPORT) + @PostMapping("/importData") + public AjaxResult importData(MultipartFile file) throws Exception + { + ExcelUtil util = new ExcelUtil(TcTown.class); + List tcTownList = util.importExcel(file.getInputStream()); + String message = tcTownService.importUser(tcTownList); + return AjaxResult.success(message); + } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/mapper/TcTownMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/mapper/TcTownMapper.java index 0e2295a..bc65f48 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/mapper/TcTownMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/mapper/TcTownMapper.java @@ -58,4 +58,8 @@ public interface TcTownMapper * @return 结果 */ public int deleteTcTownByIds(Long[] ids); + + + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/service/ITcTownService.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/service/ITcTownService.java index 1d80337..89c99eb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/service/ITcTownService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/service/ITcTownService.java @@ -58,4 +58,14 @@ public interface ITcTownService * @return 结果 */ public int deleteTcTownById(Long id); + + + + /** + * 导入区域信息 + * + * @return 结果 + */ + + public String importUser(List tcTownList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/service/impl/TcTownServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/service/impl/TcTownServiceImpl.java index 80f36ca..ba42d2f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/service/impl/TcTownServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/service/impl/TcTownServiceImpl.java @@ -92,4 +92,20 @@ public class TcTownServiceImpl implements ITcTownService { return tcTownMapper.deleteTcTownById(id); } + + + @Override + public String importUser(List tcTownList) { + StringBuilder successMsg = new StringBuilder(); + if (!tcTownList.isEmpty()) { + for (TcTown tcTown : tcTownList) { + tcTownMapper.insertTcTown(tcTown); + } + successMsg.append("导入成功"); + } else { + successMsg.append("导入失败，文件为空"); + } + + return successMsg.toString(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/zongzhi/TcTownMapper.xml b/ruoyi-system/src/main/resources/mapper/zongzhi/TcTownMapper.xml index 8b0bb5c..54dbd78 100644 --- a/ruoyi-system/src/main/resources/mapper/zongzhi/TcTownMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/zongzhi/TcTownMapper.xml @@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + update tc_town