From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductMixController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 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
new file mode 100644
index 0000000..c91e823
--- /dev/null
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductMixController.java
@@ -0,0 +1,51 @@
+package org.jeecg.modules.dnc.controller;
+
+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;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@Api(tags = "缁撴瀯鏍�")
+@RestController
+@RequestMapping("/nc/product")
+public class ProductMixController {
+ @Autowired
+ private IProductMixService iProductMixService;
+
+ @Autowired
+ private IProductInfoService iProductInfoService;
+ /**
+ * 鑾峰彇浜у搧缁撴瀯鏍�
+ * @return
+ */
+ @AutoLog(value = "鑾峰彇浜у搧缁撴瀯鏍�")
+ @ApiOperation(value = "鑾峰彇浜у搧缁撴瀯鏍�", notes = "鑾峰彇浜у搧缁撴瀯鏍�")
+ @GetMapping(value = "/getTree")
+ public Result<?> 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