Merge branch 'cpq-dev' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -591,7 +591,7 @@ public interface ISysBaseAPI extends CommonAPI {
      * @param orgCode 部门编码
      * @return
      */
-    public List<String> getUserAccountsByDepCode(String orgCode);
+    List<String> getUserAccountsByDepCode(String orgCode);
 
     /**
      * 检查查询sql的表和字段是否在白名单中
@@ -610,10 +610,6 @@ public interface ISysBaseAPI extends CommonAPI {
      */
     boolean dictTableWhiteListCheckByDict(String tableOrDictCode, String... fields);
 
-    boolean isOem();
-
     boolean isAdmin();
 
-    List<String> getOemGroupUids();
-
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/api/controller/OpenAPIController.java

@@ -1,12 +1,9 @@
 package org.jeecg.modules.adweb.api.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
-
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.IgnoreAuth;
@@ -30,9 +27,11 @@ public class OpenAPIController {
     private static final String BEARER_TOKEN_HEADER = "AdWeb-Authorization";
     private static final String STATIC_BEARER_TOKEN = "Bearer uxl9Wpzh65vXNUyDvynJDjBo";
 
-    @Resource private CommonMapper commonMapper;
+    @Resource
+    private CommonMapper commonMapper;
 
-    @Resource private IAdwebSiteService adwebSiteService;
+    @Resource
+    private IAdwebSiteService adwebSiteService;
 
     @IgnoreAuth
     @PostMapping("/product/list")
@@ -63,7 +62,11 @@ public class OpenAPIController {
     @IgnoreAuth
     @PostMapping("/product/getMaxDate")
     @ResponseBody
-    public Result<?> getMaxDate(HttpServletRequest request) {
+    public Result<?> getMaxDate(
+            @RequestHeader(value = BEARER_TOKEN_HEADER, required = true) String authToken,
+            HttpServletRequest request) {
+        this.validateAuthToken(authToken);
+
         String domain = request.getParameter("siteHost");
         if (domain == null) {
             return Result.error("未传递合法的参数！");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/mapper/CommonMapper.java

@@ -23,7 +23,7 @@ public interface CommonMapper {
      */
     Date getMaxDate(String tableName, String fieldName, String filter);
 
-    @Select("SELECT t1.id id,t1.realname realName\n" +
+    @Select("SELECT t1.id id, t1.username userName, t1.realname realName\n" +
             "FROM sys_user t1 Left JOIN sys_user_role t2\n" +
             "ON t1.id = t2.user_id\n" +
             "Left JOIN sys_role t3\n" +

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/controller/AdwebEnquiryBlacklistController.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
@@ -16,10 +15,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.vo.LoginUser;
-
 import org.jeecg.modules.adweb.enquiry.constant.EnquiryDistributeTypeConstant;
 import org.jeecg.modules.adweb.enquiry.dto.result.EnquiryListDto;
 import org.jeecg.modules.adweb.enquiry.entity.AdwebEnquiry;
@@ -28,7 +25,6 @@ import org.jeecg.modules.adweb.enquiry.entity.AdwebSiteBlackEmail;
 import org.jeecg.modules.adweb.enquiry.service.IAdwebEnquiryBlacklistService;
 import org.jeecg.modules.adweb.enquiry.service.IAdwebEnquiryService;
 import org.jeecg.modules.adweb.enquiry.service.IAdwebSiteBlackEmailService;
-
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.adweb.site.service.ISiteUserPermissionService;
@@ -60,10 +56,7 @@ public class AdwebEnquiryBlacklistController extends JeecgController<AdwebEnquir
     private IAdwebEnquiryService adwebEnquiryService;
 
     @Resource
-    private ISysBaseAPI sysBaseAPI;
-
-	@Resource
-	private SysAdwebApi sysAdwebApi;
+    private SysAdwebApi sysAdwebApi;
 
     @Resource
     private IAdwebSiteService adwebSiteService;
@@ -92,11 +85,11 @@ public class AdwebEnquiryBlacklistController extends JeecgController<AdwebEnquir
         if (siteId != null) {
             List<Integer> siteIds = adwebSiteService.getAllSiteIdByParentId(siteId);
             queryWrapper.in("site_id", siteIds);
-        } else if (!sysBaseAPI.isAdmin()) {
-            if (sysBaseAPI.isOem()) {
-                List<String> oemGroupUids = sysBaseAPI.getOemGroupUids();
+        } else if (!sysAdwebApi.isAdmin()) {
+            if (sysAdwebApi.isChannelAdmin()) {
+                List<String> channelGroupUids = sysAdwebApi.getChannelGroupUids();
 
-                List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(oemGroupUids);
+                List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(channelGroupUids);
                 QueryWrapper<AdwebSite> queryWrapper1 = new QueryWrapper<>();
                 queryWrapper1.ne("status", 0);
                 queryWrapper1.in("code", codeList);
@@ -136,7 +129,7 @@ public class AdwebEnquiryBlacklistController extends JeecgController<AdwebEnquir
         queryWrapper.orderByDesc("create_time");
         Page<AdwebEnquiryBlacklist> page = new Page<AdwebEnquiryBlacklist>(pageNo, pageSize);
         IPage<AdwebEnquiryBlacklist> pageList = adwebEnquiryBlacklistService.page(page, queryWrapper);
-        
+
         return Result.OK(pageList);
     }
 
@@ -210,7 +203,7 @@ public class AdwebEnquiryBlacklistController extends JeecgController<AdwebEnquir
      * @return
      */
     @AutoLog(value = "adweb_enquiry_blacklist-编辑")
-	@Operation(summary = "adweb_enquiry_blacklist-编辑")
+    @Operation(summary = "adweb_enquiry_blacklist-编辑")
     @PutMapping(value = "/edit")
     public Result<?> edit(@RequestBody AdwebEnquiryBlacklist adwebEnquiryBlacklist) {
         adwebEnquiryBlacklistService.updateById(adwebEnquiryBlacklist);
@@ -224,7 +217,7 @@ public class AdwebEnquiryBlacklistController extends JeecgController<AdwebEnquir
      * @return
      */
     @AutoLog(value = "adweb_enquiry_blacklist-通过id删除")
-	@Operation(summary = "adweb_enquiry_blacklist-通过id删除")
+    @Operation(summary = "adweb_enquiry_blacklist-通过id删除")
     @DeleteMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
         adwebEnquiryBlacklistService.removeById(id);
@@ -255,7 +248,7 @@ public class AdwebEnquiryBlacklistController extends JeecgController<AdwebEnquir
      * @return
      */
     @AutoLog(value = "adweb_enquiry_blacklist-批量删除")
-	@Operation(summary = "adweb_enquiry_blacklist-批量删除")
+    @Operation(summary = "adweb_enquiry_blacklist-批量删除")
     @DeleteMapping(value = "/deleteBatch")
     public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         this.adwebEnquiryBlacklistService.removeByIds(Arrays.asList(ids.split(",")));
@@ -269,7 +262,7 @@ public class AdwebEnquiryBlacklistController extends JeecgController<AdwebEnquir
      * @return
      */
     @AutoLog(value = "adweb_enquiry_blacklist-通过id查询")
-	@Operation(summary = "adweb_enquiry_blacklist-通过id查询")
+    @Operation(summary = "adweb_enquiry_blacklist-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
         AdwebEnquiryBlacklist adwebEnquiryBlacklist = adwebEnquiryBlacklistService.getById(id);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/controller/AdwebEnquiryController.java

@@ -5,16 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
@@ -129,8 +125,8 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
 
         if (sysAdwebApi.isAdmin()) {
 
-        } else if (sysAdwebApi.isOem()) {
-            uidList = sysAdwebApi.getOemGroupUids();
+        } else if (sysAdwebApi.isChannelAdmin()) {
+            uidList = sysAdwebApi.getChannelGroupUids();
         } else {
             uidList = new ArrayList<>();
             uidList.add(sysUser.getId());
@@ -401,9 +397,9 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
                 queryWrapper.ne("status", 0);
                 List<AdwebSite> sites = adwebSiteService.list(queryWrapper);
                 siteIds = sites.stream().map(AdwebSite::getId).collect(Collectors.toList());
-            } else if (sysAdwebApi.isOem()) {
-                List<String> oemGroupUids = sysAdwebApi.getOemGroupUids();
-                List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(oemGroupUids);
+            } else if (sysAdwebApi.isChannelAdmin()) {
+                List<String> channelGroupUids = sysAdwebApi.getChannelGroupUids();
+                List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(channelGroupUids);
                 LambdaQueryWrapper<AdwebSite> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.in(AdwebSite::getCode, codeList);
                 queryWrapper.ne(AdwebSite::getStatus, 0);
@@ -516,7 +512,7 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
      */
     @GetMapping("/read")
     public Result<?> read(@Param("id") String id) {
-        if (disableAdminRead && (sysAdwebApi.isAdmin() || sysAdwebApi.isOem())) {
+        if (disableAdminRead && (sysAdwebApi.isAdmin() || sysAdwebApi.isChannelAdmin())) {
             return Result.OK();
         }
         UpdateWrapper<AdwebEnquiry> updateWrapper = new UpdateWrapper<>();
@@ -614,8 +610,8 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
         List<String> uidList = null;
 
         if (sysAdwebApi.isAdmin()) {
-        } else if (sysAdwebApi.isOem()) {
-            uidList = sysAdwebApi.getOemGroupUids();
+        } else if (sysAdwebApi.isChannelAdmin()) {
+            uidList = sysAdwebApi.getChannelGroupUids();
         } else {
             uidList = new ArrayList<>();
             uidList.add(sysUser.getId());

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/controller/AdwebSiteBlackEmailController.java

@@ -15,7 +15,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.adweb.common.util.AdwebRedisUtil;
@@ -28,6 +27,7 @@ import org.jeecg.modules.adweb.enquiry.service.IAdwebSiteBlackEmailService;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.adweb.site.service.ISiteUserPermissionService;
+import org.jeecg.modules.adweb.system.service.SysAdwebApi;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -48,10 +48,12 @@ public class AdwebSiteBlackEmailController extends JeecgController<AdwebSiteBlac
 
     @Resource
     private IAdwebSiteBlackEmailService enquirySiteBlackEmailService;
+
     @Resource
     private AdwebRedisUtil adwebRedisUtil;
+
     @Resource
-    private ISysBaseAPI sysBaseAPI;
+    private SysAdwebApi sysAdwebApi;
 
     @Resource
     private IAdwebSiteService adwebSiteService;
@@ -93,10 +95,10 @@ public class AdwebSiteBlackEmailController extends JeecgController<AdwebSiteBlac
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<String> codeList = null;
         List<String> uidList = null;
-        if (sysBaseAPI.isAdmin()) {
+        if (sysAdwebApi.isAdmin()) {
 
-        } else if (sysBaseAPI.isOem()) {
-            uidList = sysBaseAPI.getOemGroupUids();
+        } else if (sysAdwebApi.isChannelAdmin()) {
+            uidList = sysAdwebApi.getChannelGroupUids();
         } else {
             uidList = new ArrayList<>();
             uidList.add(sysUser.getId());
@@ -112,7 +114,7 @@ public class AdwebSiteBlackEmailController extends JeecgController<AdwebSiteBlac
                 QueryWrapper<AdwebSite> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("id", enquirySiteBlackEmail.getSiteId()).or().eq("parent_group_code", siteCode);
                 queryWrapper.ne("status", 0);
-                queryWrapper.in(!sysBaseAPI.isAdmin(), "code", siteCodeList);
+                queryWrapper.in(!sysAdwebApi.isAdmin(), "code", siteCodeList);
                 codeList = adwebSiteService.list(queryWrapper).stream().map(AdwebSite::getCode).collect(Collectors.toList());
             }
         } else {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/controller/AdwebSiteBlackIpController.java

@@ -15,7 +15,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.adweb.common.util.AdwebRedisUtil;
@@ -24,6 +23,7 @@ import org.jeecg.modules.adweb.enquiry.service.IAdwebSiteBlackIpService;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.adweb.site.service.ISiteUserPermissionService;
+import org.jeecg.modules.adweb.system.service.SysAdwebApi;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -47,8 +47,9 @@ public class AdwebSiteBlackIpController extends JeecgController<AdwebSiteBlackIp
     private IAdwebSiteService adwebSiteService;
     @Resource
     private ISiteUserPermissionService siteUserPermissionService;
+
     @Resource
-    private ISysBaseAPI sysBaseAPI;
+    private SysAdwebApi sysAdwebApi;
 
     @Resource
     private AdwebRedisUtil adwebRedisUtil;
@@ -81,10 +82,10 @@ public class AdwebSiteBlackIpController extends JeecgController<AdwebSiteBlackIp
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<String> codeList = null;
         List<String> uidList = null;
-        if (sysBaseAPI.isAdmin()) {
+        if (sysAdwebApi.isAdmin()) {
 
-        } else if (sysBaseAPI.isOem()) {
-            uidList = sysBaseAPI.getOemGroupUids();
+        } else if (sysAdwebApi.isChannelAdmin()) {
+            uidList = sysAdwebApi.getChannelGroupUids();
         } else {
             uidList = new ArrayList<>();
             uidList.add(sysUser.getId());
@@ -100,7 +101,7 @@ public class AdwebSiteBlackIpController extends JeecgController<AdwebSiteBlackIp
                 QueryWrapper<AdwebSite> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("id", adwebSiteBlackIp.getSiteId()).or().eq("parent_group_code", siteCode);
                 queryWrapper.ne("status", 0);
-                queryWrapper.in(!sysBaseAPI.isAdmin(), "code", siteCodeList);
+                queryWrapper.in(!sysAdwebApi.isAdmin(), "code", siteCodeList);
                 codeList = adwebSiteService.list(queryWrapper).stream().map(AdwebSite::getCode).collect(Collectors.toList());
             }
         } else {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/controller/AdwebSiteEnquiryRuleController.java

@@ -14,7 +14,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.adweb.enquiry.entity.AdwebSiteEnquiryRule;
@@ -23,6 +22,7 @@ import org.jeecg.modules.adweb.enquiry.service.IAdwebSiteEnquiryRuleService;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.adweb.site.service.ISiteUserPermissionService;
+import org.jeecg.modules.adweb.system.service.SysAdwebApi;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -49,7 +49,7 @@ public class AdwebSiteEnquiryRuleController extends JeecgController<AdwebSiteEnq
     @Resource
     private IAdwebSiteService adwebSiteService;
     @Resource
-    private ISysBaseAPI sysBaseAPI;
+    private SysAdwebApi sysAdwebApi;
     @Resource
     private ISiteUserPermissionService siteUserPermissionService;
 
@@ -72,10 +72,10 @@ public class AdwebSiteEnquiryRuleController extends JeecgController<AdwebSiteEnq
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<String> codeList = null;
         List<String> uidList = null;
-        if (sysBaseAPI.isAdmin()) {
+        if (sysAdwebApi.isAdmin()) {
 
-        } else if (sysBaseAPI.isOem()) {
-            uidList = sysBaseAPI.getOemGroupUids();
+        } else if (sysAdwebApi.isChannelAdmin()) {
+            uidList = sysAdwebApi.getChannelGroupUids();
         } else {
             uidList = new ArrayList<>();
             uidList.add(sysUser.getId());
@@ -91,7 +91,7 @@ public class AdwebSiteEnquiryRuleController extends JeecgController<AdwebSiteEnq
                 QueryWrapper<AdwebSite> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("id", adwebEnquirySiteRule.getSiteId()).or().eq("parent_group_code", siteCode);
                 queryWrapper.ne("status", 0);
-                queryWrapper.in(!sysBaseAPI.isAdmin(), "code", siteCodeList);
+                queryWrapper.in(!sysAdwebApi.isAdmin(), "code", siteCodeList);
                 codeList = adwebSiteService.list(queryWrapper).stream().map(AdwebSite::getCode).collect(Collectors.toList());
             }
         } else {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/product/entity/AdwebProduct.java

@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -62,6 +63,7 @@ public class AdwebProduct implements Serializable {
      */
     @Excel(name = "站点code", width = 15)
     @Schema(description = "站点code")
+    @Dict(dictTable = "adweb_site", dicCode = "code", dicText = "name")
     private java.lang.String siteCode;
     /**
      * mq生产时间

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/impl/SeoKeywordsRankServiceImpl.java

@@ -3,18 +3,14 @@ package org.jeecg.modules.adweb.seo.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xkcoding.http.util.StringUtil;
-
 import jakarta.annotation.Resource;
-
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.adweb.common.constant.AdwebConstant;
 import org.jeecg.modules.adweb.seo.dto.ComprehensiveStatistics;
@@ -33,6 +29,7 @@ import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.adweb.site.service.ISiteUserPermissionService;
 import org.jeecg.modules.adweb.subscribePlan.entity.SubscribePlan;
 import org.jeecg.modules.adweb.subscribePlan.mapper.SubscribePlanMapper;
+import org.jeecg.modules.adweb.system.service.SysAdwebApi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,8 +47,8 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
     @Autowired
     private IAdwebSiteService adwebSiteService;
 
-    @Autowired
-    private ISysBaseAPI sysBaseAPI;
+    @Resource
+    private SysAdwebApi sysAdwebApi;
 
     @Autowired
     private ISiteUserPermissionService siteUserPermissionService;
@@ -81,11 +78,11 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
         queryWrapper.select("id", "name", "code");
         queryWrapper.orderByDesc("create_time");
         queryWrapper.eq("status", AdwebConstant.STATUS).isNull("parent_group_code");
-        if (sysBaseAPI.isOem()) {
-            List<String> oemGroupUids = sysBaseAPI.getOemGroupUids();
-            List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(oemGroupUids);
+        if (sysAdwebApi.isChannelAdmin()) {
+            List<String> channelGroupUids = sysAdwebApi.getChannelGroupUids();
+            List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(channelGroupUids);
             queryWrapper.in("code", codeList);
-        } else if (!sysBaseAPI.isAdmin()) {
+        } else if (!sysAdwebApi.isAdmin()) {
             List<String> codeList = siteUserPermissionService.getSiteCodeList(sysUser.getId());
             queryWrapper.in("code", codeList);
         }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/controller/AdwebSiteController.java

@@ -94,6 +94,10 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
         QueryWrapper<AdwebSite> queryWrapper = QueryGenerator.initQueryWrapper(adwebSite, req.getParameterMap());
 
         Page<AdwebSite> page = new Page<AdwebSite>(pageNo, pageSize);
+
+        // 处理多租户过滤站点列表
+        processTenantFilter(queryWrapper);
+
         IPage<AdwebSite> pageList = adwebSiteService.page(page, queryWrapper);
 
         // 给站点增加营销计划信息
@@ -244,18 +248,9 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
      */
     @GetMapping("/getSiteListByUid")
     public Result<?> getAllSites() {
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         QueryWrapper<AdwebSite> queryWrapper = new QueryWrapper<>();
-        if (sysAdwebApi.isAdmin()) {
-
-        } else if (sysAdwebApi.isOem()) {
-            List<String> oemGroupUids = sysAdwebApi.getOemGroupUids();
-            List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(oemGroupUids);
-            queryWrapper.in("code", codeList);
-        } else {
-            List<String> codeList = siteUserPermissionService.getSiteCodeList(sysUser.getId());
-            queryWrapper.in("code", codeList);
-        }
+        // 处理多租户过滤站点列表
+        processTenantFilter(queryWrapper);
 
         queryWrapper.ne("status", AdwebConstant.SITE_DEL).isNull("parent_group_code");
         queryWrapper.select("id", "name", "code", "domain", "domain_dev", "status");
@@ -300,4 +295,19 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
         return Result.OK();
     }
 
+    private void processTenantFilter(QueryWrapper<AdwebSite> queryWrapper) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // 对于非管理员进行租户隔离
+        if (sysAdwebApi.isAdmin()) {
+
+        } else if (sysAdwebApi.isChannelAdmin()) {
+            List<String> channelGroupUids = sysAdwebApi.getChannelGroupUids();
+            List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(channelGroupUids);
+            queryWrapper.in("code", codeList);
+        } else {
+            List<String> codeList = siteUserPermissionService.getSiteCodeList(sysUser.getId());
+            queryWrapper.in("code", codeList);
+        }
+    }
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/controller/AdwebSiteManageController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.adweb.site.controller;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -12,17 +13,24 @@ import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.config.security.utils.SecureUtil;
 import org.jeecg.modules.adweb.common.mapper.CommonMapper;
 import org.jeecg.modules.adweb.site.dto.WordPressConfig;
 import org.jeecg.modules.adweb.site.dto.result.SiteBasicInfo;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.adweb.site.service.SiteManageService;
+import org.jeecg.modules.adweb.system.service.SysAdwebApi;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.SysUserTenant;
+import org.jeecg.modules.system.service.ISysUserTenantService;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: adweb_site
@@ -45,6 +53,12 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
     @Resource
     private SiteManageService siteManageService;
 
+    @Resource
+    private SysAdwebApi sysAdwebApi;
+
+    @Resource
+    private ISysUserTenantService sysUserTenantService;
+
     /**
      * 查询wordpress站点配置
      *
@@ -58,8 +72,44 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
     }
 
     @GetMapping(value = "/getAdwebVip")
-    public Result getAdwebVip() {
+    public Result<?> getAdwebVip() {
         List<SysUser> userList = commonMapper.getAdwebVip();
+
+        // 对于非管理员进行租户隔离
+        if (!sysAdwebApi.isAdmin()) {
+            LoginUser user = SecureUtil.currentUser();
+            // 如果是渠道管理员，则返回渠道下所有adwebVIP用户
+            // 而对于普通adwebVIP用户，只返回该用户自己
+            if (sysAdwebApi.isChannelAdmin()) {
+                QueryWrapper<SysUserTenant> queryWrapper = new QueryWrapper<>();
+                queryWrapper.in("tenant_id", user.getRelTenantIds());
+
+                // 查询出和登录用户具有相同租户的userID
+                List<SysUserTenant> sysUserTenants = sysUserTenantService.getBaseMapper().selectList(queryWrapper);
+                List<String> userIds;
+
+                if (sysUserTenants != null) {
+                    userIds = sysUserTenants.stream().map(SysUserTenant::getUserId).toList();
+                } else {
+                    userIds = new ArrayList<>();
+                }
+
+                // 对查出的adwebVIP 用户进行租户过滤, 并将自己加入到返回结果中
+                List<SysUser> filterUserList = new ArrayList<>();
+                filterUserList = userList.stream().filter(sysUser -> userIds.contains(sysUser.getId())).collect(Collectors.toList());
+                SysUser currentUser = new SysUser();
+                BeanUtil.copyProperties(user, currentUser);
+                filterUserList.add(currentUser);
+
+                return Result.ok(filterUserList);
+            } else {
+                // 对查出的 adwebVIP 用户进行租户过滤
+                return Result.ok(userList.stream().filter(sysUser -> sysUser.getId().equals(user.getId())).collect(Collectors.toList()));
+            }
+
+        }
+
+
         return Result.OK(userList);
     }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/entity/AdwebSite.java

@@ -276,13 +276,13 @@ public class AdwebSite implements Serializable {
     @Schema(description = "询盘分配方式")
     private java.lang.String enquiryDistributeType;
     /**
-     * 渠道商name
+     * 租户名字
      */
     @Excel(name = "渠道商name", width = 15)
     @Schema(description = "渠道商name")
     private java.lang.String channelProviderName;
     /**
-     * 渠道商id
+     * 租户ID
      */
     @Excel(name = "渠道商id", width = 15)
     @Schema(description = "渠道商id")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SelfWebSiteServiceCommon.java

@@ -17,12 +17,14 @@ import org.jeecg.modules.adweb.subscribePlan.entity.SubscribePlan;
 import org.jeecg.modules.adweb.subscribePlan.service.ISubscribePlanService;
 import org.jeecg.modules.adweb.theme.entity.AdwebTheme;
 import org.jeecg.modules.adweb.theme.service.IAdwebThemeService;
-import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.service.ISysUserTenantService;
+import org.jeecg.modules.system.vo.SysUserTenantVo;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -63,6 +65,9 @@ public class SelfWebSiteServiceCommon {
     @Resource
     private ISubscribePlanService subscribePlanService;
 
+    @Resource
+    private ISysUserTenantService relationService;
+
     @Transactional
     public AdwebSite saveNewSiteInfo(Long tempId, String uid, String name, String planId, LoginUser sysUser, Integer giveDay, Integer compensateDay) {
         AdwebTheme adwebTheme = adwebThemeService.getById(tempId);
@@ -107,15 +112,18 @@ public class SelfWebSiteServiceCommon {
 
         //设置seo_job_status默认值为1（可见）
         adwebSite.setSeoJobStatus(1);
-        SysUser user = sysUserService.getById(uid);
-        String oemCode = user.getOemCode();
-        if (StringUtils.isNotBlank(oemCode)) {
-            adwebSite.setChannelProviderId(oemCode);//渠道商信息入库
-            SysUser sUser = sysUserService.getOne(new QueryWrapper<SysUser>().eq("work_no", oemCode));
-            if (sUser != null) {
-                adwebSite.setChannelProviderName(sUser.getUsername());
-            }
+
+        //租户状态，用户id,租户用户关系状态
+        //查询用户的租户ids
+        List<String> tenantStatus = new ArrayList<>();
+        tenantStatus.add("1");
+        List<SysUserTenantVo> sysTenant = relationService.getTenantListByUserId(uid, tenantStatus);
+        if (sysTenant != null) {
+            //渠道商信息入库
+            adwebSite.setChannelProviderId(sysTenant.get(0).getTenantUserId());
+            adwebSite.setChannelProviderName(sysTenant.get(0).getName());
         }
+
         siteService.save(adwebSite);
 
         log.info("===================绑定套餐，套餐id：{}==========================", planId);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/system/controller/SystemAdwebController.java

@@ -59,13 +59,14 @@ public class SystemAdwebController {
     private static final byte[] redisKey = EnquiryConstants.ENQUIRY_EMAIL.getBytes();
 
     /**
-     * 获取渠道商列表
+     * 获取租户列表
      *
      * @return
      */
     @GetMapping("/getChannelProvider")
     public Result<?> getChannelProvider() {
         List<SysUser> userList = null;
+        // 只针对admin 获取 渠道商列表
         if (sysAdwebApi.isAdmin()) {
             //获取role表里角色编码为adweb_oem的角色的id
             List<SysRole> sysRoleList = iSysRoleService.list(new QueryWrapper<SysRole>().eq("role_code", "adweb_oem"));
@@ -102,7 +103,7 @@ public class SystemAdwebController {
             JedisUtil.lpush(redisKey, ObjectUtil.object2Bytes(1311742895508602880L));
             JedisUtil.publishMsg(EnquiryConstants.ENQUIRY_EMAIL_CHANNEL, EnquiryConstants.ENQUIRY_EMAIL);
         } catch (IOException e) {
-           log.info("测试发送监听发送邮件的消息失败");
+            log.info("测试发送监听发送邮件的消息失败");
         }
 
 //        enquiryEmailMessageService.sendEnquiryEmail(1311742895508602880L);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/system/service/SysAdwebApi.java

@@ -9,9 +9,10 @@ public interface SysAdwebApi {
 
     boolean isAdmin();
 
-    boolean isOem();
+    // 是否是渠道管理员
+    boolean isChannelAdmin();
 
-    List<String> getOemGroupUids();
+    List<String> getChannelGroupUids();
 
     /**
      * 判断输入站点是否属于当前用户

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/system/service/impl/SysAdwebApiImpl.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.adweb.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xkcoding.http.util.StringUtil;
 import jakarta.annotation.Resource;
@@ -23,12 +22,12 @@ import org.jeecg.modules.system.mapper.SysDictItemMapper;
 import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.jeecg.modules.system.mapper.SysUserRoleMapper;
 import org.jeecg.modules.system.service.ISysDictService;
+import org.jeecg.modules.system.service.ISysUserTenantService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -54,6 +53,9 @@ public class SysAdwebApiImpl implements SysAdwebApi {
     @Autowired
     private ISysDictService sysDictService;
 
+    @Autowired
+    private ISysUserTenantService sysUserTenantService;
+
     @Override
     public boolean isAdmin() {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -64,8 +66,6 @@ public class SysAdwebApiImpl implements SysAdwebApi {
         adminRoleIdList.add("seo_admin");
         adminRoleIdList.add("adweb_site_manager");
         adminRoleIdList.add("adweb_seo_manager");
-        // TODO 临时给demo 获取所有站点查看权限
-        adminRoleIdList.add("adweb_demo");
         List<String> roles = sysUserRoleMapper.getRoleByUserName(username);
         for (String role : roles) {
             if (adminRoleIdList.contains(role)) {
@@ -76,14 +76,14 @@ public class SysAdwebApiImpl implements SysAdwebApi {
     }
 
     @Override
-    public boolean isOem() {
+    public boolean isChannelAdmin() {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String username = sysUser.getUsername();
-        List<String> adminRoleIdList = new ArrayList<>();    // 管理员角色id列表
-        adminRoleIdList.add("adweb_oem");
+//        List<String> adminRoleIdList = new ArrayList<>();    // 管理员角色id列表
+//        adminRoleIdList.add("adweb_oem");
         List<String> roles = sysUserRoleMapper.getRoleByUserName(username);
         for (String role : roles) {
-            if ("adweb_oem".equals(role)) {
+            if ("adweb_channel_admin".equals(role)) {
                 return true;
             }
         }
@@ -91,14 +91,13 @@ public class SysAdwebApiImpl implements SysAdwebApi {
     }
 
     @Override
-    public List<String> getOemGroupUids() {
+    public List<String> getChannelGroupUids() {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         SysUser sysUser = userMapper.getUserByName(loginUser.getUsername());
-        String workNo = sysUser.getWorkNo();
+        Integer tenantId = sysUser.getLoginTenantId();
         List<String> list = null;
         try {
-            list = userMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                    .eq(SysUser::getOemCode, workNo)).stream().map(SysUser::getId).collect(Collectors.toList());
+            list = sysUserTenantService.getUserIdsByTenantId(tenantId);
         } catch (Exception e) {
             log.error("获取当前登录渠道下客户群的uid");
         }
@@ -122,9 +121,9 @@ public class SysAdwebApiImpl implements SysAdwebApi {
 
         QueryWrapper<AdwebSite> queryWrapper = new QueryWrapper<>();
 
-        if (this.isOem()) {
-            List<String> oemGroupUids = this.getOemGroupUids();
-            List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(oemGroupUids);
+        if (this.isChannelAdmin()) {
+            List<String> channelGroupUids = this.getChannelGroupUids();
+            List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(channelGroupUids);
             queryWrapper.in("code", codeList);
         } else if (!this.isAdmin()) {
             LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -154,9 +153,9 @@ public class SysAdwebApiImpl implements SysAdwebApi {
         }
         QueryWrapper<AdwebSite> queryWrapper = new QueryWrapper<>();
 
-        if (this.isOem()) {
-            List<String> oemGroupUids = this.getOemGroupUids();
-            List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(oemGroupUids);
+        if (this.isChannelAdmin()) {
+            List<String> channelGroupUids = this.getChannelGroupUids();
+            List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(channelGroupUids);
             queryWrapper.in("code", codeList);
         } else if (!this.isAdmin()) {
             LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/userCountry/controller/AdwebUserCountryController.java

@@ -16,7 +16,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
@@ -70,9 +69,6 @@ public class AdwebUserCountryController extends JeecgController<AdwebUserCountry
     private IAdwebEnquiryService adwebEnquiryService;
 
     @Resource
-    private ISysBaseAPI sysBaseAPI;
-
-    @Resource
     private SysAdwebApi sysAdwebApi;
 
     @Resource
@@ -154,7 +150,7 @@ public class AdwebUserCountryController extends JeecgController<AdwebUserCountry
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         // 获取主账户uid
         String uid;
-        if (sysBaseAPI.isAdmin() || sysBaseAPI.isOem()) {
+        if (sysAdwebApi.isAdmin() || sysAdwebApi.isChannelAdmin()) {
             AdwebSite site;
             if (siteId != null) {
                 site = adwebSiteService.getById(siteId);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -187,6 +187,12 @@ public class SysUser implements Serializable {
     private String relTenantIds;
 
     /**
+     * 多租户ids临时用，不持久化数据库(数据库字段不存在)
+     */
+    @TableField(exist = false)
+    private transient String relTenantNames;
+
+    /**
      * 设备id uniapp推送用
      */
     private String clientId;
@@ -229,4 +235,11 @@ public class SysUser implements Serializable {
      */
     @TableField(exist = false)
     private List<String> roles;
+
+
+    /**
+     * 用户角色
+     */
+    @TableField(exist = false)
+    private transient String roleNames;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -1884,26 +1884,6 @@ public class SysBaseApiImpl implements ISysBaseAPI {
     }
 
     /**
-     * 根据username判断一个用户是否是渠道账户
-     *
-     * @return
-     */
-    @Override
-    public boolean isOem() {
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String username = sysUser.getUsername();
-        List<String> adminRoleIdList = new ArrayList<>();    // 管理员角色id列表
-        adminRoleIdList.add("adweb_oem");
-        List<String> roles = this.getRolesByUsername(username);
-        for (String role : roles) {
-            if ("adweb_oem".equals(role)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
      * 根据username判断一个用户是否是管理员
      *
      * @return
@@ -1927,24 +1907,4 @@ public class SysBaseApiImpl implements ISysBaseAPI {
         return false;
     }
 
-    @Override
-    public List<String> getOemGroupUids() {
-        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        SysUser sysUser = userMapper.getUserByName(loginUser.getUsername());
-        String workNo = sysUser.getWorkNo();
-        List<String> list = null;
-        try {
-            list = userMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                    .eq(SysUser::getOemCode, workNo)).stream().map(SysUser::getId).collect(Collectors.toList());
-        } catch (Exception e) {
-            log.error("获取当前登录渠道下客户群的uid");
-        }
-        if (CollectionUtils.isEmpty(list)) {
-            list = new ArrayList<>();
-            list.add("-1");
-        }
-        list.add(sysUser.getId());
-        return list;
-    }
-
 }