调整代码结构

src/main/java/com/whdc/component/AutoCallScheduled.java

@@ -1,59 +0,0 @@
-package com.whdc.component;
-
-import com.whdc.service.AutoCallTaskService;
-import com.whdc.utils.AutoCallHelper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-/**
- * @author lyf
- * @since 2025-06-20
- */
-@Component
-@Slf4j
-@Profile("deprecated")
-public class AutoCallScheduled {
-
-    @Autowired
-    private AutoCallTaskService autoCallTaskService;
-    @Autowired
-    private AutoCallHelper autoCallHelper;
-
-    @PostConstruct
-    public void getToken() throws Exception {
-        autoCallHelper.getToken();
-    }
-
-    @Scheduled(cron = "*/3 * * * * ?")
-    public void step1() {
-        if (autoCallTaskService.isScheduled()) {
-            autoCallTaskService.step1GenerateWarnCallMap();
-        }
-    }
-
-    @Scheduled(cron = "*/3 * * * * ?")
-    public void step2() {
-        if (autoCallTaskService.isScheduled()) {
-            autoCallTaskService.step2GenerateAutoCallByWcm();
-        }
-    }
-
-    @Scheduled(cron = "*/10 * * * * ?")
-    public void step3() {
-        if (autoCallTaskService.isScheduled()) {
-            autoCallTaskService.step3UploadCallTask();
-        }
-    }
-
-    @Scheduled(cron = "*/10 * * * * ?")
-    public void step4() {
-        if (autoCallTaskService.isScheduled()) {
-            autoCallTaskService.step4QueryTaskResult();
-        }
-    }
-}

src/main/java/com/whdc/component/AutoCallTaskScheduled.java

@@ -2,8 +2,8 @@ package com.whdc.component;
 
 import com.whdc.mapper.AutoCallConfigMapper;
 import com.whdc.mapper.AutoCallPersonMapper;
-import com.whdc.model.entity.AutoCallPerson;
-import com.whdc.service.AutoCallTaskService2;
+import com.whdc.model.autocall.AutoCallPerson;
+import com.whdc.service.autocall.AutoCallTaskService2;
 import com.whdc.utils.AutoCallHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/whdc/controller/autocall/AutoCallController.java

@@ -1,13 +1,13 @@
-package com.whdc.controller;
+package com.whdc.controller.autocall;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.whdc.mapper.AutoCallConfigMapper;
 import com.whdc.model.dto.AutoCallDto;
 import com.whdc.model.dto.FindPageDto;
-import com.whdc.model.entity.AutoCallPerson;
-import com.whdc.model.entity.AutoCallTask;
-import com.whdc.service.AutoCallApiService;
-import com.whdc.service.AutoCallTaskService2;
+import com.whdc.model.autocall.AutoCallPerson;
+import com.whdc.model.autocall.AutoCallTask;
+import com.whdc.service.autocall.AutoCallApiService;
+import com.whdc.service.autocall.AutoCallTaskService2;
 import com.whdc.utils.AICCHelper;
 import com.whdc.utils.ResultJson;
 import org.apache.poi.util.IOUtils;

src/main/java/com/whdc/mapper/AutoCallConfigMapper.java

