src/main/java/org/springblade/modules/yw/controller/EmergencySpaceController.java
@@ -6,15 +6,18 @@ 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.EmergencySpaceExcel; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.modules.yw.entity.EmergencySpaceEntity; import org.springblade.modules.yw.vo.EmergencySpaceVO; import org.springblade.modules.yw.service.IEmergencySpaceService; import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; import java.util.Map; @@ -104,4 +107,14 @@ return R.status(emergencySpaceService.removeByIds(Func.toLongList(ids))); } /** * 导入应急空间信息 */ @PostMapping("import-emergencySpace") @ApiOperationSupport(order = 8) @ApiOperation(value = "导入应急空间信息", notes = "传入excel") public R importEmergencySpace(MultipartFile file, Integer isCovered) { String data = emergencySpaceService.importEmergencySpace(ExcelUtil.read(file, EmergencySpaceExcel.class),isCovered == 1); return R.data(200, data, data); } } src/main/java/org/springblade/modules/yw/controller/EmergencySuppliesController.java
@@ -6,14 +6,12 @@ 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; src/main/java/org/springblade/modules/yw/entity/EmergencySpaceEntity.java
@@ -44,7 +44,7 @@ * 主要功能 见字典 */ @ApiModelProperty(value = "主要功能 见字典") private Integer mainFunc; private String mainFunc; /** * 经度 */ src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java
New file @@ -0,0 +1,53 @@ 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-29 */ @Data @ColumnWidth(25) @HeadRowHeight(20) @ContentRowHeight(18) public class EmergencySpaceExcel implements Serializable { private static final long serialVersionUID = 1L; @ColumnWidth(20) @ExcelProperty("应急空间名称*") private String name; @ColumnWidth(20) @ExcelProperty("企业名称") private String firmName; @ColumnWidth(20) @ExcelProperty(value = "防控级别",converter = ExcelDictConverter.class) @ExcelDictItemLabel(type = "pre_level") private String preLevel; @ColumnWidth(20) @ExcelProperty(value = "功能",converter = ExcelDictConverter.class) @ExcelDictItemLabel(type = "emergency_space_use") private String mainFunc; @ExcelProperty("经度") private String lng; @ExcelProperty("纬度") private String lat; @ExcelProperty("可用容量(立方米)或转输(处置)能力(立方米/小时)") private Double capacity; @ExcelProperty("备注") private String remark; } src/main/java/org/springblade/modules/yw/service/IEmergencySpaceService.java
@@ -2,8 +2,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.springblade.modules.yw.entity.EmergencySpaceEntity; import org.springblade.modules.yw.excel.EmergencySpaceExcel; import org.springblade.modules.yw.vo.EmergencySpaceVO; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; /** * 应急空间表 服务类 @@ -21,4 +24,11 @@ */ IPage<EmergencySpaceVO> selectEmergencySpacePage(IPage<EmergencySpaceVO> page, EmergencySpaceVO emergencySpace); /** * 导入应急空间信息 * @param data * @param isCovered * @return */ String importEmergencySpace(List<EmergencySpaceExcel> data, boolean isCovered); } src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java
@@ -1,12 +1,22 @@ 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.common.utils.PositionUtil; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.modules.yw.entity.EmergencySpaceEntity; import org.springblade.modules.yw.entity.FirmInfo; import org.springblade.modules.yw.excel.EmergencySpaceExcel; import org.springblade.modules.yw.service.IFirmInfoService; import org.springblade.modules.yw.vo.EmergencySpaceVO; import org.springblade.modules.yw.mapper.EmergencySpaceMapper; import org.springblade.modules.yw.service.IEmergencySpaceService; 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,9 +27,88 @@ @Service public class EmergencySpaceServiceImpl extends ServiceImpl<EmergencySpaceMapper, EmergencySpaceEntity> implements IEmergencySpaceService { @Autowired private IFirmInfoService firmInfoService; /** * 自定义分页查询 * @param page * @param emergencySpace * @return */ @Override public IPage<EmergencySpaceVO> selectEmergencySpacePage(IPage<EmergencySpaceVO> page, EmergencySpaceVO emergencySpace) { return page.setRecords(baseMapper.selectEmergencySpacePage(page, emergencySpace)); } /** * 导入应急空间信息 * @param data * @param isCovered * @return */ @Override public String importEmergencySpace(List<EmergencySpaceExcel> data, boolean isCovered) { for (EmergencySpaceExcel emergencySpaceExcel : data) { // 数据拷贝 EmergencySpaceEntity emergencySpaceEntity = Objects.requireNonNull(BeanUtil.copy(emergencySpaceExcel, EmergencySpaceEntity.class)); // 防控转换 if (!Strings.isBlank(emergencySpaceExcel.getPreLevel())){ emergencySpaceEntity.setPreLevel(Integer.parseInt(emergencySpaceExcel.getPreLevel())); } // 经纬度转换 if (!Strings.isBlank(emergencySpaceExcel.getLng())) { emergencySpaceEntity.setLng(PositionUtil.tranformPos(emergencySpaceExcel.getLng()).toString()); } if (!Strings.isBlank(emergencySpaceExcel.getLat())) { emergencySpaceEntity.setLat(PositionUtil.tranformPos(emergencySpaceExcel.getLat()).toString()); } // 设置企业id setFirm(emergencySpaceExcel,emergencySpaceEntity); // 是否已入库 Long id = isSave(emergencySpaceEntity); if (null!=id){ if (isCovered){ // 覆盖更新 emergencySpaceEntity.setId(id); updateById(emergencySpaceEntity); continue; } } // 保存 save(emergencySpaceEntity); } return null; } /** * 判断是否保存入库 * @param emergencySpaceEntity * @return */ private Long isSave(EmergencySpaceEntity emergencySpaceEntity) { QueryWrapper<EmergencySpaceEntity> wrapper = new QueryWrapper<>(); wrapper.eq("name",emergencySpaceEntity.getName()) .eq("is_deleted",0); EmergencySpaceEntity one = getOne(wrapper); if (null!=one){ return one.getId(); } return null; } /** * 设置企业信息 * @param emergencySpaceExcel * @param emergencySpaceEntity */ private void setFirm(EmergencySpaceExcel emergencySpaceExcel, EmergencySpaceEntity emergencySpaceEntity) { QueryWrapper<FirmInfo> wrapper = new QueryWrapper<>(); wrapper.eq("name",emergencySpaceExcel.getFirmName()) .eq("is_deleted",0); FirmInfo firmInfo = firmInfoService.getOne(wrapper); if (null!=firmInfo){ emergencySpaceEntity.setFirmId(firmInfo.getId()); } } } src/main/resources/application.yml
@@ -239,7 +239,7 @@ #接口放行 skip-url: - /blade-test/** - /yw/firmInfo/** # - /yw/** #授权认证配置 auth: - method: ALL