diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java index f8b99ea367..198c49a59f 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java @@ -60,5 +60,5 @@ public class IcExportTemplateDTO implements Serializable { * 排序 */ private Integer sort; - + private Integer isSelf; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java index da3951d724..d296ab44b5 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java @@ -55,10 +55,10 @@ public class IcExportTemplateController { @PostMapping("delete") - public Result delete(@RequestBody String[] ids) { + public Result delete(@LoginUser TokenDto tokenDto, @RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - icExportTemplateService.delete(ids); + icExportTemplateService.delete(tokenDto.getUserId(), ids); return new Result(); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateConfigService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateConfigService.java index befc14b67e..d3ef346e50 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateConfigService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateConfigService.java @@ -10,5 +10,12 @@ import com.epmet.entity.IcExportTemplateConfigEntity; * @since v1.0.0 2022-04-21 */ public interface IcExportTemplateConfigService extends BaseService { - + /** + * 删除模板配置 + * @Param tempId + * @Return + * @Author zhaoqifeng + * @Date 2022/4/26 9:56 + */ + void deleteByTempId(String tempId); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java index e952e07d0f..1b20573367 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java @@ -70,7 +70,7 @@ public interface IcExportTemplateService extends BaseService implements IcExportTemplateConfigService { + /** + * 删除模板配置 + * + * @param tempId + * @Param tempId + * @Return + * @Author zhaoqifeng + * @Date 2022/4/26 9:56 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteByTempId(String tempId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcExportTemplateConfigEntity::getTempId, tempId); + baseDao.delete(wrapper); + } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 39dd04282c..50fb337bcd 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -35,11 +35,11 @@ import com.epmet.entity.IcExportTemplateEntity; import com.epmet.service.IcExportTemplateConfigService; import com.epmet.service.IcExportTemplateService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import java.util.*; import java.util.stream.Collectors; @@ -177,9 +177,19 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl idList = Arrays.asList(ids); + idList.forEach(id -> { + IcExportTemplateEntity entity = baseDao.selectById(id); + if (!userId.equals(entity.getCreatedBy())) { + throw new EpmetException("只能删除自己创建的模板"); + } + }); + baseDao.deleteBatchIds(idList); + idList.forEach(id -> { + icExportTemplateConfigService.deleteByTempId(id); + }); } @Override @@ -250,7 +260,21 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); - return ConvertUtils.sourceToTarget(list, IcExportTemplateDTO.class); + List result = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(list)) { + result = list.stream().map(item -> { + IcExportTemplateDTO dto = new IcExportTemplateDTO(); + dto.setId(item.getId()); + dto.setName(item.getName()); + if (tokenDto.getUserId().equals(item.getCreatedBy())) { + dto.setIsSelf(NumConstant.ONE); + } else { + dto.setIsSelf(NumConstant.ZERO); + } + return dto; + }).collect(Collectors.toList()); + } + return result; } /**