导入模板下载+导入功能完成
This commit is contained in:
@@ -1,13 +1,17 @@
|
||||
package com.ruoyi.oa.controller;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import com.ruoyi.common.excel.ExcelResult;
|
||||
import com.ruoyi.oa.listener.SysOaWarehouseListener;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.ruoyi.common.annotation.RepeatSubmit;
|
||||
@@ -24,6 +28,7 @@ import com.ruoyi.oa.domain.vo.SysOaWarehouseVo;
|
||||
import com.ruoyi.oa.domain.bo.SysOaWarehouseBo;
|
||||
import com.ruoyi.oa.service.ISysOaWarehouseService;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
/**
|
||||
* 仓库管理
|
||||
@@ -106,4 +111,28 @@ public class SysOaWarehouseController extends BaseController {
|
||||
@PathVariable Long[] ids) {
|
||||
return toAjax(iSysOaWarehouseService.deleteWithValidByIds(Arrays.asList(ids), true));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 导入数据
|
||||
*
|
||||
* @param file 导入文件
|
||||
* @param updateSupport 是否更新已存在数据
|
||||
*/
|
||||
@Log(title = "投诉工单导入", businessType = BusinessType.IMPORT)
|
||||
@SaCheckPermission("complaint:complaint:import")
|
||||
@PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
|
||||
ExcelResult<SysOaWarehouseVo> result = ExcelUtil.importExcel(file.getInputStream(), SysOaWarehouseVo.class,
|
||||
new SysOaWarehouseListener(true));
|
||||
return R.ok(result.getAnalysis());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取导入模板
|
||||
*/
|
||||
@PostMapping("/importTemplate")
|
||||
public void importTemplate(HttpServletResponse response) {
|
||||
ExcelUtil.exportExcel(new ArrayList<>(), "投诉工单", SysOaWarehouseVo.class, response);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ public class SysOaOutWarehouse extends BaseEntity {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
@TableId(value = "id",type = IdType.AUTO)
|
||||
private Long id;
|
||||
/**
|
||||
* 出库后对应的项目id
|
||||
|
||||
@@ -25,7 +25,7 @@ public class SysOaWarehouse extends BaseEntity {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
@TableId(value = "id",type = IdType.AUTO)
|
||||
private Long id;
|
||||
/**
|
||||
* 库存数量
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.ruoyi.oa.domain.bo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.ruoyi.common.core.validate.AddGroup;
|
||||
import com.ruoyi.common.core.validate.EditGroup;
|
||||
import lombok.Data;
|
||||
@@ -24,6 +26,7 @@ public class SysOaOutWarehouseBo extends BaseEntity {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@TableId(value = "id",type = IdType.AUTO)
|
||||
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.ruoyi.oa.domain.bo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.ruoyi.common.core.validate.AddGroup;
|
||||
import com.ruoyi.common.core.validate.EditGroup;
|
||||
import lombok.Data;
|
||||
@@ -24,6 +26,7 @@ public class SysOaWarehouseBo extends BaseEntity {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@TableId(value = "id",type = IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
|
||||
@@ -24,32 +24,41 @@ public class SysOaWarehouseVo {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@ExcelProperty(value = "主键id")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 序号
|
||||
*/
|
||||
@ExcelProperty(value = "序号")
|
||||
private Long temp;
|
||||
|
||||
|
||||
/**
|
||||
* 物料名称
|
||||
*/
|
||||
@ExcelProperty(value = "物料名称")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 型号
|
||||
*/
|
||||
@ExcelProperty(value = "型号")
|
||||
private String model;
|
||||
|
||||
|
||||
/**
|
||||
* 库存数量
|
||||
*/
|
||||
@ExcelProperty(value = "库存数量")
|
||||
private Long inventory;
|
||||
|
||||
/**
|
||||
* 型号
|
||||
*/
|
||||
@ExcelProperty(value = "型号")
|
||||
private String model;
|
||||
|
||||
/**
|
||||
* 单位
|
||||
*/
|
||||
@ExcelProperty(value = "单位")
|
||||
private String unit;
|
||||
|
||||
/**
|
||||
* 物料名称
|
||||
*/
|
||||
@ExcelProperty(value = "物料名称")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 品牌
|
||||
@@ -70,4 +79,6 @@ public class SysOaWarehouseVo {
|
||||
private String remark;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,108 @@
|
||||
package com.ruoyi.oa.listener;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.alibaba.excel.context.AnalysisContext;
|
||||
import com.alibaba.excel.event.AnalysisEventListener;
|
||||
import com.ruoyi.common.excel.ExcelListener;
|
||||
import com.ruoyi.common.excel.ExcelResult;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.utils.ValidatorUtils;
|
||||
import com.ruoyi.common.utils.spring.SpringUtils;
|
||||
import com.ruoyi.oa.domain.bo.SysOaWarehouseBo;
|
||||
import com.ruoyi.oa.domain.vo.SysOaWarehouseVo;
|
||||
import com.ruoyi.oa.service.ISysOaArticleService;
|
||||
import com.ruoyi.oa.service.ISysOaWarehouseService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Slf4j
|
||||
public class SysOaWarehouseListener extends AnalysisEventListener<SysOaWarehouseVo> implements ExcelListener<SysOaWarehouseVo> {
|
||||
|
||||
private final ISysOaWarehouseService sysOaWarehouseService;
|
||||
|
||||
private final Boolean isUpdateSupport;
|
||||
|
||||
|
||||
private int successNum = 0;
|
||||
private int failureNum = 0;
|
||||
private final StringBuilder successMsg = new StringBuilder();
|
||||
private final StringBuilder failureMsg = new StringBuilder();
|
||||
|
||||
public SysOaWarehouseListener(Boolean isUpdateSupport) {
|
||||
// String initPassword = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.user.initPassword");
|
||||
this.sysOaWarehouseService = SpringUtils.getBean(ISysOaWarehouseService.class);
|
||||
this.isUpdateSupport = isUpdateSupport;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void invoke(SysOaWarehouseVo sysOaWarehouseVo, AnalysisContext context) {
|
||||
SysOaWarehouseBo bo = new SysOaWarehouseBo();
|
||||
bo.setName(sysOaWarehouseVo.getName());
|
||||
if (Objects.nonNull(sysOaWarehouseVo.getModel())){
|
||||
bo.setModel(sysOaWarehouseVo.getModel());
|
||||
}
|
||||
List<SysOaWarehouseVo> complaintVo = this.sysOaWarehouseService.queryList(bo);
|
||||
try {
|
||||
// 验证是否存在这个用户
|
||||
if (complaintVo.size()<=0) {
|
||||
SysOaWarehouseBo add = BeanUtil.toBean(sysOaWarehouseVo, SysOaWarehouseBo.class);
|
||||
ValidatorUtils.validate(complaintVo);
|
||||
sysOaWarehouseService.insertByBo(add);
|
||||
successNum++;
|
||||
successMsg.append("<br/>").append(successNum).append("、物料名称: ").append(add.getName()).append(" 导入成功");
|
||||
} else if (isUpdateSupport) {
|
||||
// 这里是将现有的进行更新
|
||||
SysOaWarehouseVo warehouseVo = complaintVo.get(0);
|
||||
|
||||
SysOaWarehouseBo update = BeanUtil.toBean(sysOaWarehouseVo, SysOaWarehouseBo.class);
|
||||
update.setId(warehouseVo.getId());
|
||||
update.setInventory(warehouseVo.getInventory()+sysOaWarehouseVo.getInventory());
|
||||
ValidatorUtils.validate(complaintVo);
|
||||
sysOaWarehouseService.updateByBo(update);
|
||||
successNum++;
|
||||
successMsg.append("<br/>").append(successNum).append("、物料名称: ").append(update.getName()).append(" 更新成功");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
failureNum++;
|
||||
String msg = "<br/>" + failureNum + "、物料名称: " + sysOaWarehouseVo.getName() + " 导入失败:";
|
||||
failureMsg.append(msg).append(e.getMessage());
|
||||
log.error(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doAfterAllAnalysed(AnalysisContext context) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExcelResult<SysOaWarehouseVo> getExcelResult() {
|
||||
return new ExcelResult<SysOaWarehouseVo>() {
|
||||
|
||||
@Override
|
||||
public String getAnalysis() {
|
||||
if (failureNum > 0) {
|
||||
failureMsg.insert(0, "很抱歉,导入失败!共 " + failureNum + " 条数据格式不正确,错误如下:");
|
||||
throw new ServiceException(failureMsg.toString());
|
||||
} else {
|
||||
successMsg.insert(0, "恭喜您,数据已全部导入成功!共 " + successNum + " 条,数据如下:");
|
||||
}
|
||||
return successMsg.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysOaWarehouseVo> getList() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getErrorList() {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -32,6 +32,7 @@ import java.util.Collection;
|
||||
public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService {
|
||||
|
||||
private final SysOaOutWarehouseMapper baseMapper;
|
||||
|
||||
private final SysOaWarehouseMapper baseMapper2;
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user