From 2cffa027595247c136a8ee95f5f745c58cb0cce5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 09 五月 2026 13:08:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/account/controller/AccountSubjectController.java |   70 +++++++++++++++++++++++++++++++++++
 1 files changed, 70 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/controller/AccountSubjectController.java b/src/main/java/com/ruoyi/account/controller/AccountSubjectController.java
new file mode 100644
index 0000000..8282883
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/AccountSubjectController.java
@@ -0,0 +1,70 @@
+package com.ruoyi.account.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.AccountSubjectDto;
+import com.ruoyi.account.bean.vo.AccountSubjectVo;
+import com.ruoyi.account.service.AccountSubjectService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 鎬昏处绉戠洰琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-07 04:45:30
+ */
+@RestController
+@RequestMapping("/accountSubject")
+@RequiredArgsConstructor
+@Tag(name = "鎬昏处绉戠洰")
+public class AccountSubjectController {
+    private final AccountSubjectService accountSubjectService;
+
+    @GetMapping("/list")
+    @Log(title = "鎬昏处绉戠洰鏁版嵁闆嗗悎", businessType = BusinessType.OTHER)
+    @Operation(summary = "鎬昏处绉戠洰鍒嗛〉鏌ヨ")
+    public R<IPage<AccountSubjectVo>> AccountSubjectDtoList(Page<AccountSubjectDto> page, AccountSubjectDto accountSubjectDto) {
+        IPage<AccountSubjectVo> paramList = accountSubjectService.baseList(page, accountSubjectDto);
+        return R.ok(paramList);
+    }
+
+    @PostMapping("/add")
+    @Log(title = "鏂板鎬昏处绉戠洰", businessType = BusinessType.INSERT)
+    @Operation(summary = "鏂板鎬昏处绉戠洰")
+    public R AccountSubjectDtoAdd(@RequestBody AccountSubjectDto accountSubjectDto) {
+        return R.ok(accountSubjectService.save(accountSubjectDto));
+    }
+
+    @PutMapping("/edit")
+    @Log(title = "淇敼鎬昏处绉戠洰", businessType = BusinessType.UPDATE)
+    @Operation(summary = "淇敼鎬昏处绉戠洰")
+    public R AccountSubjectDtoEdit(@RequestBody AccountSubjectDto accountSubjectDto) {
+        return R.ok(accountSubjectService.updateById(accountSubjectDto));
+    }
+
+    @DeleteMapping("/remove/{ids}")
+    @Log(title = "鍒犻櫎鎬昏处绉戠洰", businessType = BusinessType.DELETE)
+    @Operation(summary = "鍒犻櫎鎬昏处绉戠洰")
+    public R AccountSubjectDtooRemove(@PathVariable Long[] ids) {
+        return R.ok(accountSubjectService.removeBatchByIds(Arrays.asList(ids)));
+    }
+
+    @PostMapping("/export")
+    @Operation(summary = "瀵煎嚭鎬昏处绉戠洰鏂囦欢")
+    @Log(title = "瀵煎嚭鎬昏处绉戠洰鏂囦欢", businessType = BusinessType.EXPORT)
+    public void exportAccountSubject(HttpServletResponse response) {
+        accountSubjectService.exportAccountSubject(response);
+    }
+
+}

--
Gitblit v1.9.3