From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java
index 35e15af..e301848 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java
@@ -1,7 +1,12 @@
package com.ruoyi.other.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.other.api.domain.THtml;
import com.ruoyi.other.api.domain.TNotice;
import com.ruoyi.other.service.THtmlService;
@@ -23,16 +28,26 @@
public class THtmlController {
@Resource
private THtmlService htmlService;
-
-
-
+
+
+ @RequiresPermissions(value = {"/protocolServerDescription"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-内容设置-协议服务"},value = "新增修改")
@PostMapping(value = "/saveOrUpdate")
+ @Log(title = "【协议服务】新增修改协议", businessType = BusinessType.INSERT)
public AjaxResult saveOrUpdate(@RequestBody THtml tHtml) {
- htmlService.saveOrUpdate(tHtml);
+ THtml one = htmlService.lambdaQuery().eq(THtml::getType, tHtml.getType()).one();
+ if(one!=null){
+ one.setContent(tHtml.getContent());
+ htmlService.updateById(one);
+ }else {
+ htmlService.save(tHtml);
+ }
return AjaxResult.success();
}
-
+
+
+
+ @RequiresPermissions(value = {"/protocolServerDescription"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-内容设置-协议服务"},value = "查询")
@GetMapping(value = "/selectByType/{type}")
public AjaxResult selectByType(@PathVariable Integer type) {
--
Gitblit v1.7.1