From cf46f9b5c15cc997fa341ab3954d833f296b0123 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Wed, 13 Aug 2025 09:18:56 +0800 Subject: [PATCH] 1 --- .../base/controller/BaseSiteController.java | 2 +- .../ruoyi/base/controller/WebController.java | 11 ++-- .../com/ruoyi/base/domain/BaseSiteInfo.java | 5 ++ .../com/ruoyi/base/mapper/BaseSiteMapper.java | 2 + .../base/service/IBaseManagerService.java | 5 +- .../ruoyi/base/service/IBaseSiteService.java | 8 +++ .../service/impl/BaseSiteServiceImpl.java | 18 ++++++ .../com/ruoyi/busi/domain/BusiCategory.java | 12 ++++ .../mapper/base/BaseSiteInfoMapper.xml | 3 +- .../resources/mapper/base/BaseSiteMapper.xml | 11 ++++ .../mapper/busi/BusiCategoryMapper.xml | 5 +- dl_vue/src/layout/components/Navbar.vue | 51 +++++++++------ dl_vue/src/layout/index.vue | 64 ++++++++++++++++++- dl_vue/src/views/base/info/index.vue | 16 +++-- .../views/busi/category/form/categoryForm.vue | 31 +++++++-- 15 files changed, 201 insertions(+), 43 deletions(-) diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteController.java index d4c097d..8e98259 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteController.java @@ -62,7 +62,7 @@ public class BaseSiteController extends BaseController { **/ @GetMapping("/listAll") public AjaxResult list() { - return success(baseSiteService.list()); + return success(baseSiteService.getMySiteList()); } /** diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java index e265329..5b010fa 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java @@ -65,14 +65,10 @@ public class WebController extends BaseController { @Autowired private IBusiProdNewService prodNewService; @Autowired - private IBaseNationalService nationalService; - @Autowired private IBusiInquiryItemService inquiryItemService; @Autowired private IBusiChatMainService busiChatMainService; @Autowired - private GoogleKeywordService googleKeywordService; - @Autowired private IBusiPageService pageService; @Autowired private CommonUtils commonUtils; @@ -157,9 +153,12 @@ public class WebController extends BaseController { @ApiOperation("公司介绍-富文本-首页展示区域") @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @GetMapping("/indexCompanyInfo") - public R indexCompanyInfo(@RequestParam(required = true) String tenantId) { + public R> indexCompanyInfo(@RequestParam(required = true) String tenantId) { BaseSiteInfo baseSiteInfo = siteInfoService.getSiteInfo(tenantId); - return R.ok(baseSiteInfo.getCompanyInfo()); + Map map = new HashMap<>(); + map.put("content",baseSiteInfo.getCompanyInfo()); + map.put("contentApp",baseSiteInfo.getCompanyInfoApp()); + return R.ok(map); } /** diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseSiteInfo.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseSiteInfo.java index d95dfa5..5894efb 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseSiteInfo.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseSiteInfo.java @@ -97,6 +97,11 @@ public class BaseSiteInfo extends DlBaseEntity @ApiModelProperty("公司介绍") private String companyInfo; + /** 公司介绍-移动端 */ + @Excel(name = "公司介绍-移动端") + @ApiModelProperty("公司介绍-移动端") + private String companyInfoApp; + /** 站点唯一编码（租户id） */ @Excel(name = "站点唯一编码", readConverterExp = "租=户id") @ApiModelProperty("站点唯一编码") diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseSiteMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseSiteMapper.java index ec68933..213aa86 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseSiteMapper.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseSiteMapper.java @@ -19,4 +19,6 @@ import org.apache.ibatis.annotations.Mapper; public interface BaseSiteMapper extends BaseMapper { IPage queryListPage(@Param("entity") BaseSite entity, Page page); + + List selectByUserId(@Param("userId")Long userId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseManagerService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseManagerService.java index acec129..39f31ab 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseManagerService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseManagerService.java @@ -14,8 +14,7 @@ import com.ruoyi.common.core.domain.entity.SysUser; * @author vinjor-m * @date 2025-08-11 */ -public interface IBaseManagerService extends IService -{ +public interface IBaseManagerService extends IService { IPage queryListPage(ManagerVO pageReqVO, Page page); /** @@ -26,4 +25,6 @@ public interface IBaseManagerService extends IService * @return java.util.List **/ List getManagerUserByTenantId(String tenantId); + + } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseSiteService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseSiteService.java index d662731..0585154 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseSiteService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseSiteService.java @@ -16,4 +16,12 @@ import com.ruoyi.base.vo.SiteVO; public interface IBaseSiteService extends IService { IPage queryListPage(BaseSite pageReqVO, Page page); + + /** + * 查询本人可以管理的站点 + * @author vinjor-M + * @date 16:17 2025/8/11 + * @return java.util.List + **/ + List getMySiteList(); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseSiteServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseSiteServiceImpl.java index 755d2e4..df30c94 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseSiteServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseSiteServiceImpl.java @@ -6,6 +6,7 @@ import com.ruoyi.base.vo.SiteVO; import com.ruoyi.common.utils.DateUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -29,4 +30,21 @@ public class BaseSiteServiceImpl extends ServiceImpl i public IPage queryListPage(BaseSite pageReqVO, Page page) { return baseSiteMapper.queryListPage(pageReqVO, page); } + + /** + * 查询本人可以管理的站点 + * + * @return java.util.List + * @author vinjor-M + * @date 16:17 2025/8/11 + **/ + @Override + public List getMySiteList() { + Long userId = SecurityUtils.getUserId(); + if(1==userId){ + //超级管理员，查所有站点 + return this.list(); + } + return baseSiteMapper.selectByUserId(userId); + } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiCategory.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiCategory.java index 4dd6fb6..b48c161 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiCategory.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiCategory.java @@ -84,16 +84,28 @@ public class BusiCategory extends DlBaseEntity @Excel(name = "内容html", readConverterExp = "适=用于单页面+询盘") @ApiModelProperty("内容html") private String content; + /** 内容html-移动端（适用于单页面+询盘） */ + @Excel(name = "内容html-移动端", readConverterExp = "适=用于单页面+询盘") + @ApiModelProperty("内容html-移动端") + private String contentApp; /** 产品上方内容html（适用于产品） */ @Excel(name = "产品上方内容html", readConverterExp = "适=用于产品") @ApiModelProperty("产品上方内容html") private String prodUp; + /** 产品上方内容html-移动端（适用于产品） */ + @Excel(name = "产品上方内容html-移动端", readConverterExp = "适=用于产品") + @ApiModelProperty("产品上方内容html-移动端") + private String prodUpApp; /** 产品下方内容html（适用于产品） */ @Excel(name = "产品下方内容html", readConverterExp = "适=用于产品") @ApiModelProperty("产品下方内容html") private String prodDown; + /** 产品下方内容html-移动端（适用于产品） */ + @Excel(name = "产品下方内容html-移动端", readConverterExp = "适=用于产品") + @ApiModelProperty("产品下方内容html-移动端") + private String prodDownApp; /** 站点唯一编码（租户id） */ @Excel(name = "站点唯一编码", readConverterExp = "租=户id") diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseSiteInfoMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseSiteInfoMapper.xml index 6148c1d..71e21a6 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseSiteInfoMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseSiteInfoMapper.xml @@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, company_name, fax_number, brand_name, tel, email, teams, copyright, address, icon, logo, qr_code, contact_us,company_info, tenant_id, creator, create_time, updater, update_time, del_flag from dl_base_site_info + select id, company_name, fax_number, brand_name, tel, email, teams, copyright, address, icon, logo, qr_code, contact_us,company_info,company_info_app, tenant_id, creator, create_time, updater, update_time, del_flag from dl_base_site_info + \ No newline at end of file diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiCategoryMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiCategoryMapper.xml index f268318..0fa0f0d 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiCategoryMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiCategoryMapper.xml @@ -17,8 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -28,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, catg_name, catg_level, catg_type, parent_id, prods_junior, prods_all, title, keyword, description, sort, content, prod_up, prod_down, tenant_id, creator, create_time, updater, update_time, del_flag from dl_busi_category + select id, catg_name, catg_level, catg_type, parent_id, prods_junior, prods_all, title, keyword, description, sort, content,content_app, prod_up,prod_up_app, prod_down,prod_down_app, tenant_id, creator, create_time, updater, update_time, del_flag from dl_busi_category