From 39cfebfb374d01450697b9b84de9907ab9b9054e Mon Sep 17 00:00:00 2001 From: xjm Date: Tue, 11 Jun 2024 17:42:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=80=81=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?,excel=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3,excel=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A7=A3=E6=9E=90=E6=8E=A5=E5=8F=A3,excel=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AddressBookOldController.java | 28 ++++++++++-------- .../com/whdc/model/vo/ExcelOldDataVo.java | 29 +++++++++++++++++++ src/main/resources/application.yml | 10 +++---- 3 files changed, 50 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/whdc/model/vo/ExcelOldDataVo.java diff --git a/src/main/java/com/whdc/controller/AddressBookOldController.java b/src/main/java/com/whdc/controller/AddressBookOldController.java index 1aad34e..6d9932a 100644 --- a/src/main/java/com/whdc/controller/AddressBookOldController.java +++ b/src/main/java/com/whdc/controller/AddressBookOldController.java @@ -1,11 +1,13 @@ package com.whdc.controller; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.whdc.exception.MyException; import com.whdc.model.dto.AddressBookOldDto; import com.whdc.model.entity.AddressBookOld; import com.whdc.model.vo.ExcelDataVo; +import com.whdc.model.vo.ExcelOldDataVo; import com.whdc.service.IAddressBookOldService; import com.whdc.utils.ExcelCommon; import com.whdc.utils.ResultJson; @@ -23,7 +25,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.time.LocalDateTime; import java.util.List; -import java.util.Set; import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -84,21 +85,27 @@ public class AddressBookOldController { List list = service.lambdaQuery() .list(); ExcelCommon.exportExcel(list, - null, "防汛抗旱通讯录", AddressBookOld.class, "防汛抗旱通讯录_" + LocalDateTime.now() + ".xlsx", + null, "防汛抗旱通讯录", AddressBookOld.class, "湖北省防汛抗旱通信录模版" + LocalDateTime.now() + ".xlsx", response); } @ApiOperation(value = "解析文件数据") @PostMapping(value = "getExcelData") - public ResultJson getExcelData(MultipartFile file) { + public ResultJson getExcelData(MultipartFile file) { List appends = ExcelCommon.importExcel(file, 0, 1, AddressBookOld.class); - ExcelDataVo excelDataVo = new ExcelDataVo(); + ExcelOldDataVo excelDataVo = new ExcelOldDataVo(); if (CollectionUtils.isNotEmpty(appends)){ + appends = appends.stream().filter(vo -> + StringUtils.isNotBlank(vo.getName()) + && StringUtils.isNotBlank(vo.getCtnm()) + && StringUtils.isNotBlank(vo.getCnnm()) + ).collect(Collectors.toList()); String key = UUID.randomUUID().toString().replaceAll("-", ""); redisTemplate.opsForValue().set(ADDRESS_BOOK_TEMP_REDIS_KEY + key, JSON.toJSONString(appends), 30, TimeUnit.MINUTES); excelDataVo.setKey(key); + excelDataVo.setList(appends); } return ResultJson.ok(excelDataVo); @@ -117,19 +124,16 @@ public class AddressBookOldController { throw new MyException("文件数据为空"); } - Set set = appends.stream().map(vo -> vo.getName() + "_" + vo.getPhone()).collect(Collectors.toSet()); - if (set.size() != appends.size()){ - throw new MyException("联系人重复"); - } +// Set set = appends.stream().map(vo -> vo.getName() + "_" + vo.getPhone()).collect(Collectors.toSet()); +// if (set.size() != appends.size()){ +// throw new MyException("联系人重复"); +// } - LambdaQueryChainWrapper deleteAll = service.lambdaQuery(); - deleteAll.gt(AddressBookOld::getId,0); - boolean r1 = service.remove(deleteAll); + boolean r1 = service.remove(Wrappers.emptyWrapper()); if (!r1) { throw new MyException("通讯录数据删除失败"); } - if (!service.saveBatch(appends)) { throw new MyException("表格数据新增失败"); } diff --git a/src/main/java/com/whdc/model/vo/ExcelOldDataVo.java b/src/main/java/com/whdc/model/vo/ExcelOldDataVo.java new file mode 100644 index 0000000..107fb2a --- /dev/null +++ b/src/main/java/com/whdc/model/vo/ExcelOldDataVo.java @@ -0,0 +1,29 @@ +package com.whdc.model.vo; + +import com.whdc.model.entity.AddressBookOld; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * Description: + * Created by XuSan on 2024/5/28. + * + * @author XuSan + * @version 1.0 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ExcelOldDataVo { + + @ApiModelProperty(value = "数据") + private List list; + + @ApiModelProperty(value = "键") + private String key; + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8e932c4..a533313 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,7 +10,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: dm.jdbc.driver.DmDriver - url: jdbc:dm://10.0.41.113:5236?schema=FXKH_TXL + url: jdbc:dm://local.gunshiiot.com:5236?schema=FXKH_TXL username: SYSDBA password: SYSDBA001 # url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL @@ -39,11 +39,11 @@ spring: # Redis redis: database: 5 -# host: 10.42.6.75 - host: 127.0.0.1 + host: 10.42.6.75 +# host: 127.0.0.1 port: 6379 - password: -# password: Whdc_890 +# password: + password: Whdc_890 servlet: multipart: