我的添加tenant环境区分

src/main/java/com/zzsn/event/controller/EventDataController.java

@@ -106,16 +106,14 @@ public class EventDataController {
                               @RequestParam(name = "order", required = false) String order,
                               @RequestParam(name = "orderType", required = false) String orderType,
                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                              HttpServletRequest request) {
+                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         IPage<EventFrontVO> pageList = new Page<>();
-        String tenant = RequestUtil.getTenantByRequest(request);
         if (category == 1){
-            pageList = eventService.frontAllPageList(projectId, eventId,eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize, tenant);
+            pageList = eventService.frontAllPageList(projectId, eventId,eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize);
         } else if (category == 2) {
             pageList = eventExtractService.frontDigPageList(projectId,eventName,eventType,pageNo,pageSize);
         } else if (category == 3) {
-            pageList = eventService.frontOwnerPageList(projectId, eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize, tenant);
+            pageList = eventService.frontOwnerPageList(projectId, eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize);
         }
         return Result.OK(pageList);
     }

src/main/java/com/zzsn/event/mapper/EventMapper.java

@@ -132,7 +132,7 @@ public interface EventMapper extends BaseMapper<Event> {
                                           @Param("eventTypes") List<String> eventTypes, @Param("labelField") String labelField,
                                           @Param("labelName") String labelName, @Param("type") Integer type,
                                           @Param("order") String order, @Param("orderType") String orderType,
-                                          @Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
+                                          @Param("offset") Integer offset, @Param("pageSize") Integer pageSize, @Param("tenant")String tenant);
 
     /**
      * 总数量-门户(我的)
@@ -149,7 +149,7 @@ public interface EventMapper extends BaseMapper<Event> {
      */
     Integer frontOwnerCount(@Param("projectId") String projectId, @Param("createBy") String createBy, @Param("eventName") String eventName,
                             @Param("eventTypes") List<String> eventTypes, @Param("labelField") String labelField,
-                            @Param("labelName") String labelName, @Param("type") Integer type);
+                            @Param("labelName") String labelName, @Param("type") Integer type, @Param("tenant")String tenant);
 
 
     /**

src/main/java/com/zzsn/event/mapper/xml/EventMapper.xml

@@ -222,6 +222,9 @@
         inner join project_subject_map m on t1.id = m.subject_id
         left join event_tag t3 on t1.id=t3.event_id
         where t1.publish_status = 1 and t1.create_by = #{createBy} and m.project_id = #{projectId}
+          <if test="tenant != null and tenant != ''">
+              and t1.tenant = #{tenant}
+          </if>
         <if test="eventName!=null and eventName != ''">
             and t1.event_name like CONCAT('%',#{eventName},'%')
         </if>
@@ -231,6 +234,7 @@
                 #{item}
             </foreach>
         </if>
+
         <if test="labelName != null and labelName !=''">
             <if test="labelField != null  and labelField != ''">
                 <choose>
@@ -262,6 +266,9 @@
         inner join project_subject_map m on t1.id = m.subject_id
         left join event_tag t3 on t1.id=t3.event_id
         where t1.publish_status = 1 and t1.create_by = #{createBy} and m.project_id = #{projectId}
+        <if test="tenant != null and tenant != ''">
+            and t1.tenant = #{tenant}
+        </if>
         <if test="eventName!=null and eventName != ''">
             and t1.event_name like CONCAT('%',#{eventName},'%')
         </if>

src/main/java/com/zzsn/event/service/IEventService.java

@@ -66,7 +66,7 @@ public interface IEventService extends IService<Event> {
     IPage<EventFrontVO> frontAllPageList(String projectId, String eventId,String eventName,
                                          String eventType, String labelField, String labelName,
                                          String order, String orderType, Integer pageNo,
-                                         Integer pageSize,String tenant);
+                                         Integer pageSize);
 
     /**
      * 分页列表-门户(我的)
@@ -84,7 +84,7 @@ public interface IEventService extends IService<Event> {
      * @date 2024/4/8
      */
     IPage<EventFrontVO> frontOwnerPageList(String projectId, String eventName, String eventType, String labelField, String labelName, String order, String orderType,
-                                           Integer pageNo, Integer pageSize,String tenant);
+                                           Integer pageNo, Integer pageSize);
 
 
     /**

src/main/java/com/zzsn/event/service/impl/EventServiceImpl.java

@@ -140,7 +140,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
 
     @Override
     public IPage<EventFrontVO> frontAllPageList(String projectId,String eventId, String eventName, String eventType, String labelField, String labelName, String order, String orderType,
-                                                Integer pageNo, Integer pageSize,String tenant) {
+                                                Integer pageNo, Integer pageSize) {
         int offset = (pageNo - 1) * pageSize;
         Integer type = null;
         if (StringUtils.isNotEmpty(labelField) && labelField.equals("event_label")) {
@@ -153,6 +153,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         }
         //获取当前登录人信息
         UserVo currentUser = UserUtil.getLoginUser();
+        String tenant = TenantHelper.getInstance().getTenant();
         List<EventFrontVO> pageList = baseMapper.frontAllPageList(projectId, currentUser.getUsername(), eventId,eventName, eventTypes, labelField, labelName, type, order, orderType,
                 offset, pageSize, tenant);
         if (CollectionUtils.isNotEmpty(pageList)) {
@@ -178,7 +179,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
 
     @Override
     public IPage<EventFrontVO> frontOwnerPageList(String projectId, String eventName, String eventType, String labelField, String labelName, String order, String orderType,
-                                                  Integer pageNo, Integer pageSize,String tenant) {
+                                                  Integer pageNo, Integer pageSize) {
         int offset = (pageNo - 1) * pageSize;
         Integer type = null;
         if (StringUtils.isNotEmpty(labelField) && labelField.equals("event_label")) {
@@ -191,7 +192,8 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         }
         //获取当前登录人信息
         UserVo currentUser = UserUtil.getLoginUser();
-        List<EventFrontVO> pageList = baseMapper.frontOwnerPageList(projectId, currentUser.getUsername(), eventName, eventTypes, labelField, labelName, type, order, orderType, offset, pageSize);
+        String tenant = TenantHelper.getInstance().getTenant();
+        List<EventFrontVO> pageList = baseMapper.frontOwnerPageList(projectId, currentUser.getUsername(), eventName, eventTypes, labelField, labelName, type, order, orderType, offset, pageSize, tenant);
         if (CollectionUtils.isNotEmpty(pageList)) {
             Map<String, String> map = getFirstMap(pageList);
             if (MapUtil.isNotEmpty(map)) {
@@ -203,7 +205,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
             }
         }
         //获取总条数
-        Integer count = baseMapper.frontOwnerCount(projectId, currentUser.getUsername(), eventName, eventTypes, labelField, labelName, type);
+        Integer count = baseMapper.frontOwnerCount(projectId, currentUser.getUsername(), eventName, eventTypes, labelField, labelName, type, tenant);
         IPage<EventFrontVO> pageData = new Page<>(pageNo, pageSize, count);
         pageData.setRecords(pageList);
         return pageData;