diff --git a/common/common-botp/src/main/java/apelet/common/botp/controller/ReverseWritingRulesController.java b/common/common-botp/src/main/java/apelet/common/botp/controller/ReverseWritingRulesController.java index 902ecbd..f933825 100644 --- a/common/common-botp/src/main/java/apelet/common/botp/controller/ReverseWritingRulesController.java +++ b/common/common-botp/src/main/java/apelet/common/botp/controller/ReverseWritingRulesController.java @@ -1,8 +1,11 @@ package apelet.common.botp.controller; +import apelet.common.botp.dto.ReverseWritingRulesDto; +import apelet.common.botp.model.ConvertPluginEntry; import apelet.common.botp.model.ReverseWritingBusiness; import apelet.common.botp.model.ReverseWritingFormula; import apelet.common.botp.model.ReverseWritingRules; +import apelet.common.botp.service.IConvertPluginEntryService; import apelet.common.botp.service.IReverseWritingBusinessService; import apelet.common.botp.service.IReverseWritingFormulaService; import apelet.common.botp.service.IReverseWritingRulesService; @@ -12,9 +15,8 @@ import apelet.common.core.object.MyPageData; import apelet.common.core.object.MyPageParam; import apelet.common.core.object.ResponseResult; import apelet.common.core.util.MyPageUtil; -import apelet.common.botp.dto.ReverseWritingRulesDto; -import apelet.common.generator.model.*; -import apelet.common.generator.service.*; +import apelet.common.generator.model.OnlFormHead; +import apelet.common.generator.service.IOnlFormHeadService; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.Page; @@ -26,7 +28,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @@ -47,6 +51,8 @@ public class ReverseWritingRulesController { IReverseWritingBusinessService businessService; @Autowired IOnlFormHeadService onlFormHeadService; + @Autowired + IConvertPluginEntryService convertPluginEntryService; @PostMapping(value = "/page") @Schema(description = "分页查询") @@ -106,6 +112,7 @@ public class ReverseWritingRulesController { rulesService.removeById(id); formulaService.remove(new LambdaQueryWrapper().eq(ReverseWritingFormula::getRulesId, id)); businessService.remove(new LambdaQueryWrapper().eq(ReverseWritingBusiness::getRulesId, id)); + convertPluginEntryService.remove(new LambdaQueryWrapper().eq(ConvertPluginEntry::getParentId, id.toString())); return ResponseResult.success("删除成功"); } @@ -121,6 +128,12 @@ public class ReverseWritingRulesController { return ResponseResult.success(businessList); } + @GetMapping(value = "/getConvertPluginEntry") + public ResponseResult> getConvertPluginEntryByRuleId(@RequestParam Long id) { + List convertPluginEntryList = convertPluginEntryService.list(new LambdaQueryWrapper().eq(ConvertPluginEntry::getParentId, id.toString())); + return ResponseResult.success(convertPluginEntryList); + } + @GetMapping(value = "/getVersionList") @Schema(description = "反写规则版本快照列表") public ResponseResult getVersionList(@RequestParam Long id) { diff --git a/common/common-botp/src/main/java/apelet/common/botp/dto/ReverseWritingRulesDto.java b/common/common-botp/src/main/java/apelet/common/botp/dto/ReverseWritingRulesDto.java index be1f4b5..e1bcb99 100644 --- a/common/common-botp/src/main/java/apelet/common/botp/dto/ReverseWritingRulesDto.java +++ b/common/common-botp/src/main/java/apelet/common/botp/dto/ReverseWritingRulesDto.java @@ -1,6 +1,7 @@ package apelet.common.botp.dto; +import apelet.common.botp.model.ConvertPluginEntry; import apelet.common.botp.model.ReverseWritingBusiness; import apelet.common.botp.model.ReverseWritingFormula; import apelet.common.botp.model.ReverseWritingRules; @@ -30,6 +31,8 @@ public class ReverseWritingRulesDto extends ReverseWritingRules implements Seria private List businessList; + private List convertPluginEntryList; + } diff --git a/common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingRulesServiceImpl.java b/common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingRulesServiceImpl.java index 32f9799..59f037a 100644 --- a/common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingRulesServiceImpl.java +++ b/common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingRulesServiceImpl.java @@ -1,14 +1,12 @@ package apelet.common.botp.service.impl; +import apelet.common.botp.dao.ConvertPluginEntryMapper; import apelet.common.botp.dao.ReverseWritingRulesMapper; import apelet.common.botp.dao.ReverseWritingRulesVerMapper; import apelet.common.botp.dto.ReverseWritingRulesDto; import apelet.common.botp.dto.RuleVersionDiffDto; -import apelet.common.botp.model.ReverseWritingBusiness; -import apelet.common.botp.model.ReverseWritingFormula; -import apelet.common.botp.model.ReverseWritingRules; -import apelet.common.botp.model.ReverseWritingRulesVer; +import apelet.common.botp.model.*; import apelet.common.botp.service.IReverseWritingBusinessService; import apelet.common.botp.service.IReverseWritingFormulaService; import apelet.common.botp.service.IReverseWritingRulesService; @@ -25,12 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Service @@ -45,6 +38,8 @@ public class ReverseWritingRulesServiceImpl extends ServiceImpl businessesList = businessService.list(new LambdaQueryWrapper().in(ReverseWritingBusiness::getRulesId, ids)); List formulaList = formulaService.list(new LambdaQueryWrapper().in(ReverseWritingFormula::getRulesId, ids)); + List convertPluginEntryList = convertPluginEntryMapper.selectList(new LambdaQueryWrapper().in(ConvertPluginEntry::getParentId, ids)); list.forEach(f -> { ReverseWritingRulesDto dto = new ReverseWritingRulesDto(); BeanUtils.copyProperties(f, dto); dto.setBusinessList(businessesList.stream().filter(b -> b.getRulesId().equals(f.getId())).collect(Collectors.toList())); dto.setFormulaList(formulaList.stream().filter(b -> b.getRulesId().equals(f.getId())).collect(Collectors.toList())); + dto.setConvertPluginEntryList(convertPluginEntryList.stream().filter(b -> b.getParentId().equals(f.getId().toString())).collect(Collectors.toList())); dtoList.add(dto); }); return dtoList; @@ -105,6 +102,7 @@ public class ReverseWritingRulesServiceImpl extends ServiceImpl().eq(ReverseWritingFormula::getRulesId, reverseWritingRules.getId())); businessService.remove(new LambdaQueryWrapper().eq(ReverseWritingBusiness::getRulesId, reverseWritingRules.getId())); + convertPluginEntryMapper.delete(new LambdaQueryWrapper().eq(ConvertPluginEntry::getParentId, reverseWritingRules.getId().toString())); remark = RuleSnapshotUtil.REMARK_UPDATE; snapshotVersion = RuleVersionUtil.next(baseVersion); } else { @@ -130,6 +128,14 @@ public class ReverseWritingRulesServiceImpl extends ServiceImpl f.setRulesId(reverseWritingRules.getId())); businessService.saveBatch(businessList); } + List convertPluginEntryList = dto.getConvertPluginEntryList(); + if (ObjectUtil.isNotEmpty(convertPluginEntryList)) { + convertPluginEntryList.forEach(f -> { + f.setParentId(reverseWritingRules.getId().toString()); + convertPluginEntryMapper.insert(f); + }); + + } // 落全量快照 saveSnapshot(reverseWritingRules.getId(), snapshotVersion, remark); return reverseWritingRules;