From 8782a61b92d8dc1f8d3fd7d16a517fa934ac7e96 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 15 Nov 2021 20:59:33 +0800
Subject: [PATCH] 枪支,车辆批量导入,制证申请修改,审核通过状态修改为未制证
---
src/main/java/org/springblade/modules/equipage/controller/GunController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/controller/GunController.java b/src/main/java/org/springblade/modules/equipage/controller/GunController.java
index 0393ab0..010138f 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/GunController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/GunController.java
@@ -1,21 +1,33 @@
package org.springblade.modules.equipage.controller;
+import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.apache.commons.codec.Charsets;
+import org.springblade.common.excel.RowWriteHandler;
import org.springblade.common.utils.arg;
+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.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.equipage.entity.Gun;
+import org.springblade.modules.equipage.excel.GunExcel;
+import org.springblade.modules.equipage.excel.GunImporter;
import org.springblade.modules.equipage.service.GunService;
import org.springblade.modules.equipage.vo.GunVo;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -74,10 +86,9 @@
//数据同步
String s1 =
- "insert into sys_gun(id,gun_card_number,issue_unit,card_number,gun_mode," +
+ "insert into sys_gun(id,issue_unit,card_number,gun_mode," +
"dept_id,person_in_charge,issue_time,valid_time,jurisdiction) " +
"values(" + "'" + gun.getId() + "'" + "," +
- "'" + gun.getGunCardNumber() + "'" + "," +
"'" + gun.getIssueUnit() + "'" + "," +
"'" + gun.getCardNumber() + "'" + "," +
"'" + gun.getGunMode() + "'" + "," +
@@ -92,8 +103,7 @@
status = gunService.updateById(gun);
//内网同步
String s1 =
- "update sys_gun set gun_card_number = " + "'" + gun.getGunCardNumber() + "'" +
- ",issue_unit = " + "'" + gun.getIssueUnit() + "'" +
+ "update sys_gun set issue_unit = " + "'" + gun.getIssueUnit() + "'" +
",card_number = " + "'" + gun.getCardNumber() + "'" +
",gun_mode = " + "'" + gun.getGunMode() + "'" +
",dept_id = " + "'" + gun.getDeptId() + "'" +
@@ -134,4 +144,42 @@
return R.data(detail);
}
+
+ /**
+ * 导入枪支信息, excel
+ */
+ @PostMapping("import-gun")
+ public R importGun(MultipartFile file, Integer isCovered, String deptId) {
+ GunImporter gunImporter = new GunImporter(gunService, false,deptId);
+ ExcelUtil.save(file, gunImporter, GunExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 枪支导出模板
+ */
+ @GetMapping("export-template-gun")
+ @ApiOperation(value = "导出模板")
+ public void exportGun(HttpServletResponse response) throws IOException {
+ List<GunExcel> list = new ArrayList<>();
+ GunExcel gunExcel1 = new GunExcel();
+ gunExcel1.setDeptId("xxx保安公司");
+ gunExcel1.setCardNumber("x****");
+ gunExcel1.setGunMode("x****");
+ gunExcel1.setIssueUnit("*****");
+ gunExcel1.setPersonInCharge("张三");
+ list.add(gunExcel1);
+ String fileName = null;
+ try {
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
+ fileName = URLEncoder.encode("枪支导入数据模板"+ DateUtil.time(), Charsets.UTF_8.name());
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ //修改单元格格式为文本格式
+ EasyExcel.write(response.getOutputStream(), GunExcel.class).sheet("枪支数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
+ } catch (Throwable var6) {
+ throw var6;
+ }
+ }
+
}
--
Gitblit v1.9.3