From 9a8d9ef43c70fe6d70b494f49b19e5ca6ef01d4b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 14 三月 2025 17:52:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductMixController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductMixController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductMixController.java
index 91fdd0a..c91e823 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductMixController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductMixController.java
@@ -1,11 +1,12 @@
package org.jeecg.modules.dnc.controller;
-import cn.hutool.core.lang.tree.Tree;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.dnc.entity.ProductMix;
+import org.jeecg.modules.dnc.service.IProductInfoService;
import org.jeecg.modules.dnc.service.IProductMixService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -22,6 +23,8 @@
@Autowired
private IProductMixService iProductMixService;
+ @Autowired
+ private IProductInfoService iProductInfoService;
/**
* 鑾峰彇浜у搧缁撴瀯鏍�
* @return
@@ -30,6 +33,19 @@
@ApiOperation(value = "鑾峰彇浜у搧缁撴瀯鏍�", notes = "鑾峰彇浜у搧缁撴瀯鏍�")
@GetMapping(value = "/getTree")
public Result<?> getTree() {
- return Result.OK(iProductMixService.getTree());
+ List<ProductMix> productMixList = iProductMixService.getTree();
+ return Result.OK(productMixList);
+ }
+
+ /**
+ * 鑾峰彇鍏蜂綋灞傜骇瀹炰綋
+ * @param id,type
+ * @return
+ */
+ @AutoLog(value = "鑾峰彇鍏蜂綋灞傜骇瀹炰綋")
+ @ApiOperation(value = "鑾峰彇鍏蜂綋灞傜骇瀹炰綋", notes = "鑾峰彇鍏蜂綋灞傜骇瀹炰綋")
+ @GetMapping(value = "/getTreeById")
+ public Result<?> getTreeById(String id, Integer type) {
+ return iProductInfoService.getTreeById(id, type);
}
}
--
Gitblit v1.9.3