src/main/java/org/springblade/modules/yw/controller/EmergencySuppliesController.java
@@ -6,15 +6,20 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import javax.validation.Valid; 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.yw.excel.EmergencySuppliesExcel; import org.springblade.modules.yw.excel.SuppliesExcel; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.modules.yw.entity.EmergencySuppliesEntity; import org.springblade.modules.yw.vo.EmergencySuppliesVO; import org.springblade.modules.yw.service.IEmergencySuppliesService; import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; import java.util.Map; @@ -104,4 +109,15 @@ return R.status(emergencySuppliesService.removeByIds(Func.toLongList(ids))); } /** * 导入应急物资信息 */ @PostMapping("import-emergencySupplies") @ApiOperationSupport(order = 8) @ApiOperation(value = "导入应急物资信息", notes = "传入excel") public R importEmergencySupplies(MultipartFile file, Integer isCovered) { String data = emergencySuppliesService.importEmergencySupplies(ExcelUtil.read(file, EmergencySuppliesExcel.class),isCovered == 1); return R.data(200, data, data); } } src/main/java/org/springblade/modules/yw/entity/EmergencySuppliesEntity.java
@@ -52,21 +52,27 @@ */ @ApiModelProperty(value = "应急物资名称") private String name; /** * 应急物资类型 */ @ApiModelProperty(value = "应急物资类型") private Integer type; /** * 数量 */ @ApiModelProperty(value = "数量") private Integer number; private String number; /** * 单位 */ @ApiModelProperty(value = "单位") private String unit; private Integer unit; /** * 位置 */ @ApiModelProperty(value = "位置") private String address; @ApiModelProperty(value = "存储位置") private String stoLoc; /** * 物资库id */ src/main/java/org/springblade/modules/yw/excel/EmergencySuppliesExcel.java
New file @@ -0,0 +1,70 @@ package org.springblade.modules.yw.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import org.springblade.common.excel.ExcelDictConverter; import org.springblade.common.excel.ExcelDictItemLabel; import java.io.Serializable; /** * 应急物资 excel 模板 * @author zhongrj * @date 2024-10-28 */ @Data @ColumnWidth(25) @HeadRowHeight(20) @ContentRowHeight(18) public class EmergencySuppliesExcel implements Serializable { private static final long serialVersionUID = 1L; @ColumnWidth(20) @ExcelProperty("企业名称*") private String firmName; @ColumnWidth(20) @ExcelProperty("仓库名称*") private String suppliesName; @ColumnWidth(20) @ExcelProperty("应急物资名称*") private String name; @ColumnWidth(20) @ExcelProperty(value = "应急物资类型",converter = ExcelDictConverter.class) @ExcelDictItemLabel(type = "eme_sup_type") private String type; /** * 数量 */ @ExcelProperty("型号") private String model; /** * 数量 */ @ExcelProperty("数量/单位") private String numbers; /** * 数量 */ @ExcelProperty("数量*") private String number; /** * 单位 */ @ExcelProperty(value = "单位",converter = ExcelDictConverter.class) @ExcelDictItemLabel(type = "unit") private String unit; @ExcelProperty("存储位置") private String stoLoc; @ExcelProperty("备注") private String remark; } src/main/java/org/springblade/modules/yw/service/IEmergencySuppliesService.java
@@ -2,8 +2,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.springblade.modules.yw.entity.EmergencySuppliesEntity; import org.springblade.modules.yw.excel.EmergencySuppliesExcel; import org.springblade.modules.yw.vo.EmergencySuppliesVO; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; /** * 应急物资表 服务类 @@ -21,5 +24,11 @@ */ IPage<EmergencySuppliesVO> selectEmergencySuppliesPage(IPage<EmergencySuppliesVO> page, EmergencySuppliesVO emergencySupplies); /** * 导入应急物资信息 * @param data * @param isCovered * @return */ String importEmergencySupplies(List<EmergencySuppliesExcel> data, boolean isCovered); } src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
@@ -1,12 +1,24 @@ package org.springblade.modules.yw.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.logging.log4j.util.Strings; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.modules.yw.entity.EmergencySuppliesEntity; import org.springblade.modules.yw.entity.FirmInfo; import org.springblade.modules.yw.entity.SuppliesEntity; import org.springblade.modules.yw.excel.EmergencySuppliesExcel; import org.springblade.modules.yw.service.IFirmInfoService; import org.springblade.modules.yw.service.ISuppliesService; import org.springblade.modules.yw.vo.EmergencySuppliesVO; import org.springblade.modules.yw.mapper.EmergencySuppliesMapper; import org.springblade.modules.yw.service.IEmergencySuppliesService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; import java.util.Objects; /** * 应急物资表 服务实现类 @@ -17,10 +29,107 @@ @Service public class EmergencySuppliesServiceImpl extends ServiceImpl<EmergencySuppliesMapper, EmergencySuppliesEntity> implements IEmergencySuppliesService { @Autowired private IFirmInfoService firmInfoService; @Autowired private ISuppliesService suppliesService; /** * 自定义分页查询 * @param page * @param emergencySupplies * @return */ @Override public IPage<EmergencySuppliesVO> selectEmergencySuppliesPage(IPage<EmergencySuppliesVO> page, EmergencySuppliesVO emergencySupplies) { return page.setRecords(baseMapper.selectEmergencySuppliesPage(page, emergencySupplies)); } /** * 导入应急物资信息 * @param data * @param isCovered * @return */ @Override public String importEmergencySupplies(List<EmergencySuppliesExcel> data, boolean isCovered) { for (EmergencySuppliesExcel emergencySuppliesExcel : data) { EmergencySuppliesEntity emergencySuppliesEntity = Objects.requireNonNull(BeanUtil.copy(emergencySuppliesExcel, EmergencySuppliesEntity.class)); // 物资类型转换 if (!Strings.isBlank(emergencySuppliesExcel.getType())){ emergencySuppliesEntity.setType(Integer.parseInt(emergencySuppliesExcel.getType())); } // 物资单位转换 if (!Strings.isBlank(emergencySuppliesExcel.getUnit())){ emergencySuppliesEntity.setUnit(Integer.parseInt(emergencySuppliesExcel.getUnit())); } // 设置企业和仓库 setFirm(emergencySuppliesExcel,emergencySuppliesEntity); setSupplies(emergencySuppliesExcel,emergencySuppliesEntity); // 查询是否已入库 Long id = isSave(emergencySuppliesEntity); // 已入库 if (null!=id){ if (isCovered){ emergencySuppliesEntity.setId(id); // 覆盖-更新 updateById(emergencySuppliesEntity); break; } } // 保存 save(emergencySuppliesEntity); } return null; } /** * 判断物资是否已经入库 * @param emergencySuppliesEntity * @return */ private Long isSave(EmergencySuppliesEntity emergencySuppliesEntity) { QueryWrapper<EmergencySuppliesEntity> wrapper = new QueryWrapper<>(); wrapper.eq("name",emergencySuppliesEntity.getName()) .eq("firm_id",emergencySuppliesEntity.getFirmId()) .eq("supplies_id",emergencySuppliesEntity.getSuppliesId()) .eq("is_deleted",0); EmergencySuppliesEntity one = getOne(wrapper); if (null!=one){ return one.getId(); } return null; } /** * 设置企业信息 * @param emergencySuppliesExcel * @param emergencySuppliesEntity */ private void setFirm(EmergencySuppliesExcel emergencySuppliesExcel, EmergencySuppliesEntity emergencySuppliesEntity) { QueryWrapper<FirmInfo> wrapper = new QueryWrapper<>(); wrapper.eq("name",emergencySuppliesExcel.getFirmName()) .eq("is_deleted",0); FirmInfo firmInfo = firmInfoService.getOne(wrapper); if (null!=firmInfo){ emergencySuppliesEntity.setFirmId(firmInfo.getId()); } } /** * 设置仓库信息 * @param emergencySuppliesExcel * @param emergencySuppliesEntity */ private void setSupplies(EmergencySuppliesExcel emergencySuppliesExcel, EmergencySuppliesEntity emergencySuppliesEntity) { QueryWrapper<SuppliesEntity> wrapper = new QueryWrapper<>(); wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId()) .eq("name",emergencySuppliesExcel.getName()) .eq("is_deleted",0); SuppliesEntity suppliesEntity = suppliesService.getOne(wrapper); if (null!=suppliesEntity){ emergencySuppliesEntity.setSuppliesId(suppliesEntity.getId()); } } }