Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -17,6 +17,7 @@ import com.huiju.estateagents.service.ISysButtonInMenuService;
 import com.huiju.estateagents.service.ITaRoleButtonService;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import io.jsonwebtoken.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -27,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
+@Slf4j
 @Component
 public class AccessInterceptor implements HandlerInterceptor {
     
@@ -95,6 +97,7 @@ public class AccessInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
+        log.info("接口请求路径是{}",request.getRequestURI());
         //第三方权限校验
         String tokenHeader = request.getHeader("x-token");
         if (!StringUtils.isEmpty(tokenHeader)){

src/main/java/com/huiju/estateagents/service/impl/ExtendContentServiceImpl.java

@@ -191,7 +191,8 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
             if (null != extendContent.getContentId()){
                 taExtendContentQueryWrapper.ne("content_id", extendContent.getContentId());
             }
-            if (extendContent.getIsHaveActive() != null ){
+//            taExtendContentQueryWrapper.eq(StringUtils.isNotBlank(String.valueOf(extendContent.getIsHaveActive())), "is_have_active", extendContent.getIsHaveActive());
+            if (null != extendContent.getIsHaveActive() && CommConstant.BANNER_BUILDING.equals(extendContent.getShowPosition())){
                 taExtendContentQueryWrapper.eq(StringUtils.isNotBlank(extendContent.getBuildingId()), "building_id", extendContent.getBuildingId());
             }
             List<ExtendContent> extContentInfo = extendContentMapper.selectList(taExtendContentQueryWrapper);

src/main/resources/mapper/TaChannelMapper.xml

@@ -175,7 +175,13 @@
             and t.target_id = #{targetId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and t.event_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic'
+                        when #{targetType} = 'h5' then t.event_type = 'h5'
+                        when #{targetType} = 'news' then t.event_type = 'news'
+                        when #{targetType} = 'building' then t.event_type = 'building'
+                        when #{targetType} = 'house' then t.event_type = 'house'
+            else t.target_type = #{targetType}
+            end)
         </if>
         <if test="channelId != null and channelId != ''">
             and t.channel_id = #{channelId}
@@ -234,7 +240,13 @@
             and t.target_id = #{targetId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and t.event_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic'
+            when #{targetType} = 'h5' then t.event_type = 'h5'
+            when #{targetType} = 'news' then t.event_type = 'news'
+            when #{targetType} = 'building' then t.event_type = 'building'
+            when #{targetType} = 'house' then t.event_type = 'house'
+            else t.target_type = #{targetType}
+            end)
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
@@ -359,7 +371,13 @@
             and t.target_id = #{targetId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and t.event_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic'
+            when #{targetType} = 'h5' then t.event_type = 'h5'
+            when #{targetType} = 'news' then t.event_type = 'news'
+            when #{targetType} = 'building' then t.event_type = 'building'
+            when #{targetType} = 'house' then t.event_type = 'house'
+            else t.target_type = #{targetType}
+            end)
         </if>
         <if test="channelId != null and channelId != ''">
             and t.channel_id = #{channelId}
@@ -418,7 +436,13 @@
             and t.target_id = #{targetId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and t.event_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic'
+            when #{targetType} = 'h5' then t.event_type = 'h5'
+            when #{targetType} = 'news' then t.event_type = 'news'
+            when #{targetType} = 'building' then t.event_type = 'building'
+            when #{targetType} = 'house' then t.event_type = 'house'
+            else t.target_type = #{targetType}
+            end)
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}