From 69545f153da882eb635115a4a38950d19e3b1788 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Mon, 23 Jun 2025 13:46:33 +0800 Subject: [PATCH] 1 --- .../controller/BaseSiteInfoController.java | 8 ++++---- .../base/service/IBaseSiteInfoService.java | 9 +++++++++ .../service/impl/BaseSiteInfoServiceImpl.java | 18 ++++++++++++++++++ dl_vue/public/UEditor/ueditor.config.js | 12 ++++++------ dl_vue/src/api/base/info.js | 7 ++++--- dl_vue/src/components/Editor/index.vue | 2 +- dl_vue/src/views/base/info/index.vue | 15 +++++++-------- 7 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteInfoController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteInfoController.java index fc442dd..895d73b 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteInfoController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteInfoController.java @@ -70,10 +70,10 @@ public class BaseSiteInfoController extends BaseController * 获取站点基础信息详细信息 */ @PreAuthorize("@ss.hasPermi('base:info:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") String id) + @GetMapping(value = "/getSiteInfo") + public AjaxResult getInfo(String tenantId) { - return success(baseSiteInfoService.getById(id)); + return success(baseSiteInfoService.getSiteInfo(tenantId)); } /** @@ -84,7 +84,7 @@ public class BaseSiteInfoController extends BaseController @PostMapping public AjaxResult add(@RequestBody BaseSiteInfo baseSiteInfo) { - return toAjax(baseSiteInfoService.save(baseSiteInfo)); + return toAjax(baseSiteInfoService.saveOrUpdate(baseSiteInfo)); } /** diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseSiteInfoService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseSiteInfoService.java index dcc890d..336e61c 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseSiteInfoService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseSiteInfoService.java @@ -15,4 +15,13 @@ import com.ruoyi.base.domain.BaseSiteInfo; public interface IBaseSiteInfoService extends IService { IPage queryListPage(BaseSiteInfo pageReqVO, Page page); + + /** + * 查询站点详情 + * @author vinjor-M + * @date 11:47 2025/6/23 + * @param tenantId TODO + * @return com.ruoyi.base.domain.BaseSiteInfo + **/ + BaseSiteInfo getSiteInfo(String tenantId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseSiteInfoServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseSiteInfoServiceImpl.java index d3b7d20..1d38975 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseSiteInfoServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseSiteInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.base.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.common.utils.DateUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -27,4 +29,20 @@ public class BaseSiteInfoServiceImpl extends ServiceImpl queryListPage(BaseSiteInfo pageReqVO, Page page) { return baseSiteInfoMapper.queryListPage(pageReqVO, page); } + + /** + * 查询站点详情 + * + * @param tenantId TODO + * @return com.ruoyi.base.domain.BaseSiteInfo + * @author vinjor-M + * @date 11:47 2025/6/23 + **/ + @Override + public BaseSiteInfo getSiteInfo(String tenantId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(BaseSiteInfo::getTenantId,tenantId); + List list = this.list(queryWrapper); + return list.isEmpty()?null:list.get(0); + } } diff --git a/dl_vue/public/UEditor/ueditor.config.js b/dl_vue/public/UEditor/ueditor.config.js index 7a4c626..72f3809 100644 --- a/dl_vue/public/UEditor/ueditor.config.js +++ b/dl_vue/public/UEditor/ueditor.config.js @@ -297,7 +297,7 @@ // 初始化编辑器宽度,默认 1000 // ,initialFrameWidth:1000 // 初始化编辑器高度,默认 320 - // ,initialFrameHeight:320 + ,initialFrameHeight:600 // 编辑器初始化结束后,编辑区域是否是只读的，默认是false , readonly: false @@ -507,17 +507,17 @@ , maxInputCount: 1 // 是否自动长高,默认true - , autoHeightEnabled: true + , autoHeightEnabled: false //scaleEnabled //是否可以拉伸长高,默认true(当开启时，自动长高失效) - //,scaleEnabled:false - //,minFrameWidth:800 //编辑器拖动时最小宽度,默认800 - //,minFrameHeight:220 //编辑器拖动时最小高度,默认220 + ,scaleEnabled:true + // ,minFrameWidth:800 //编辑器拖动时最小宽度,默认800 + ,minFrameHeight:220 //编辑器拖动时最小高度,默认220 //autoFloatEnabled //是否保持toolbar的位置不动,默认true - //,autoFloatEnabled:true + ,autoFloatEnabled:true //浮动时工具栏距离浏览器顶部的高度，用于某些具有固定头部的页面 //,topOffset:30 //编辑器底部距离工具栏高度(如果参数大于等于编辑器高度，则设置无效) diff --git a/dl_vue/src/api/base/info.js b/dl_vue/src/api/base/info.js index 9a6c674..458c946 100644 --- a/dl_vue/src/api/base/info.js +++ b/dl_vue/src/api/base/info.js @@ -10,10 +10,11 @@ export function listInfo(query) { } // 查询站点基础信息详细 -export function getInfo(id) { +export function getInfo(query) { return request({ - url: '/base/info/' + id, - method: 'get' + url: '/base/info/getSiteInfo', + method: 'get', + params: query }) } diff --git a/dl_vue/src/components/Editor/index.vue b/dl_vue/src/components/Editor/index.vue index 701f44d..d89e226 100644 --- a/dl_vue/src/components/Editor/index.vue +++ b/dl_vue/src/components/Editor/index.vue @@ -5,7 +5,7 @@ :destroy="true" :config="editorConfig" :editorDependencies="['ueditor.config.js','ueditor.all.js']" - style="height:500px;width: 100%; overflow: auto "/> + />