From 5385f7748062cc72c7b1d5c8651630751abe5a41 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 02 Feb 2024 20:05:42 +0800
Subject: [PATCH] 社区警格操作调整
---
src/main/java/org/springblade/modules/police/controller/PoliceStationController.java | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/police/controller/PoliceStationController.java b/src/main/java/org/springblade/modules/police/controller/PoliceStationController.java
index 843b962..3dc9460 100644
--- a/src/main/java/org/springblade/modules/police/controller/PoliceStationController.java
+++ b/src/main/java/org/springblade/modules/police/controller/PoliceStationController.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.modules.police.controller;
import io.swagger.annotations.Api;
@@ -22,19 +6,20 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.police.excel.PoliceStationExcel;
+import org.springblade.modules.police.excel.PoliceStationImporter;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.police.entity.PoliceStationEntity;
import org.springblade.modules.police.vo.PoliceStationVO;
import org.springblade.modules.police.wrapper.PoliceStationWrapper;
import org.springblade.modules.police.service.IPoliceStationService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.multipart.MultipartFile;
/**
* 派出所信息表 控制器
@@ -122,5 +107,15 @@
return R.status(policeStationService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 导入派出所数据
+ */
+ @PostMapping("/import-policeStation")
+ public R importPoliceStation(MultipartFile file, Integer isCovered) {
+ PoliceStationImporter policeStationImporter = new PoliceStationImporter(policeStationService, isCovered == 1);
+ ExcelUtil.save(file, policeStationImporter, PoliceStationExcel.class);
+ return R.success("操作成功");
+ }
+
}
--
Gitblit v1.9.3