Merge remote-tracking branch 'origin/master' into lih

# Conflicts:
#	yt-agent/agent-service/src/main/java/com/ytpm/config/JacksonConfig.java
#	yt-question/yt-question-service/src/main/java/com/ytpm/question/config/JacksonConfig.java
#	yt-risk/risk-manage/src/main/java/com/ytpm/config/JacksonConfig.java

yt-agent/agent-service/src/main/java/com/ytpm/config/JacksonConfig.java

@@ -12,7 +12,7 @@ import java.util.Date;
 
 /**
  * @author lih
- * @date 2025-10-14 11:06
+ * @date 2025-10-15 10:22
  */
 @Configuration
 public class JacksonConfig {

yt-agent/agent-service/src/main/resources/mapper/AppUserMapper.xml

@@ -39,7 +39,7 @@
         <if test="channelType != null">
             and au.channel_type = #{channelType}
         </if>
-        <if test="channelOrigin != null">
+        <if test="channelOrigin != null and channelOrigin != ''">
             and au.channel_origin = #{channelOrigin}
         </if>
         <if test="userType != null">

yt-agent/agent-service/src/main/resources/mapper/RiskMapper.xml

@@ -151,7 +151,7 @@
         <if test="userId != null and userId != ''">
             and pb.user_id = #{userId}
         </if>
-        <if test="channelOrigin != null">
+        <if test="channelOrigin != null and channelOrigin != ''">
             and a.ditch_id = #{channelOrigin}
         </if>
         <if test="bannedReason != null and bannedReason != ''">
@@ -191,7 +191,7 @@
         <if test="userId != null and userId != ''">
             and pd.user_id = #{userId}
         </if>
-        <if test="channelOrigin != null">
+        <if test="channelOrigin != null and channelOrigin != ''">
             and a.ditch_id = #{channelOrigin}
         </if>
         <if test="deblockingReason != null and deblockingReason != ''">

yt-common/src/main/java/com/ytpm/agent/model/YtAppUser.java

@@ -35,7 +35,7 @@ public class YtAppUser {
     @ApiModelProperty("渠道类型")
     private Integer channelType;
     @ApiModelProperty("渠道来源")
-    private Integer channelOrigin;
+    private String channelOrigin;
     @ApiModelProperty("用户类型")
     private Integer userType;
     @ApiModelProperty("广告总播放数")

yt-common/src/main/java/com/ytpm/app/param/YtAppUserListParam.java

@@ -23,7 +23,7 @@ public class YtAppUserListParam extends PageMeta {
     @ApiModelProperty("渠道类型")
     private Integer channelType;
     @ApiModelProperty("渠道来源")
-    private Integer channelOrigin;
+    private String channelOrigin;
     @ApiModelProperty("用户类型")
     private Integer userType;
     @ApiModelProperty("用户昵称")

yt-common/src/main/java/com/ytpm/app/view/YtAppUserListView.java

@@ -51,7 +51,7 @@ public class YtAppUserListView extends PageMeta {
     @ApiModelProperty("渠道类型")
     private Integer channelType;
     @ApiModelProperty("渠道来源")
-    private Integer channelOrigin;
+    private String channelOrigin;
     @CustomField(value = "user_type",desc = "用户类型", node = 1)
     @ApiModelProperty("用户类型")
     private Integer userType;

yt-common/src/main/java/com/ytpm/risk/param/RiskBannedListParam.java

@@ -27,7 +27,7 @@ public class RiskBannedListParam extends PageMeta {
     @ApiModelProperty("渠道类型")
     private Integer channelType;
     @ApiModelProperty("渠道来源")
-    private Integer channelOrigin;
+    private String channelOrigin;
     @ApiModelProperty("封禁开始时间")
     private String bannedTimeBegin;
     @ApiModelProperty("封禁结束时间")

yt-common/src/main/java/com/ytpm/risk/param/RiskDeblockingListParam.java

@@ -37,7 +37,7 @@ public class RiskDeblockingListParam extends PageMeta {
     @ApiModelProperty("渠道类型")
     private Integer channelType;
     @ApiModelProperty("渠道来源")
-    private Integer channelOrigin;
+    private String channelOrigin;
     @ApiModelProperty("用户ID")
     private String userId;
     @ApiModelProperty("用户ID, 拼接")

yt-common/src/main/java/com/ytpm/risk/view/RiskBannedListView.java

@@ -51,7 +51,7 @@ public class RiskBannedListView extends PageMeta {
     @ApiModelProperty("渠道类型")
     private Integer channelType;
     @ApiModelProperty("渠道来源")
-    private Integer channelOrigin;
+    private String channelOrigin;
     @ApiModelProperty("操作人")
     private String operatorName;
     @ApiModelProperty("封禁类型 1-渠道 2-平台")

yt-common/src/main/java/com/ytpm/risk/view/RiskDeblockingListView.java

@@ -36,7 +36,7 @@ public class RiskDeblockingListView extends PageMeta {
     @ApiModelProperty("应用名称")
     private String appName;
     @ApiModelProperty("渠道来源")
-    private Integer channelOrigin;
+    private String channelOrigin;
     @ApiModelProperty("操作人")
     private String operatorName;
     @ApiModelProperty("解禁时间")

yt-question/yt-question-service/src/main/java/com/ytpm/question/JacksonConfig.java

@@ -1,29 +0,0 @@
-package com.ytpm.question;
-
-
-import com.ytpm.handle.MultiFormatDateDeserializer;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.Date;
-
-/**
- * @author lih
- * @date 2025-10-15 10:22
- */
-@Configuration
-public class JacksonConfig {
-
-    @Value("${spring.jackson.time-zone:Asia/Shanghai}")
-    private String timeZone;
-
-    @Bean
-    public Jackson2ObjectMapperBuilderCustomizer customJacksonConfig() {
-        return builder -> {
-            // 注册Date类型的序列化器和反序列化器
-            builder.deserializerByType(Date.class, new MultiFormatDateDeserializer(timeZone));
-        };
-    }
-}

yt-question/yt-question-service/src/main/java/com/ytpm/question/config/JacksonConfig.java

@@ -11,7 +11,7 @@ import java.util.Date;
 
 /**
  * @author lih
- * @date 2025-10-14 11:06
+ * @date 2025-10-15 10:22
  */
 @Configuration
 public class JacksonConfig {
@@ -22,7 +22,8 @@ public class JacksonConfig {
     @Bean
     public Jackson2ObjectMapperBuilderCustomizer customJacksonConfig() {
         return builder -> {
+            // 注册Date类型的序列化器和反序列化器
             builder.deserializerByType(Date.class, new MultiFormatDateDeserializer(timeZone));
         };
     }
-}
+}

yt-risk/risk-manage/src/main/java/com/ytpm/config/JacksonConfig.java

@@ -1,7 +1,6 @@
 package com.ytpm.config;
 
 
-import com.ytpm.handle.CustomDateSerializer;
 import com.ytpm.handle.MultiFormatDateDeserializer;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
@@ -24,7 +23,6 @@ public class JacksonConfig {
     public Jackson2ObjectMapperBuilderCustomizer customJacksonConfig() {
         return builder -> {
             // 注册Date类型的序列化器和反序列化器
-//            builder.serializerByType(Date.class, new CustomDateSerializer(timeZone));
             builder.deserializerByType(Date.class, new MultiFormatDateDeserializer(timeZone));
         };
     }

yt-risk/risk-manage/src/main/resources/mapper/RiskManageMapper.xml

@@ -80,7 +80,7 @@
         <if test="userId != null and userId != ''">
             and pd.user_id = #{userId}
         </if>
-        <if test="channelOrigin != null">
+        <if test="channelOrigin != null and channelOrigin != ''">
             and a.ditch_id = #{channelOrigin}
         </if>
         <if test="deblockingReason != null and deblockingReason != ''">
@@ -121,7 +121,7 @@
         <if test="userId != null and userId != ''">
             and pb.user_id = #{userId}
         </if>
-        <if test="channelOrigin != null">
+        <if test="channelOrigin != null and channelOrigin != ''">
             and a.ditch_id = #{channelOrigin}
         </if>
         <if test="bannedReason != null and bannedReason != ''">