diff --git a/src/main/java/com/whdc/component/AutoCallScheduled.java b/src/main/java/com/whdc/component/AutoCallScheduled.java deleted file mode 100644 index 4d30481..0000000 --- a/src/main/java/com/whdc/component/AutoCallScheduled.java +++ /dev/null @@ -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(); - } - } -} diff --git a/src/main/java/com/whdc/component/AutoCallTaskScheduled.java b/src/main/java/com/whdc/component/AutoCallTaskScheduled.java index b8dd76a..aead598 100644 --- a/src/main/java/com/whdc/component/AutoCallTaskScheduled.java +++ b/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; diff --git a/src/main/java/com/whdc/controller/AutoCallController.java b/src/main/java/com/whdc/controller/autocall/AutoCallController.java similarity index 97% rename from src/main/java/com/whdc/controller/AutoCallController.java rename to src/main/java/com/whdc/controller/autocall/AutoCallController.java index d760f03..62bc6d5 100644 --- a/src/main/java/com/whdc/controller/AutoCallController.java +++ b/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; diff --git a/src/main/java/com/whdc/mapper/AutoCallConfigMapper.java b/src/main/java/com/whdc/mapper/AutoCallConfigMapper.java index 0db7b15..9146417 100644 --- a/src/main/java/com/whdc/mapper/AutoCallConfigMapper.java +++ b/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 diff --git a/src/main/java/com/whdc/mapper/AutoCallMapper.java b/src/main/java/com/whdc/mapper/AutoCallMapper.java index 5519b45..aea7af6 100644 --- a/src/main/java/com/whdc/mapper/AutoCallMapper.java +++ b/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; diff --git a/src/main/java/com/whdc/mapper/AutoCallPersonMapper.java b/src/main/java/com/whdc/mapper/AutoCallPersonMapper.java index 1546bc6..b3e8403 100644 --- a/src/main/java/com/whdc/mapper/AutoCallPersonMapper.java +++ b/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; diff --git a/src/main/java/com/whdc/mapper/AutoCallTaskMapper.java b/src/main/java/com/whdc/mapper/AutoCallTaskMapper.java index 6e47b4f..940faa6 100644 --- a/src/main/java/com/whdc/mapper/AutoCallTaskMapper.java +++ b/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; diff --git a/src/main/java/com/whdc/model/entity/AutoCall.java b/src/main/java/com/whdc/model/autocall/AutoCall.java similarity index 98% rename from src/main/java/com/whdc/model/entity/AutoCall.java rename to src/main/java/com/whdc/model/autocall/AutoCall.java index 1a0e5f3..e1c5359 100644 --- a/src/main/java/com/whdc/model/entity/AutoCall.java +++ b/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; diff --git a/src/main/java/com/whdc/model/entity/AutoCallConfig.java b/src/main/java/com/whdc/model/autocall/AutoCallConfig.java similarity index 88% rename from src/main/java/com/whdc/model/entity/AutoCallConfig.java rename to src/main/java/com/whdc/model/autocall/AutoCallConfig.java index 0733e06..13811c7 100644 --- a/src/main/java/com/whdc/model/entity/AutoCallConfig.java +++ b/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; diff --git a/src/main/java/com/whdc/model/entity/AutoCallPerson.java b/src/main/java/com/whdc/model/autocall/AutoCallPerson.java similarity index 99% rename from src/main/java/com/whdc/model/entity/AutoCallPerson.java rename to src/main/java/com/whdc/model/autocall/AutoCallPerson.java index 9708dd5..282ad66 100644 --- a/src/main/java/com/whdc/model/entity/AutoCallPerson.java +++ b/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; diff --git a/src/main/java/com/whdc/model/entity/AutoCallTask.java b/src/main/java/com/whdc/model/autocall/AutoCallTask.java similarity index 98% rename from src/main/java/com/whdc/model/entity/AutoCallTask.java rename to src/main/java/com/whdc/model/autocall/AutoCallTask.java index 1b2a434..83deb3f 100644 --- a/src/main/java/com/whdc/model/entity/AutoCallTask.java +++ b/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; diff --git a/src/main/java/com/whdc/model/entity/autocall/AICCCallRespDetail.java b/src/main/java/com/whdc/model/autocall/aicc/AICCCallRespDetail.java similarity index 98% rename from src/main/java/com/whdc/model/entity/autocall/AICCCallRespDetail.java rename to src/main/java/com/whdc/model/autocall/aicc/AICCCallRespDetail.java index e738220..213e217 100644 --- a/src/main/java/com/whdc/model/entity/autocall/AICCCallRespDetail.java +++ b/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; diff --git a/src/main/java/com/whdc/model/entity/autocall/AICCCallRespTask.java b/src/main/java/com/whdc/model/autocall/aicc/AICCCallRespTask.java similarity index 95% rename from src/main/java/com/whdc/model/entity/autocall/AICCCallRespTask.java rename to src/main/java/com/whdc/model/autocall/aicc/AICCCallRespTask.java index 2a2b674..eb23e9a 100644 --- a/src/main/java/com/whdc/model/entity/autocall/AICCCallRespTask.java +++ b/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; diff --git a/src/main/java/com/whdc/model/entity/autocall/AICCCallRespWrapper.java b/src/main/java/com/whdc/model/autocall/aicc/AICCCallRespWrapper.java similarity index 94% rename from src/main/java/com/whdc/model/entity/autocall/AICCCallRespWrapper.java rename to src/main/java/com/whdc/model/autocall/aicc/AICCCallRespWrapper.java index b5fc715..a297073 100644 --- a/src/main/java/com/whdc/model/entity/autocall/AICCCallRespWrapper.java +++ b/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; diff --git a/src/main/java/com/whdc/model/entity/autocall/AICCLogin.java b/src/main/java/com/whdc/model/autocall/aicc/AICCLogin.java similarity index 93% rename from src/main/java/com/whdc/model/entity/autocall/AICCLogin.java rename to src/main/java/com/whdc/model/autocall/aicc/AICCLogin.java index 4926dca..bb457b2 100644 --- a/src/main/java/com/whdc/model/entity/autocall/AICCLogin.java +++ b/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; diff --git a/src/main/java/com/whdc/model/entity/autocall/AICCUploadTask.java b/src/main/java/com/whdc/model/autocall/aicc/AICCUploadTask.java similarity index 99% rename from src/main/java/com/whdc/model/entity/autocall/AICCUploadTask.java rename to src/main/java/com/whdc/model/autocall/aicc/AICCUploadTask.java index 177871d..ab905dc 100644 --- a/src/main/java/com/whdc/model/entity/autocall/AICCUploadTask.java +++ b/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; diff --git a/src/main/java/com/whdc/service/AutoCallApiService.java b/src/main/java/com/whdc/service/autocall/AutoCallApiService.java similarity index 99% rename from src/main/java/com/whdc/service/AutoCallApiService.java rename to src/main/java/com/whdc/service/autocall/AutoCallApiService.java index 2e2e4b0..a15a203 100644 --- a/src/main/java/com/whdc/service/AutoCallApiService.java +++ b/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; diff --git a/src/main/java/com/whdc/service/AutoCallTaskService2.java b/src/main/java/com/whdc/service/autocall/AutoCallTaskService2.java similarity index 98% rename from src/main/java/com/whdc/service/AutoCallTaskService2.java rename to src/main/java/com/whdc/service/autocall/AutoCallTaskService2.java index 24c2068..dcdfccc 100644 --- a/src/main/java/com/whdc/service/AutoCallTaskService2.java +++ b/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; diff --git a/src/main/java/com/whdc/utils/AICCHelper.java b/src/main/java/com/whdc/utils/AICCHelper.java index 86bd782..43e3e87 100644 --- a/src/main/java/com/whdc/utils/AICCHelper.java +++ b/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; diff --git a/src/main/java/com/whdc/utils/AutoCallHelper.java b/src/main/java/com/whdc/utils/AutoCallHelper.java index d9922ab..ff0ca87 100644 --- a/src/main/java/com/whdc/utils/AutoCallHelper.java +++ b/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; diff --git a/src/main/resources/mapper/AutoCallMapper.xml b/src/main/resources/mapper/AutoCallMapper.xml index e53f442..ccf5e00 100644 --- a/src/main/resources/mapper/AutoCallMapper.xml +++ b/src/main/resources/mapper/AutoCallMapper.xml @@ -1,7 +1,7 @@ - select * from AUTOCALL A where 1=1 diff --git a/src/main/resources/mapper/AutoCallPersonMapper.xml b/src/main/resources/mapper/AutoCallPersonMapper.xml index 340d892..f21cde9 100644 --- a/src/main/resources/mapper/AutoCallPersonMapper.xml +++ b/src/main/resources/mapper/AutoCallPersonMapper.xml @@ -4,7 +4,7 @@ - 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} diff --git a/src/main/resources/mapper/AutoCallTaskMapper.xml b/src/main/resources/mapper/AutoCallTaskMapper.xml index 35fb14c..07e74fe 100644 --- a/src/main/resources/mapper/AutoCallTaskMapper.xml +++ b/src/main/resources/mapper/AutoCallTaskMapper.xml @@ -18,7 +18,7 @@ ) ORDER BY Q.WARNID ASC; - SELECT * FROM diff --git a/src/main/resources/mapper/WarnCallMapMapper.xml b/src/main/resources/mapper/WarnCallMapMapper.xml index 0f2922e..9e77ae2 100644 --- a/src/main/resources/mapper/WarnCallMapMapper.xml +++ b/src/main/resources/mapper/WarnCallMapMapper.xml @@ -18,7 +18,7 @@ ) ORDER BY Q.WARNID ASC; - SELECT * FROM diff --git a/src/test/java/com/whdc/utils/AutoCallHelperTest.java b/src/test/java/com/whdc/utils/AutoCallHelperTest.java index 8d33f07..ef8c53a 100644 --- a/src/test/java/com/whdc/utils/AutoCallHelperTest.java +++ b/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;