"...platform/git@gitlab.ruzhoukj.com:wujipeng/relation.git" did not exist on "7aa0800bfc3146b5378d7f7e8e89394523703b80"
Commit b13cd184 authored by zhuxiang's avatar zhuxiang
Browse files

Merge remote-tracking branch 'origin/dev' into dev

parents 29136673 f18f31ef
......@@ -56,6 +56,13 @@
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>
<!-- EasyExcel -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>3.3.2</version>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
......
......@@ -35,7 +35,7 @@ public class ExcelTemplateController extends BaseController {
@ApiOperation(value = "详情")
@GetMapping("/{id}")
public Result<ExcelTemplateVO> detail(@PathVariable Integer id) {
return Result.data(DozerUtils.convertBean(excelTemplateService.getById(id), ExcelTemplateVO.class));
return Result.data(excelTemplateService.detail(id));
}
@ApiOperation(value = "新增编辑")
......
package com.platform.controller;
import com.alibaba.excel.EasyExcel;
import com.platform.model.dto.ExcelTemplateDTO;
import com.platform.model.dto.WhiteDTO;
import com.platform.model.entity.WhiteEntity;
import com.platform.model.resp.Result;
import com.platform.model.vo.ExcelTemplateVO;
import com.platform.model.vo.WhiteVO;
......@@ -11,8 +13,12 @@ import com.platform.utils.DozerUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.List;
/**
......@@ -54,4 +60,38 @@ public class WhiteController extends BaseController {
return Result.data(whiteService.removeBatchByIds(ids));
}
@ApiOperation(value = "导出")
@PostMapping("/export")
public void exportExcel(HttpServletResponse response, @RequestBody WhiteDTO whiteDTO) throws IOException {
// 设置响应头
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("白名单", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
// 查询数据
startPage(whiteDTO.getPageNum(), whiteDTO.getPageSize());
List<WhiteVO> list = whiteService.exportExcel(whiteDTO);
// 写入Excel
EasyExcel.write(response.getOutputStream(), WhiteVO.class)
.sheet("白名单")
.doWrite(list);
}
@ApiOperation("导入")
@PostMapping("/import")
public Result<String> importExcel(@RequestParam("file") MultipartFile file) throws IOException {
// 读取Excel
List<WhiteEntity> list = EasyExcel.read(file.getInputStream())
.head(WhiteEntity.class)
.sheet()
.doReadSync();
// 保存数据
whiteService.importExcel(list);
return Result.data("导入成功,共导入 " + list.size() + " 条数据");
}
}
......@@ -24,6 +24,7 @@ public class ExcelDataEntity {
private String id;
@TableField("case_id")
@ApiModelProperty("案件id")
private String caseId;
@TableField("directory_id")
......
package com.platform.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
......@@ -18,6 +20,10 @@ public class UserAccountEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableField("case_id")
@ApiModelProperty("案件id")
private String caseId;
private String userName;
private String account;
......
package com.platform.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
......@@ -18,6 +20,10 @@ public class UserEntity {
@TableId(value = "id",type = IdType.AUTO)
private int id;
@TableField("case_id")
@ApiModelProperty("案件id")
private String caseId;
private String userName;
private String sex;
......
package com.platform.model.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
......@@ -21,19 +22,24 @@ public class WhiteEntity {
@TableId(type = IdType.AUTO)
@ApiModelProperty("序号")
@ExcelProperty(value = "序号")
private Integer id;
@ApiModelProperty("账户名称")
@ExcelProperty(value = "账户名称")
private String name;
@ApiModelProperty("账号")
@ExcelProperty(value = "账号")
private String amount;
@ApiModelProperty("加入时间")
@ExcelProperty(value = "加入时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date time;
@ApiModelProperty("加入用户")
@ExcelProperty(value = "加入用户")
private String user;
}
package com.platform.model.vo;
import com.platform.model.entity.ExcelTemplateEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* @author : wujipeng
* @date : 2025/7/30 15:12
......@@ -13,4 +16,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
public class ExcelTemplateVO extends ExcelTemplateEntity {
@ApiModelProperty("表头解析,方便操作使用")
private List<TableHeaderVO> tableHeaderList;
}
......@@ -15,5 +15,19 @@ import java.util.List;
*/
public interface ExcelTemplateService extends IService<ExcelTemplateEntity> {
/**
* 分页
*
* @param excelTemplateDTO excelTemplateDTO
* @return List<ExcelTemplateVO>
*/
List<ExcelTemplateVO> pageExcelTemplate(ExcelTemplateDTO excelTemplateDTO);
/**
* 详情
*
* @param id id
* @return ExcelTemplateVO
*/
ExcelTemplateVO detail(Integer id);
}
......@@ -30,4 +30,19 @@ public interface WhiteService extends IService<WhiteEntity> {
* @return Boolean
*/
Boolean saveWhite(WhiteDTO whiteDTO);
/**
* 导出
*
* @return List<WhiteEntity>
*/
List<WhiteVO> exportExcel(WhiteDTO whiteDTO);
/**
* 导入
*
* @param list list
*/
void importExcel(List<WhiteEntity> list);
}
......@@ -212,11 +212,20 @@ public class AnalysisServiceImpl implements AnalysisService {
.idCard(idCardInfo.get("idCard"))
.sex(idCardInfo.get("sex"))
.idType("身份证")
.caseId(caseId)
.build());
}
if (!excelData.isEmpty()) {
List<String> paymentBankNames = excelData.stream().map(ExcelDataEntity::getPaymentBankName).distinct().collect(Collectors.toList());
userAccountService.saveUserBatch(paymentBankNames.stream().map(paymentBankName -> UserAccountEntity.builder().userName(userName).account(paymentBankName).build()).collect(Collectors.toList()));
List<UserAccountEntity> userAccountList = Lists.newArrayList();
for (String paymentBankName : paymentBankNames) {
userAccountList.add(UserAccountEntity.builder()
.userName(userName)
.account(paymentBankName)
.caseId(caseId)
.build());
}
userAccountService.saveUserBatch(userAccountList);
}
}
......
package com.platform.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.mapper.ExcelTemplateMapper;
import com.platform.model.dto.ExcelTemplateDTO;
import com.platform.model.entity.ExcelTemplateEntity;
import com.platform.model.vo.ExcelTemplateVO;
import com.platform.model.vo.TableHeaderVO;
import com.platform.service.ExcelTemplateService;
import com.platform.utils.DozerUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.List;
......@@ -20,6 +24,25 @@ import java.util.List;
public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, ExcelTemplateEntity> implements ExcelTemplateService {
@Override
public List<ExcelTemplateVO> pageExcelTemplate(ExcelTemplateDTO excelTemplateDTO) {
return baseMapper.pageExcelTemplate(excelTemplateDTO);
List<ExcelTemplateVO> excelTemplateList = baseMapper.pageExcelTemplate(excelTemplateDTO);
for (ExcelTemplateVO excelTemplateVO : excelTemplateList) {
if(!ObjectUtils.isEmpty(excelTemplateVO)){
String json = excelTemplateVO.getJson();
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplateVO.setTableHeaderList(tableHeaderList);
}
}
return excelTemplateList;
}
@Override
public ExcelTemplateVO detail(Integer id) {
ExcelTemplateVO excelTemplate = DozerUtils.convertBean(getById(id), ExcelTemplateVO.class);
if(!ObjectUtils.isEmpty(excelTemplate)){
String json = excelTemplate.getJson();
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplate.setTableHeaderList(tableHeaderList);
}
return excelTemplate;
}
}
......@@ -7,6 +7,7 @@ import com.platform.model.entity.WhiteEntity;
import com.platform.model.vo.WhiteVO;
import com.platform.service.WhiteService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
......@@ -30,4 +31,15 @@ public class WhiteServiceImpl extends ServiceImpl<WhiteMapper, WhiteEntity> impl
//TODO 添加用户
return save(whiteDTO);
}
@Override
public List<WhiteVO> exportExcel(WhiteDTO whiteDTO) {
return baseMapper.pageWhite(whiteDTO);
}
@Override
@Transactional
public void importExcel(List<WhiteEntity> list) {
saveBatch(list);
}
}
......@@ -4,9 +4,9 @@
<mapper namespace="com.platform.mapper.UserAccountMapper">
<insert id="saveUserBatch">
insert IGNORE into user_account (user_name, account) values
insert IGNORE into user_account (user_name, account, case_id) values
<foreach item="item" collection="userAccountList" separator=",">
(#{item.userName}, #{item.account})
(#{item.userName}, #{item.account}, #{item.caseId})
</foreach>
</insert>
</mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment