From e4721ef5b0872afa232fd41cc0ab43b7314c96bb Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 30 Mar 2023 11:12:10 +0800 Subject: [PATCH] =?UTF-8?q?IDC=E7=A7=BB=E5=85=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/idc/controller/IdcController.java | 8 ++--- .../api/idc/service/DownloadRestTemplate.java | 18 +++++++---- .../com/glxp/api/idc/service/IdcService.java | 4 +-- .../api/idc/service/impl/IdcServiceImpl.java | 32 +++++++++---------- .../glxp/api/idc/thread/AsyncFetchTask.java | 13 ++++---- .../java/com/glxp/api/idc/utils/DBAUtils.java | 5 +-- .../java/com/glxp/api/idc/utils/IDCUtils.java | 2 +- 7 files changed, 45 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/glxp/api/idc/controller/IdcController.java b/src/main/java/com/glxp/api/idc/controller/IdcController.java index acd78d146..e3ce5dbf8 100644 --- a/src/main/java/com/glxp/api/idc/controller/IdcController.java +++ b/src/main/java/com/glxp/api/idc/controller/IdcController.java @@ -1,4 +1,4 @@ -package com.glxp.sale.admin.idc.controller; +package com.glxp.api.idc.controller; import java.io.BufferedReader; import java.io.IOException; @@ -25,9 +25,9 @@ import org.springframework.web.multipart.MultipartFile; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.glxp.sale.admin.idc.dao.DbDao; -import com.glxp.sale.admin.idc.service.IdcService; -import com.glxp.sale.common.res.BaseResponse; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.dao.idc.DbDao; +import com.glxp.api.idc.service.IdcService; import cn.hutool.core.io.IoUtil; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java b/src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java index c5a411399..205d08beb 100644 --- a/src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java +++ b/src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java @@ -1,15 +1,21 @@ -package com.glxp.sale.admin.idc.service; +package com.glxp.api.idc.service; + +import java.io.IOException; +import java.net.URI; -import cn.hutool.core.lang.Assert; -import com.beust.jcommander.internal.Nullable; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpResponse; -import org.springframework.web.client.*; +import org.springframework.web.client.RequestCallback; +import org.springframework.web.client.ResourceAccessException; +import org.springframework.web.client.ResponseExtractor; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.RestTemplate; -import java.io.IOException; -import java.net.URI; +import com.beust.jcommander.internal.Nullable; + +import cn.hutool.core.lang.Assert; public class DownloadRestTemplate extends RestTemplate { public DownloadRestTemplate(ClientHttpRequestFactory requestFactory) { diff --git a/src/main/java/com/glxp/api/idc/service/IdcService.java b/src/main/java/com/glxp/api/idc/service/IdcService.java index 9f158135c..5de3dd406 100644 --- a/src/main/java/com/glxp/api/idc/service/IdcService.java +++ b/src/main/java/com/glxp/api/idc/service/IdcService.java @@ -1,4 +1,4 @@ -package com.glxp.sale.admin.idc.service; +package com.glxp.api.idc.service; import java.util.Map; @@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.web.multipart.MultipartFile; -import com.glxp.sale.common.res.BaseResponse; +import com.glxp.api.common.res.BaseResponse; /*数据中继数据中心(接收)*/ public interface IdcService { diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 3535dbfb7..e20d22658 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -1,4 +1,4 @@ -package com.glxp.sale.admin.idc.service.impl; +package com.glxp.api.idc.service.impl; import java.io.File; import java.io.FileOutputStream; @@ -15,7 +15,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.text.WordUtils; +import org.apache.commons.lang3.text.WordUtils; import org.apache.tools.ant.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,20 +28,20 @@ import org.springframework.web.multipart.MultipartFile; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.glxp.sale.admin.dao.info.ScheduledDao; -import com.glxp.sale.admin.entity.info.ScheduledEntity; -import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; -import com.glxp.sale.admin.idc.dao.DbDao; -import com.glxp.sale.admin.idc.service.IdcService; -import com.glxp.sale.admin.idc.utils.DBAUtils; -import com.glxp.sale.admin.idc.utils.IDCUtils; -import com.glxp.sale.admin.req.info.ScheduledRequest; -import com.glxp.sale.admin.service.param.SystemParamConfigService; -import com.glxp.sale.admin.util.CustomUtil; -import com.glxp.sale.admin.util.DateUtil; -import com.glxp.sale.admin.util.FileUtils; -import com.glxp.sale.common.res.BaseResponse; -import com.glxp.sale.common.util.ResultVOUtils; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.dao.idc.DbDao; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.system.ScheduledEntity; +import com.glxp.api.entity.system.SystemParamConfigEntity; +import com.glxp.api.idc.service.IdcService; +import com.glxp.api.idc.utils.DBAUtils; +import com.glxp.api.idc.utils.IDCUtils; +import com.glxp.api.req.system.ScheduledRequest; +import com.glxp.api.service.system.SystemParamConfigService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.FileUtils; import lombok.extern.slf4j.Slf4j; import okhttp3.MediaType; diff --git a/src/main/java/com/glxp/api/idc/thread/AsyncFetchTask.java b/src/main/java/com/glxp/api/idc/thread/AsyncFetchTask.java index f5429d301..3b24ee4ad 100644 --- a/src/main/java/com/glxp/api/idc/thread/AsyncFetchTask.java +++ b/src/main/java/com/glxp/api/idc/thread/AsyncFetchTask.java @@ -1,4 +1,4 @@ -package com.glxp.sale.admin.idc.thread; +package com.glxp.api.idc.thread; import javax.annotation.Resource; @@ -10,16 +10,17 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar; import org.springframework.scheduling.support.CronTrigger; import org.springframework.stereotype.Component; -import com.glxp.sale.admin.dao.info.ScheduledDao; -import com.glxp.sale.admin.entity.info.ScheduledEntity; -import com.glxp.sale.admin.idc.service.IdcService; -import com.glxp.sale.admin.req.info.ScheduledRequest; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.system.ScheduledEntity; +import com.glxp.api.idc.service.IdcService; +import com.glxp.api.req.system.ScheduledRequest; + @Component @EnableScheduling public class AsyncFetchTask implements SchedulingConfigurer { - final Logger logger = LoggerFactory.getLogger(AsyncIdcTask.class); + final Logger logger = LoggerFactory.getLogger(AsyncFetchTask.class); @Resource private ScheduledDao scheduledDao; diff --git a/src/main/java/com/glxp/api/idc/utils/DBAUtils.java b/src/main/java/com/glxp/api/idc/utils/DBAUtils.java index 8fa5633c3..872902f2a 100644 --- a/src/main/java/com/glxp/api/idc/utils/DBAUtils.java +++ b/src/main/java/com/glxp/api/idc/utils/DBAUtils.java @@ -1,4 +1,4 @@ -package com.glxp.sale.admin.idc.utils; +package com.glxp.api.idc.utils; import java.util.Date; import java.util.HashMap; @@ -9,7 +9,8 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.glxp.sale.admin.util.DateUtil; +import com.glxp.api.util.DateUtil; + diff --git a/src/main/java/com/glxp/api/idc/utils/IDCUtils.java b/src/main/java/com/glxp/api/idc/utils/IDCUtils.java index 7fadaa7ed..2a5341c74 100644 --- a/src/main/java/com/glxp/api/idc/utils/IDCUtils.java +++ b/src/main/java/com/glxp/api/idc/utils/IDCUtils.java @@ -1,4 +1,4 @@ -package com.glxp.sale.admin.idc.utils; +package com.glxp.api.idc.utils; import java.text.ParseException; import java.text.SimpleDateFormat;