Merge remote-tracking branch 'origin/master'

This commit is contained in:
libertyspy
2026-02-08 18:50:38 +08:00

View File

@@ -141,14 +141,15 @@ public class TreenodeinstanceController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:treenodeinstance:add')") @PreAuthorize("@ss.hasPermi('system:treenodeinstance:add')")
@Log(title = "行为树实例节点", businessType = BusinessType.INSERT) @Log(title = "行为树实例节点", businessType = BusinessType.INSERT)
@PostMapping("/saveOrUpdate") @PostMapping("/saveOrUpdate")
public R<Integer> saveOrUpdate(@RequestBody Treenodeinstance treenodeinstance) { public R<Long> saveOrUpdate(@RequestBody Treenodeinstance treenodeinstance) {
if (null == treenodeinstance.getId()) { if (null == treenodeinstance.getId()) {
//新增 //新增
treenodeinstanceService.insertTreenodeinstance(treenodeinstance);
Templateparameterdef templateparameterdef = new Templateparameterdef(); Templateparameterdef templateparameterdef = new Templateparameterdef();
templateparameterdef.setTemplateId(treenodeinstance.getTemplateId()); templateparameterdef.setTemplateId(treenodeinstance.getTemplateId());
List<Templateparameterdef> templateparameterdefs = templateparameterdefService.selectTemplateparameterdefList(templateparameterdef); List<Templateparameterdef> templateparameterdefs = templateparameterdefService.selectTemplateparameterdefList(templateparameterdef);
if (CollectionUtils.isEmpty(templateparameterdefs)) { if (CollectionUtils.isEmpty(templateparameterdefs)) {
return R.ok(treenodeinstanceService.insertTreenodeinstance(treenodeinstance)); return R.ok(treenodeinstance.getId());
} }
templateparameterdefs.forEach(t -> { templateparameterdefs.forEach(t -> {
Nodeparameter nodeparameter = new Nodeparameter(); Nodeparameter nodeparameter = new Nodeparameter();
@@ -158,7 +159,8 @@ public class TreenodeinstanceController extends BaseController {
nodeparameterService.insertNodeparameter(nodeparameter); nodeparameterService.insertNodeparameter(nodeparameter);
}); });
} }
return R.ok(treenodeinstanceService.updateTreenodeinstance(treenodeinstance)); treenodeinstanceService.updateTreenodeinstance(treenodeinstance);
return R.ok(treenodeinstance.getId());
} }
/** /**