From 85ef942e7195abeb71466b7159c3ee30161e1e54 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 07 四月 2026 08:51:01 +0800
Subject: [PATCH] 2026.4.7

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DataProductController.kt |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DataProductController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DataProductController.kt
index d36ec3e..232286c 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DataProductController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DataProductController.kt
@@ -3,6 +3,7 @@
 import cn.flightfeather.supervision.lightshare.service.DataProductService
 import cn.flightfeather.supervision.lightshare.vo.AreaVo
 import cn.flightfeather.supervision.lightshare.vo.ExcelConfigVo
+import cn.flightfeather.supervision.lightshare.vo.dataprod.QueryOpt
 import cn.flightfeather.supervision.model.dataproduct.DataProdOption
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
@@ -16,7 +17,7 @@
  * @date 2024/10/18
  * @author feiyu02
  */
-@Api(tags = ["DataProductController"], description = "鏁版嵁浜у搧鐩稿叧API鎺ュ彛")
+@Api(tags = ["鏁版嵁浜у搧鐩稿叧API鎺ュ彛"], description = "鏁版嵁浜у搧鐩稿叧API鎺ュ彛")
 @RestController
 @RequestMapping("/dataProduct")
 class DataProductController(private val dataProductService: DataProductService) {
@@ -29,17 +30,45 @@
         @RequestParam type: Int,
         @ApiParam("鏄惁寮哄埗鐢熸垚鏂扮殑鎶ュ憡") @RequestParam forceUpdate: Boolean,
         @ApiIgnore response: HttpServletResponse,
-    ) = resPack { dataProductService.downloadProduct(areaVo, type, forceUpdate, response) }
+    ) = dataProductService.downloadProduct(areaVo, type, forceUpdate, response)
 
     @ApiOperation(value = "鑾峰彇闂鏁存敼娓呭崟")
     @PostMapping("/problemChange")
     fun problemChangeList(
         @ApiParam("鏌ヨ鏉′欢") @RequestBody option: DataProdOption,
-    ) = resPack { dataProductService.problemChangeList(option) }
+    ) = dataProductService.problemChangeList(option)
 
     @ApiOperation(value = "鑾峰彇闂澶嶅彂鎯呭喌")
     @PostMapping("/problemRecurrence")
     fun problemRecurrence(
         @ApiParam("鏌ヨ鏉′欢") @RequestBody option: DataProdOption,
-    ) = resPack { dataProductService.problemRecurrence(option) }
+    ) = dataProductService.problemRecurrence(option)
+
+
+
+
+
+
+    @ApiOperation(value = "鏌ヨ鏁版嵁浜у搧椤瑰強瀵瑰簲鐨勭粺璁$姸鎬�")
+    @GetMapping("/type/query")
+    fun findProductType(
+        @ApiParam("浜у搧绫诲瀷", allowableValues = "base, middle, final", format = "base") @RequestParam types: String,
+    ) {
+
+    }
+
+    @ApiOperation(value = "鏌ヨ鏁版嵁浜у搧璁板綍")
+    @PostMapping("/record/query")
+    fun findProduct(
+        @ApiParam("鏌ヨ鏉′欢") @RequestBody queryOpt: QueryOpt,
+        @ApiParam("椤电爜") @RequestParam(value = "page", required = false, defaultValue = "1") page: Int?,
+        @ApiParam("鍗曢〉鏁版嵁閲�") @RequestParam(value = "perPage", required = false, defaultValue = "30") perPage: Int?,
+    ) {
+        // 鏍规嵁浜у搧绫诲瀷缂栧彿銆佸尯鍩熴�佹椂娈点�佸満鏅被鍨嬨�侀厤缃甶d鏌ヨ
+        return dataProductService.findProduct(queryOpt, page ?: 1, perPage ?: 30)
+    }
+
+//    @ApiOperation(value = "鐢熸垚鏁版嵁浜у搧")
+//    @PostMapping("/generate")
+//    fun generateProduct() = dataProductService.generateProduct()
 }
\ No newline at end of file

--
Gitblit v1.9.3