@@ -2,7 +2,7 @@ package com.whdc.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.whdc.model.entity.AutoCallConfig;
+import com.whdc.model.autocall.AutoCallConfig;
 
 /**
  * @author lyf

src/main/java/com/whdc/mapper/AutoCallMapper.java

@@ -2,7 +2,7 @@ package com.whdc.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.whdc.model.entity.AutoCall;
+import com.whdc.model.autocall.AutoCall;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;

src/main/java/com/whdc/mapper/AutoCallPersonMapper.java

@@ -2,7 +2,7 @@ package com.whdc.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.whdc.model.entity.AutoCallPerson;
+import com.whdc.model.autocall.AutoCallPerson;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/whdc/mapper/AutoCallTaskMapper.java

@@ -2,7 +2,7 @@ package com.whdc.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.whdc.model.entity.AutoCallTask;
+import com.whdc.model.autocall.AutoCallTask;
 import com.whdc.model.entity.QXWarning;
 import org.apache.ibatis.annotations.Select;
 

src/main/java/com/whdc/model/autocall/AutoCall.java

@@ -1,4 +1,4 @@
-package com.whdc.model.entity;
+package com.whdc.model.autocall;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/whdc/model/autocall/AutoCallConfig.java

@@ -1,4 +1,4 @@
-package com.whdc.model.entity;
+package com.whdc.model.autocall;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

src/main/java/com/whdc/model/autocall/AutoCallPerson.java

@@ -1,4 +1,4 @@
-package com.whdc.model.entity;
+package com.whdc.model.autocall;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/whdc/model/autocall/AutoCallTask.java

@@ -1,4 +1,4 @@
-package com.whdc.model.entity;
+package com.whdc.model.autocall;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/whdc/model/autocall/aicc/AICCCallRespDetail.java

@@ -1,4 +1,4 @@
-package com.whdc.model.entity.autocall;
+package com.whdc.model.autocall.aicc;
 
 
 import com.alibaba.fastjson.annotation.JSONField;

src/main/java/com/whdc/model/autocall/aicc/AICCCallRespTask.java

@@ -1,4 +1,4 @@
-package com.whdc.model.entity.autocall;
+package com.whdc.model.autocall.aicc;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/whdc/model/autocall/aicc/AICCCallRespWrapper.java

@@ -1,4 +1,4 @@
-package com.whdc.model.entity.autocall;
+package com.whdc.model.autocall.aicc;
 
 import lombok.Data;
 

src/main/java/com/whdc/model/autocall/aicc/AICCLogin.java

@@ -1,4 +1,4 @@
-package com.whdc.model.entity.autocall;
+package com.whdc.model.autocall.aicc;
 
 import lombok.Data;
 

src/main/java/com/whdc/model/autocall/aicc/AICCUploadTask.java

@@ -1,4 +1,4 @@
-package com.whdc.model.entity.autocall;
+package com.whdc.model.autocall.aicc;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

src/main/java/com/whdc/service/autocall/AutoCallApiService.java

@@ -1,4 +1,4 @@
-package com.whdc.service;
+package com.whdc.service.autocall;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,9 +25,9 @@ import com.itextpdf.layout.properties.TextAlignment;
 import com.itextpdf.layout.properties.UnitValue;
 import com.whdc.mapper.*;
 import com.whdc.model.dto.AutoCallDto;
-import com.whdc.model.entity.AutoCall;
-import com.whdc.model.entity.AutoCallPerson;
-import com.whdc.model.entity.AutoCallTask;
+import com.whdc.model.autocall.AutoCall;
+import com.whdc.model.autocall.AutoCallPerson;
+import com.whdc.model.autocall.AutoCallTask;
 import com.whdc.model.entity.WarnCallMap;
 import com.whdc.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/whdc/service/autocall/AutoCallTaskService2.java

@@ -1,16 +1,16 @@
-package com.whdc.service;
+package com.whdc.service.autocall;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.whdc.mapper.*;
-import com.whdc.model.entity.AutoCallPerson;
-import com.whdc.model.entity.AutoCallTask;
+import com.whdc.model.autocall.AutoCallPerson;
+import com.whdc.model.autocall.AutoCallTask;
 import com.whdc.model.entity.QXWarning;
 import com.whdc.model.entity.WarningResponder;
-import com.whdc.model.entity.autocall.AICCCallRespDetail;
-import com.whdc.model.entity.autocall.AICCCallRespTask;
-import com.whdc.model.entity.autocall.AICCCallRespWrapper;
-import com.whdc.model.entity.autocall.AICCUploadTask;
+import com.whdc.model.autocall.aicc.AICCCallRespDetail;
+import com.whdc.model.autocall.aicc.AICCCallRespTask;
+import com.whdc.model.autocall.aicc.AICCCallRespWrapper;
+import com.whdc.model.autocall.aicc.AICCUploadTask;
 import com.whdc.utils.AICCHelper;
 import com.whdc.utils.SmsHelper;
 import lombok.Getter;

src/main/java/com/whdc/utils/AICCHelper.java

@@ -3,7 +3,7 @@ package com.whdc.utils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
-import com.whdc.model.entity.autocall.*;
+import com.whdc.model.autocall.aicc.*;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/whdc/utils/AutoCallHelper.java

@@ -3,7 +3,7 @@ package com.whdc.utils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
-import com.whdc.model.entity.autocall.*;
+import com.whdc.model.autocall.aicc.*;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

src/main/resources/mapper/AutoCallMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.whdc.mapper.AutoCallMapper">
-    <select id="getListByLevelAndStatus" resultType="com.whdc.model.entity.AutoCall">
+    <select id="getListByLevelAndStatus" resultType="com.whdc.model.autocall.AutoCall">
         select * from AUTOCALL A
         where 1=1
         <if test="level != null">

src/main/resources/mapper/AutoCallPersonMapper.xml

@@ -4,7 +4,7 @@
 
 
 
-    <select id="selectListByTaskId" resultType="com.whdc.model.entity.AutoCallPerson">
+    <select id="selectListByTaskId" resultType="com.whdc.model.autocall.AutoCallPerson">
         select T1.*,T2.POSITION as position from FXKH_TXL.AUTO_CALL_PERSON T1
             LEFT JOIN FXKH_TXL.SH_ADDRESS_BOOK T2 ON T1.__NUMBER = T2.PHONE
         where T1.TASK_ID = #{taskId}

src/main/resources/mapper/AutoCallTaskMapper.xml

@@ -18,7 +18,7 @@
             )
         ORDER BY Q.WARNID ASC;
     </select>
-    <select id="getList" resultType="com.whdc.model.entity.AutoCallTask">
+    <select id="getList" resultType="com.whdc.model.autocall.AutoCallTask">
         SELECT
             *
         FROM

src/main/resources/mapper/WarnCallMapMapper.xml

@@ -18,7 +18,7 @@
             )
         ORDER BY Q.WARNID ASC;
     </select>
-    <select id="getWCMList" resultType="com.whdc.model.entity.AutoCall">
+    <select id="getWCMList" resultType="com.whdc.model.autocall.AutoCall">
         SELECT
             *
         FROM

src/test/java/com/whdc/utils/AutoCallHelperTest.java

@@ -3,12 +3,12 @@ package com.whdc.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
-import com.whdc.model.entity.AutoCallPerson;
-import com.whdc.model.entity.AutoCallTask;
-import com.whdc.model.entity.autocall.AICCCallRespDetail;
-import com.whdc.model.entity.autocall.AICCCallRespTask;
-import com.whdc.model.entity.autocall.AICCCallRespWrapper;
-import com.whdc.model.entity.autocall.AICCUploadTask;
+import com.whdc.model.autocall.AutoCallPerson;
+import com.whdc.model.autocall.AutoCallTask;
+import com.whdc.model.autocall.aicc.AICCCallRespDetail;
+import com.whdc.model.autocall.aicc.AICCCallRespTask;
+import com.whdc.model.autocall.aicc.AICCCallRespWrapper;
+import com.whdc.model.autocall.aicc.AICCUploadTask;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;