From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysConfigController.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysConfigController.java
new file mode 100644
index 0000000..ab8324b
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysConfigController.java
@@ -0,0 +1,66 @@
+package com.ruoyi.web.controller.api;
+
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.dto.TTenantDTO;
+import com.ruoyi.system.model.TSysConfig;
+import com.ruoyi.system.model.TTenant;
+import com.ruoyi.system.query.TTenantQuery;
+import com.ruoyi.system.service.TSysConfigService;
+import com.ruoyi.system.service.TTenantService;
+import com.ruoyi.system.vo.TenantVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 系统公共参数设置 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-17
+ */
+@Api(tags = "系统公共参数设置")
+@RestController
+@RequestMapping("/t-sys-config")
+public class TSysConfigController {
+
+
+ private final TSysConfigService sysConfigService;
+ @Autowired
+ public TSysConfigController(TSysConfigService sysConfigService) {
+ this.sysConfigService = sysConfigService;
+ }
+
+ /**
+ * 系统公共参数设置详情
+ */
+ @PreAuthorize("@ss.hasPermi('system:commonParameter')")
+ @ApiOperation(value = "查看系统公共参数设置详情")
+ @GetMapping(value = "/getDetailById")
+ public R<TSysConfig> getDetailById() {
+ return R.ok(sysConfigService.getById(1));
+ }
+
+ /**
+ * 修改系统公共参数设置
+ */
+ @PreAuthorize("@ss.hasPermi('system:commonParameter:save')")
+ @Log(title = "租户信息-修改系统公共参数设置", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改系统公共参数设置")
+ @PostMapping(value = "/update")
+ public R<Boolean> update(@RequestBody TSysConfig sysConfig) {
+ return R.ok(sysConfigService.updateById(sysConfig));
+ }
+
+}
+
--
Gitblit v1.7.1