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

hx-customer/src/main/java/com/fjhx/customer/contants/XiaomanContant.java

@@ -11,7 +11,7 @@ public class XiaomanContant {
     public static final String SELECTOR_API_URL = "https://api-sandbox.xiaoman.cn/v1/company/fields/selector";
 
     /** 客户数据更新**/
-    public static final String UPDATE_INFO_API_URL = "https://api-sandbox.xiaoman.cn/v1/company/updates";
+    public static final String UPDATE_INFO_API_URL = "https://api-sandbox.xiaoman.cn/v1/company/pushCompanyAndCustomers";
 
     /**任务状态redis key**/
     public static final String TASK_STATUS_KEY = "all_customer:task_status_key";

hx-customer/src/main/java/com/fjhx/customer/entity/xiaoman/vo/XiaomanUpdateInfoVO.java

@@ -40,6 +40,12 @@ public class XiaomanUpdateInfoVO {
     //客户公海分组ID,默认为0
     @JSONField(name = "pool_id")
     private Integer poolId;
+    //客户来源ID
+    @JSONField(name = "origin_list")
+    private List<Long> originList;
+    //客户状态ID
+    @JSONField(name = "trail_status")
+    private Long trailStatus;
 
     @Data
     public static class Customer {

hx-customer/src/main/java/com/fjhx/customer/initializers/XiaomanInitializers.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fjhx.customer.entity.xiaoman.po.XiaomanConfig;
+import com.fjhx.customer.entity.xiaoman.vo.XiaomanUpdateInfoVO;
 import com.fjhx.customer.handle.HandleXiaomanData;
 import com.fjhx.customer.service.xiaoman.XiaomanApiService;
 import com.fjhx.customer.service.xiaoman.XiaomanConfigService;
@@ -14,7 +15,10 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 @Component
 @Slf4j
@@ -33,20 +37,14 @@ public class XiaomanInitializers {
         refreshToken();
         //获取全量数据
         try {
-            xiaomanApiService.getSelectorData();
+            xiaomanApiService.initAllList();
         } catch (Exception e) {
             log.error("获取小满全量数据异常", e);
         }
-
-        //更新更新数据
-
-        //获取数据字典
     }
 
 
     @Scheduled(cron = "0 0/30 * * * ? ")
-        //每分钟执行一次
-//    @Scheduled(cron = "0 0/1 *  * * ? ")
     void refreshToken(){
         //如果过期时间是空的，就获取新的token
         XiaomanConfig config = xiaomanConfigService.getConfig();
@@ -66,18 +64,4 @@ public class XiaomanInitializers {
 
 
 
-    /**
-     * 获取下拉框字典数据
-     * @author hj
-     * @date 2024/4/7 10:49
-     */
-//    @Scheduled(cron = "0 0 0 0/1 * ? ")
-    void getSelectorData(){
-        //获取全量数据
-        try {
-            xiaomanApiService.getSelectorData();
-        } catch (Exception e) {
-            log.error("获取小满下拉框字典数据异常", e);
-        }
-    }
 }