From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhitan-admin/src/main/java/com/zhitan/web/controller/branchanalysis/BranchEnergyAnalysisController.java |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/branchanalysis/BranchEnergyAnalysisController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/branchanalysis/BranchEnergyAnalysisController.java
new file mode 100644
index 0000000..f6f0895
--- /dev/null
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/branchanalysis/BranchEnergyAnalysisController.java
@@ -0,0 +1,37 @@
+package com.zhitan.web.controller.branchanalysis;
+
+import com.zhitan.branchanalysis.domain.BranchAnalysisVO;
+import com.zhitan.common.core.controller.BaseController;
+import com.zhitan.common.core.domain.AjaxResult;
+import com.zhitan.branchanalysis.service.IBranchAnalysisService;
+
+import com.zhitan.realtimedata.domain.dto.BranchAnalysisDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
+
+/**
+ *鏀矾鐢ㄨ兘鍒嗘瀽
+ *
+ * @author zt
+ * @date 2025-03-26
+ */
+@RestController
+@RequestMapping("/branchanalysis")
+@Api(value = "鏀矾鐢ㄨ兘鑳借�楃粺璁�",tags = {"鏀矾鐢ㄨ兘鍒嗘瀽"})
+public class BranchEnergyAnalysisController extends BaseController {
+
+    @Autowired
+    private IBranchAnalysisService branchAnalysisService;
+
+    @GetMapping("/list")
+    @ApiOperation(value = "鏀矾鐢ㄨ兘鑳借�楃粺璁″垪琛�")
+    public AjaxResult list(BranchAnalysisDTO dataItem)  {
+        BranchAnalysisVO vo = branchAnalysisService.getBranchAnalysisService(dataItem);
+        return success(vo);
+    }
+}
+

--
Gitblit v1.9.3