src/main/java/org/springblade/modules/yw/controller/EmergencySuppliesController.java
@@ -118,4 +118,15 @@ return R.data(200, data, data); } /** * 获取应急物资信息 * @param emergencySupplies * @return */ @GetMapping("/getEmergencySuppliesList") @ApiOperationSupport(order = 9) @ApiOperation(value = "获取应急物资信息", notes = "传入emergencySupplies") public R getEmergencySuppliesList(EmergencySuppliesVO emergencySupplies) { return R.data(emergencySuppliesService.getEmergencySuppliesList(emergencySupplies)); } } src/main/java/org/springblade/modules/yw/controller/YwAttachController.java
@@ -15,7 +15,10 @@ import org.springblade.modules.yw.entity.YwAttachEntity; import org.springblade.modules.yw.vo.YwAttachVO; import org.springblade.modules.yw.service.IYwAttachService; import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; import java.util.List; import java.util.Map; /** @@ -103,4 +106,18 @@ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { return R.status(attachService.removeByIds(Func.toLongList(ids))); } /** * 导入单位附件信息 * @param files * @param firmId * @return */ @PostMapping("/importAttach") @ApiOperationSupport(order = 8) @ApiOperation(value = "导入单位附件信息", notes = "传入文件") public R importAttach(List<MultipartFile> files, Long firmId,Integer type) { return attachService.importAttach(files,firmId,type); } } src/main/java/org/springblade/modules/yw/entity/YwAttachEntity.java
@@ -34,6 +34,12 @@ */ @ApiModelProperty(value = "企业id") private Long firmId; /** * 类型 */ @ApiModelProperty(value = "类型") private Integer type; /** * 名称 */ src/main/java/org/springblade/modules/yw/service/IEmergencySuppliesService.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; import java.util.Map; /** * 应急物资表 服务类 @@ -31,4 +32,11 @@ * @return */ String importEmergencySupplies(List<EmergencySuppliesExcel> data, boolean isCovered); /** * 获取应急物资信息 * @param emergencySupplies * @return */ Map<String,Object> getEmergencySuppliesList(EmergencySuppliesVO emergencySupplies); } src/main/java/org/springblade/modules/yw/service/IYwAttachService.java
@@ -1,9 +1,13 @@ package org.springblade.modules.yw.service; import com.baomidou.mybatisplus.extension.service.IService; import org.springblade.core.tool.api.R; import org.springblade.modules.yw.entity.YwAttachEntity; import org.springblade.modules.yw.vo.YwAttachVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.web.multipart.MultipartFile; import java.util.List; /** * 业务附件表 服务类 @@ -21,4 +25,11 @@ */ IPage<YwAttachVO> selectAttachPage(IPage<YwAttachVO> page, YwAttachVO attach); /** * 导入单位附件信息 * @param files * @param firmId * @return */ R importAttach(List<MultipartFile> files, Long firmId,Integer type); } src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
@@ -1,5 +1,6 @@ package org.springblade.modules.yw.service.impl; import com.aspose.cad.internal.J.W; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.logging.log4j.util.Strings; @@ -7,9 +8,11 @@ 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.entity.YwAttachEntity; 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.service.IYwAttachService; import org.springblade.modules.yw.vo.EmergencySuppliesVO; import org.springblade.modules.yw.mapper.EmergencySuppliesMapper; import org.springblade.modules.yw.service.IEmergencySuppliesService; @@ -17,7 +20,9 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; /** @@ -34,6 +39,9 @@ @Autowired private ISuppliesService suppliesService; @Autowired private IYwAttachService attachService; /** * 自定义分页查询 @@ -134,4 +142,28 @@ emergencySuppliesEntity.setSuppliesId(suppliesEntity.getId()); } } /** * 获取应急物资信息 * @param emergencySupplies * @return */ @Override public Map<String, Object> getEmergencySuppliesList(EmergencySuppliesVO emergencySupplies) { Map<String, Object> map = new HashMap<>(); // 查询企业对应的应急物资信息 QueryWrapper<EmergencySuppliesEntity> wrapper = new QueryWrapper<>(); wrapper.eq("firm_id",emergencySupplies.getFirmId()).eq("is_deleted",0); List<EmergencySuppliesEntity> list = list(wrapper); map.put("dataList",list); // 查询企业对应应急物资的图片 QueryWrapper<YwAttachEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("firm_id",emergencySupplies.getFirmId()).eq("type",2).eq("is_deleted",0); // 查询 List<YwAttachEntity> attachEntityList = attachService.list(queryWrapper); // 设置 map.put("picList",attachEntityList); // 返回 return map; } } src/main/java/org/springblade/modules/yw/service/impl/YwAttachServiceImpl.java
@@ -1,12 +1,20 @@ package org.springblade.modules.yw.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.oss.model.BladeFile; import org.springblade.core.tool.api.R; import org.springblade.modules.resource.builder.OssBuilder; import org.springblade.modules.yw.entity.YwAttachEntity; import org.springblade.modules.yw.vo.YwAttachVO; import org.springblade.modules.yw.mapper.YwAttachMapper; import org.springblade.modules.yw.service.IYwAttachService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.util.List; /** * 业务附件表 服务实现类 @@ -17,9 +25,47 @@ @Service public class YwAttachServiceImpl extends ServiceImpl<YwAttachMapper, YwAttachEntity> implements IYwAttachService { /** * 对象存储构建类 */ @Autowired private OssBuilder ossBuilder; @Override public IPage<YwAttachVO> selectAttachPage(IPage<YwAttachVO> page, YwAttachVO attach) { return page.setRecords(baseMapper.selectAttachPage(page, attach)); } /** * 导入单位附件信息 * @param files * @param firmId * @param type * @return */ @Override public R importAttach(List<MultipartFile> files, Long firmId,Integer type) { // 遍历文件导入 for (MultipartFile file : files) { String originalFilename = file.getOriginalFilename(); String[] split = originalFilename.split("\\."); // 设置 try { // 文件上传 BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), file.getInputStream()); // 设置信息 YwAttachEntity attachEntity = new YwAttachEntity(); attachEntity.setName(split[0]); attachEntity.setLink(bladeFile.getLink()); attachEntity.setFirmId(firmId); attachEntity.setType(type); // 保存 save(attachEntity); } catch (IOException e) { e.printStackTrace(); } } return null; } }
