diff --git a/script/src/main/java/com/xiang/ServiceScriptApplication.java b/script/src/main/java/com/xiang/ServiceScriptApplication.java index fcdeb45..45f299d 100644 --- a/script/src/main/java/com/xiang/ServiceScriptApplication.java +++ b/script/src/main/java/com/xiang/ServiceScriptApplication.java @@ -13,11 +13,11 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @EnableScheduling @MapperScan(basePackages = { - "com.xiang.xservice.fwd.mapper", - "com.xiang.xservice.glados.repository", - "com.xiang.xservice.xb.repository", - "com.xiang.xservice.stock.gnshyx.mapper", - "com.xiang.xservice.stock.data.mapper", + "com.xiang.xservice.application.script.fwd.mapper", + "com.xiang.xservice.application.script.glados.repository", + "com.xiang.xservice.application.script.xb.repository", + "com.xiang.xservice.application.script.stock.gnshyx.mapper", + "com.xiang.xservice.application.script.stock.data.mapper", }) @ConfigurationPropertiesScan(basePackages = { "com.xiang.xservice.config" diff --git a/script/src/main/java/com/xiang/xservice/domain/config/AliyunDnsPropertyConfig.java b/script/src/main/java/com/xiang/xservice/application/script/domain/config/AliyunDnsPropertyConfig.java similarity index 83% rename from script/src/main/java/com/xiang/xservice/domain/config/AliyunDnsPropertyConfig.java rename to script/src/main/java/com/xiang/xservice/application/script/domain/config/AliyunDnsPropertyConfig.java index cb5c085..8824c75 100644 --- a/script/src/main/java/com/xiang/xservice/domain/config/AliyunDnsPropertyConfig.java +++ b/script/src/main/java/com/xiang/xservice/application/script/domain/config/AliyunDnsPropertyConfig.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.domain.config; +package com.xiang.xservice.application.script.domain.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/script/src/main/java/com/xiang/xservice/domain/controller/DynamicDomainController.java b/script/src/main/java/com/xiang/xservice/application/script/domain/controller/DynamicDomainController.java similarity index 92% rename from script/src/main/java/com/xiang/xservice/domain/controller/DynamicDomainController.java rename to script/src/main/java/com/xiang/xservice/application/script/domain/controller/DynamicDomainController.java index 8df3963..ba28c70 100644 --- a/script/src/main/java/com/xiang/xservice/domain/controller/DynamicDomainController.java +++ b/script/src/main/java/com/xiang/xservice/application/script/domain/controller/DynamicDomainController.java @@ -1,9 +1,9 @@ -package com.xiang.xservice.domain.controller; +package com.xiang.xservice.application.script.domain.controller; import com.xiang.xservice.basic.common.resp.Result; import com.xiang.xservice.basic.utils.IpUtils; -import com.xiang.xservice.domain.service.IDomainService; +import com.xiang.xservice.application.script.domain.service.IDomainService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/script/src/main/java/com/xiang/xservice/domain/entity/resp/PublicIpResp.java b/script/src/main/java/com/xiang/xservice/application/script/domain/entity/resp/PublicIpResp.java similarity index 83% rename from script/src/main/java/com/xiang/xservice/domain/entity/resp/PublicIpResp.java rename to script/src/main/java/com/xiang/xservice/application/script/domain/entity/resp/PublicIpResp.java index 6a0e387..649ff69 100644 --- a/script/src/main/java/com/xiang/xservice/domain/entity/resp/PublicIpResp.java +++ b/script/src/main/java/com/xiang/xservice/application/script/domain/entity/resp/PublicIpResp.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.domain.entity.resp; +package com.xiang.xservice.application.script.domain.entity.resp; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/domain/schedule/DynamicDomainSchedule.java b/script/src/main/java/com/xiang/xservice/application/script/domain/schedule/DynamicDomainSchedule.java similarity index 87% rename from script/src/main/java/com/xiang/xservice/domain/schedule/DynamicDomainSchedule.java rename to script/src/main/java/com/xiang/xservice/application/script/domain/schedule/DynamicDomainSchedule.java index 8a73b2b..e3bafa7 100644 --- a/script/src/main/java/com/xiang/xservice/domain/schedule/DynamicDomainSchedule.java +++ b/script/src/main/java/com/xiang/xservice/application/script/domain/schedule/DynamicDomainSchedule.java @@ -1,7 +1,7 @@ -package com.xiang.xservice.domain.schedule; +package com.xiang.xservice.application.script.domain.schedule; import com.xiang.xservice.basic.utils.IpUtils; -import com.xiang.xservice.domain.service.IDomainService; +import com.xiang.xservice.application.script.domain.service.IDomainService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/script/src/main/java/com/xiang/xservice/domain/service/DingTalkScriptDomainService.java b/script/src/main/java/com/xiang/xservice/application/script/domain/service/DingTalkScriptDomainService.java similarity index 93% rename from script/src/main/java/com/xiang/xservice/domain/service/DingTalkScriptDomainService.java rename to script/src/main/java/com/xiang/xservice/application/script/domain/service/DingTalkScriptDomainService.java index 8acc72f..566fb48 100644 --- a/script/src/main/java/com/xiang/xservice/domain/service/DingTalkScriptDomainService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/domain/service/DingTalkScriptDomainService.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.domain.service; +package com.xiang.xservice.application.script.domain.service; import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; import com.xiang.xservice.config.DingTalkRobotScriptConfig; diff --git a/script/src/main/java/com/xiang/xservice/domain/service/IDomainService.java b/script/src/main/java/com/xiang/xservice/application/script/domain/service/IDomainService.java similarity index 78% rename from script/src/main/java/com/xiang/xservice/domain/service/IDomainService.java rename to script/src/main/java/com/xiang/xservice/application/script/domain/service/IDomainService.java index bb66aaf..72873f8 100644 --- a/script/src/main/java/com/xiang/xservice/domain/service/IDomainService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/domain/service/IDomainService.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.domain.service; +package com.xiang.xservice.application.script.domain.service; /** * @Author: xiang diff --git a/script/src/main/java/com/xiang/xservice/domain/service/IDomainServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/domain/service/IDomainServiceImpl.java similarity index 96% rename from script/src/main/java/com/xiang/xservice/domain/service/IDomainServiceImpl.java rename to script/src/main/java/com/xiang/xservice/application/script/domain/service/IDomainServiceImpl.java index 7376c7f..04778b5 100644 --- a/script/src/main/java/com/xiang/xservice/domain/service/IDomainServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/domain/service/IDomainServiceImpl.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.domain.service; +package com.xiang.xservice.application.script.domain.service; import com.aliyun.alidns20150109.Client; @@ -8,7 +8,7 @@ import com.aliyun.alidns20150109.models.DescribeSubDomainRecordsResponse; import com.aliyun.alidns20150109.models.DescribeSubDomainRecordsResponseBody; import com.aliyun.alidns20150109.models.UpdateDomainRecordRequest; import com.aliyun.teaopenapi.models.Config; -import com.xiang.xservice.domain.config.AliyunDnsPropertyConfig; +import com.xiang.xservice.application.script.domain.config.AliyunDnsPropertyConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/script/src/main/java/com/xiang/xservice/fwd/constants/CodeConstants.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/constants/CodeConstants.java similarity index 79% rename from script/src/main/java/com/xiang/xservice/fwd/constants/CodeConstants.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/constants/CodeConstants.java index 66579ce..642b60b 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/constants/CodeConstants.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/constants/CodeConstants.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.constants; +package com.xiang.xservice.application.script.fwd.constants; public class CodeConstants { public static final Integer SUCCESS = 10000; diff --git a/script/src/main/java/com/xiang/xservice/fwd/constants/UrlConstants.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/constants/UrlConstants.java similarity index 96% rename from script/src/main/java/com/xiang/xservice/fwd/constants/UrlConstants.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/constants/UrlConstants.java index 5a1a7f8..ccc5150 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/constants/UrlConstants.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/constants/UrlConstants.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.constants; +package com.xiang.xservice.application.script.fwd.constants; public class UrlConstants { diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/param/FwdOrderTaskParam.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/param/FwdOrderTaskParam.java similarity index 77% rename from script/src/main/java/com/xiang/xservice/fwd/entity/param/FwdOrderTaskParam.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/param/FwdOrderTaskParam.java index cfaee02..816a2f4 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/param/FwdOrderTaskParam.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/param/FwdOrderTaskParam.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.param; +package com.xiang.xservice.application.script.fwd.entity.param; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FAudienceConfig.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FAudienceConfig.java similarity index 86% rename from script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FAudienceConfig.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FAudienceConfig.java index 164e480..1b7021b 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FAudienceConfig.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FAudienceConfig.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.pojo; +package com.xiang.xservice.application.script.fwd.entity.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FPerformConfig.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FPerformConfig.java similarity index 83% rename from script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FPerformConfig.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FPerformConfig.java index ebfe9e5..c6294ee 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FPerformConfig.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FPerformConfig.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.pojo; +package com.xiang.xservice.application.script.fwd.entity.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FPerformProjectInfo.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FPerformProjectInfo.java similarity index 87% rename from script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FPerformProjectInfo.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FPerformProjectInfo.java index 85fb60c..979f671 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FPerformProjectInfo.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FPerformProjectInfo.java @@ -1,7 +1,7 @@ -package com.xiang.xservice.fwd.entity.pojo; +package com.xiang.xservice.application.script.fwd.entity.pojo; -import com.xiang.xservice.fwd.entity.resp.http.perform.SeatPlan; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.SeatPlan; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FPerformSeatInfo.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FPerformSeatInfo.java similarity index 97% rename from script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FPerformSeatInfo.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FPerformSeatInfo.java index ed8eaf1..74e174f 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FPerformSeatInfo.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FPerformSeatInfo.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.pojo; +package com.xiang.xservice.application.script.fwd.entity.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FUserConfig.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FUserConfig.java similarity index 80% rename from script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FUserConfig.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FUserConfig.java index d3d2d8c..e822299 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FUserConfig.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/pojo/FUserConfig.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.pojo; +package com.xiang.xservice.application.script.fwd.entity.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/req/PrivilegeCode.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/req/PrivilegeCode.java new file mode 100644 index 0000000..b0d7a08 --- /dev/null +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/req/PrivilegeCode.java @@ -0,0 +1,10 @@ +package com.xiang.xservice.application.script.fwd.entity.req; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class PrivilegeCode { + +} diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/req/ProjectOrderCreateReq.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/req/ProjectOrderCreateReq.java similarity index 91% rename from script/src/main/java/com/xiang/xservice/fwd/entity/req/ProjectOrderCreateReq.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/req/ProjectOrderCreateReq.java index 22fd97e..a5b991e 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/req/ProjectOrderCreateReq.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/req/ProjectOrderCreateReq.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.req; +package com.xiang.xservice.application.script.fwd.entity.req; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/BaseResult.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/BaseResult.java similarity index 76% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/BaseResult.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/BaseResult.java index 04900da..af55c6f 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/BaseResult.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/BaseResult.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp; +package com.xiang.xservice.application.script.fwd.entity.resp; public class BaseResult { /** diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/audience/AudienceMemberInfo.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/audience/AudienceMemberInfo.java similarity index 82% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/audience/AudienceMemberInfo.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/audience/AudienceMemberInfo.java index 071f427..1a57216 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/audience/AudienceMemberInfo.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/audience/AudienceMemberInfo.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.audience; +package com.xiang.xservice.application.script.fwd.entity.resp.http.audience; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/DeductionRuleDTO.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/DeductionRuleDTO.java similarity index 83% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/DeductionRuleDTO.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/DeductionRuleDTO.java index 460ae8d..72d1e2a 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/DeductionRuleDTO.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/DeductionRuleDTO.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Delivery.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Delivery.java similarity index 76% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Delivery.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Delivery.java index 6358c63..a9f1ca4 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Delivery.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Delivery.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Notice.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Notice.java similarity index 90% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Notice.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Notice.java index cfc3a44..4ef2d63 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Notice.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Notice.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Perform.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Perform.java similarity index 83% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Perform.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Perform.java index 4719973..0418ccf 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Perform.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Perform.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/PerformDetail.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/PerformDetail.java similarity index 93% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/PerformDetail.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/PerformDetail.java index b6197e7..d52c8c2 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/PerformDetail.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/PerformDetail.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/PerformInfo.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/PerformInfo.java similarity index 77% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/PerformInfo.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/PerformInfo.java index 384df72..ce40db3 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/PerformInfo.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/PerformInfo.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectInfoResp.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectInfoResp.java similarity index 96% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectInfoResp.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectInfoResp.java index c35ddc4..f5f8599 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectInfoResp.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectInfoResp.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectList.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectList.java similarity index 88% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectList.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectList.java index 8b33a7c..7f38728 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectList.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectList.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectOrderCreateResp.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectOrderCreateResp.java similarity index 92% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectOrderCreateResp.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectOrderCreateResp.java index 851045f..c845591 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectOrderCreateResp.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectOrderCreateResp.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectService.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectService.java similarity index 81% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectService.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectService.java index b188d0b..036ad99 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectService.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectsResp.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectsResp.java similarity index 90% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectsResp.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectsResp.java index 5978a66..081f181 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/ProjectsResp.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/ProjectsResp.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/RefundBeanRuleDTO.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/RefundBeanRuleDTO.java similarity index 80% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/RefundBeanRuleDTO.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/RefundBeanRuleDTO.java index 0eaaf18..b89befe 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/RefundBeanRuleDTO.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/RefundBeanRuleDTO.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/RefundRule.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/RefundRule.java similarity index 83% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/RefundRule.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/RefundRule.java index 650436a..11a3455 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/RefundRule.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/RefundRule.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/RefundRuleInfo.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/RefundRuleInfo.java similarity index 82% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/RefundRuleInfo.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/RefundRuleInfo.java index f3d3c9a..a2397c0 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/RefundRuleInfo.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/RefundRuleInfo.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/SeatPlan.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/SeatPlan.java similarity index 93% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/SeatPlan.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/SeatPlan.java index 4ab4c9b..be21500 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/SeatPlan.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/SeatPlan.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/SeatPlanStatus.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/SeatPlanStatus.java similarity index 83% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/SeatPlanStatus.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/SeatPlanStatus.java index e0e7891..8a81aa7 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/SeatPlanStatus.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/SeatPlanStatus.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/StandByNotice.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/StandByNotice.java new file mode 100644 index 0000000..0f3023c --- /dev/null +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/StandByNotice.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; + +public class StandByNotice { +} diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Tags.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Tags.java similarity index 77% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Tags.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Tags.java index e2155c8..6a6843a 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Tags.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Tags.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Ticket.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Ticket.java similarity index 82% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Ticket.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Ticket.java index 6cda740..928a71a 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/Ticket.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/Ticket.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/TicketNotice.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/TicketNotice.java similarity index 90% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/TicketNotice.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/TicketNotice.java index 20bcd45..d59b4e1 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/TicketNotice.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/TicketNotice.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/VenueInfo.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/VenueInfo.java similarity index 92% rename from script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/VenueInfo.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/VenueInfo.java index e9f4501..d5332fc 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/VenueInfo.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/entity/resp/http/perform/VenueInfo.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; +package com.xiang.xservice.application.script.fwd.entity.resp.http.perform; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/fwd/mapper/FwdAudienceConfigMapper.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdAudienceConfigMapper.java similarity index 70% rename from script/src/main/java/com/xiang/xservice/fwd/mapper/FwdAudienceConfigMapper.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdAudienceConfigMapper.java index fc150da..85b4288 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/mapper/FwdAudienceConfigMapper.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdAudienceConfigMapper.java @@ -1,6 +1,6 @@ -package com.xiang.xservice.fwd.mapper; +package com.xiang.xservice.application.script.fwd.mapper; -import com.xiang.xservice.fwd.entity.pojo.FAudienceConfig; +import com.xiang.xservice.application.script.fwd.entity.pojo.FAudienceConfig; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/script/src/main/java/com/xiang/xservice/fwd/mapper/FwdPerformConfigMapper.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdPerformConfigMapper.java similarity index 69% rename from script/src/main/java/com/xiang/xservice/fwd/mapper/FwdPerformConfigMapper.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdPerformConfigMapper.java index 4c1eed3..ee8cb9f 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/mapper/FwdPerformConfigMapper.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdPerformConfigMapper.java @@ -1,6 +1,6 @@ -package com.xiang.xservice.fwd.mapper; +package com.xiang.xservice.application.script.fwd.mapper; -import com.xiang.xservice.fwd.entity.pojo.FPerformConfig; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformConfig; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/script/src/main/java/com/xiang/xservice/fwd/mapper/FwdPerformProjectInfoMapper.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdPerformProjectInfoMapper.java similarity index 81% rename from script/src/main/java/com/xiang/xservice/fwd/mapper/FwdPerformProjectInfoMapper.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdPerformProjectInfoMapper.java index 22ea850..81851b0 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/mapper/FwdPerformProjectInfoMapper.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdPerformProjectInfoMapper.java @@ -1,6 +1,6 @@ -package com.xiang.xservice.fwd.mapper; +package com.xiang.xservice.application.script.fwd.mapper; -import com.xiang.xservice.fwd.entity.pojo.FPerformProjectInfo; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformProjectInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/script/src/main/java/com/xiang/xservice/fwd/mapper/FwdPerformSeatInfoMapper.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdPerformSeatInfoMapper.java similarity index 85% rename from script/src/main/java/com/xiang/xservice/fwd/mapper/FwdPerformSeatInfoMapper.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdPerformSeatInfoMapper.java index dbd2b19..b8919fd 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/mapper/FwdPerformSeatInfoMapper.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdPerformSeatInfoMapper.java @@ -1,6 +1,6 @@ -package com.xiang.xservice.fwd.mapper; +package com.xiang.xservice.application.script.fwd.mapper; -import com.xiang.xservice.fwd.entity.pojo.FPerformSeatInfo; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformSeatInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/script/src/main/java/com/xiang/xservice/fwd/mapper/FwdUserConfigMapper.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdUserConfigMapper.java similarity index 85% rename from script/src/main/java/com/xiang/xservice/fwd/mapper/FwdUserConfigMapper.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdUserConfigMapper.java index 45b09e3..8865448 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/mapper/FwdUserConfigMapper.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/mapper/FwdUserConfigMapper.java @@ -1,6 +1,6 @@ -package com.xiang.xservice.fwd.mapper; +package com.xiang.xservice.application.script.fwd.mapper; -import com.xiang.xservice.fwd.entity.pojo.FUserConfig; +import com.xiang.xservice.application.script.fwd.entity.pojo.FUserConfig; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/script/src/main/java/com/xiang/xservice/fwd/schedule/FwdImportantMsgJob.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdImportantMsgJob.java similarity index 91% rename from script/src/main/java/com/xiang/xservice/fwd/schedule/FwdImportantMsgJob.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdImportantMsgJob.java index 6cc6c17..5c2ad6c 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/schedule/FwdImportantMsgJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdImportantMsgJob.java @@ -1,27 +1,27 @@ -package com.xiang.xservice.fwd.schedule; +package com.xiang.xservice.application.script.fwd.schedule; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Maps; import com.xiang.xservice.basic.utils.DateUtils; import com.xiang.xservice.basic.utils.PrimaryKeyUtils; -import com.xiang.xservice.fwd.entity.param.FwdOrderTaskParam; -import com.xiang.xservice.fwd.entity.pojo.FPerformConfig; -import com.xiang.xservice.fwd.entity.pojo.FPerformProjectInfo; -import com.xiang.xservice.fwd.entity.pojo.FPerformSeatInfo; -import com.xiang.xservice.fwd.entity.resp.http.perform.Perform; -import com.xiang.xservice.fwd.entity.resp.http.perform.PerformDetail; -import com.xiang.xservice.fwd.entity.resp.http.perform.PerformInfo; -import com.xiang.xservice.fwd.entity.resp.http.perform.SeatPlan; -import com.xiang.xservice.fwd.entity.resp.http.perform.SeatPlanStatus; -import com.xiang.xservice.fwd.mapper.FwdAudienceConfigMapper; -import com.xiang.xservice.fwd.mapper.FwdPerformConfigMapper; -import com.xiang.xservice.fwd.mapper.FwdPerformProjectInfoMapper; -import com.xiang.xservice.fwd.mapper.FwdUserConfigMapper; -import com.xiang.xservice.fwd.service.DingTalkScriptFWDService; -import com.xiang.xservice.fwd.service.IPerformService; -import com.xiang.xservice.fwd.service.IPerformServiceHttp; -import com.xiang.xservice.fwd.utils.TimeSyncUtils; +import com.xiang.xservice.application.script.fwd.entity.param.FwdOrderTaskParam; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformConfig; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformProjectInfo; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformSeatInfo; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.Perform; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.PerformDetail; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.PerformInfo; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.SeatPlan; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.SeatPlanStatus; +import com.xiang.xservice.application.script.fwd.mapper.FwdAudienceConfigMapper; +import com.xiang.xservice.application.script.fwd.mapper.FwdPerformConfigMapper; +import com.xiang.xservice.application.script.fwd.mapper.FwdPerformProjectInfoMapper; +import com.xiang.xservice.application.script.fwd.mapper.FwdUserConfigMapper; +import com.xiang.xservice.application.script.fwd.service.DingTalkScriptFWDService; +import com.xiang.xservice.application.script.fwd.service.IPerformService; +import com.xiang.xservice.application.script.fwd.service.IPerformServiceHttp; +import com.xiang.xservice.application.script.fwd.utils.TimeSyncUtils; import com.xiang.xservice.schedule.core.DynamicTaskScheduler; import com.xiang.xservice.schedule.entity.ScheduledTaskEntity; import com.xiang.xservice.schedule.entity.TaskConfig; diff --git a/script/src/main/java/com/xiang/xservice/fwd/schedule/FwdTimeSyncJob.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdTimeSyncJob.java similarity index 81% rename from script/src/main/java/com/xiang/xservice/fwd/schedule/FwdTimeSyncJob.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdTimeSyncJob.java index aa6fb58..c43f873 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/schedule/FwdTimeSyncJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdTimeSyncJob.java @@ -1,7 +1,7 @@ -package com.xiang.xservice.fwd.schedule; +package com.xiang.xservice.application.script.fwd.schedule; -import com.xiang.xservice.fwd.service.IPerformServiceHttp; -import com.xiang.xservice.fwd.utils.TimeSyncUtils; +import com.xiang.xservice.application.script.fwd.service.IPerformServiceHttp; +import com.xiang.xservice.application.script.fwd.utils.TimeSyncUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/script/src/main/java/com/xiang/xservice/fwd/schedule/PullDataFromFWDJob.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/PullDataFromFWDJob.java similarity index 92% rename from script/src/main/java/com/xiang/xservice/fwd/schedule/PullDataFromFWDJob.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/PullDataFromFWDJob.java index 6ffaa66..1b5e4f3 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/schedule/PullDataFromFWDJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/PullDataFromFWDJob.java @@ -1,28 +1,28 @@ -package com.xiang.xservice.fwd.schedule; +package com.xiang.xservice.application.script.fwd.schedule; import com.google.common.collect.Lists; import com.xiang.xservice.basic.common.req.BaseRequest; import com.xiang.xservice.basic.config.MyThreadFactory; import com.xiang.xservice.basic.utils.DateUtils; -import com.xiang.xservice.fwd.entity.pojo.FAudienceConfig; -import com.xiang.xservice.fwd.entity.pojo.FPerformProjectInfo; -import com.xiang.xservice.fwd.entity.pojo.FPerformSeatInfo; -import com.xiang.xservice.fwd.entity.pojo.FUserConfig; -import com.xiang.xservice.fwd.entity.resp.http.audience.AudienceMemberInfo; -import com.xiang.xservice.fwd.entity.resp.http.perform.Perform; -import com.xiang.xservice.fwd.entity.resp.http.perform.PerformDetail; -import com.xiang.xservice.fwd.entity.resp.http.perform.PerformInfo; -import com.xiang.xservice.fwd.entity.resp.http.perform.ProjectInfoResp; -import com.xiang.xservice.fwd.entity.resp.http.perform.ProjectList; -import com.xiang.xservice.fwd.entity.resp.http.perform.ProjectsResp; -import com.xiang.xservice.fwd.entity.resp.http.perform.SeatPlan; -import com.xiang.xservice.fwd.entity.resp.http.perform.SeatPlanStatus; -import com.xiang.xservice.fwd.mapper.FwdAudienceConfigMapper; -import com.xiang.xservice.fwd.mapper.FwdPerformConfigMapper; -import com.xiang.xservice.fwd.mapper.FwdPerformProjectInfoMapper; -import com.xiang.xservice.fwd.mapper.FwdPerformSeatInfoMapper; -import com.xiang.xservice.fwd.mapper.FwdUserConfigMapper; -import com.xiang.xservice.fwd.service.IPerformServiceHttp; +import com.xiang.xservice.application.script.fwd.entity.pojo.FAudienceConfig; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformProjectInfo; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformSeatInfo; +import com.xiang.xservice.application.script.fwd.entity.pojo.FUserConfig; +import com.xiang.xservice.application.script.fwd.entity.resp.http.audience.AudienceMemberInfo; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.Perform; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.PerformDetail; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.PerformInfo; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.ProjectInfoResp; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.ProjectList; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.ProjectsResp; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.SeatPlan; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.SeatPlanStatus; +import com.xiang.xservice.application.script.fwd.mapper.FwdAudienceConfigMapper; +import com.xiang.xservice.application.script.fwd.mapper.FwdPerformConfigMapper; +import com.xiang.xservice.application.script.fwd.mapper.FwdPerformProjectInfoMapper; +import com.xiang.xservice.application.script.fwd.mapper.FwdPerformSeatInfoMapper; +import com.xiang.xservice.application.script.fwd.mapper.FwdUserConfigMapper; +import com.xiang.xservice.application.script.fwd.service.IPerformServiceHttp; import com.xiang.xservice.http.helper.HttpRequestHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/script/src/main/java/com/xiang/xservice/fwd/schedule/TicketGrabTask.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/TicketGrabTask.java similarity index 81% rename from script/src/main/java/com/xiang/xservice/fwd/schedule/TicketGrabTask.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/TicketGrabTask.java index 88eee70..8506f60 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/schedule/TicketGrabTask.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/TicketGrabTask.java @@ -1,12 +1,12 @@ -package com.xiang.xservice.fwd.schedule; +package com.xiang.xservice.application.script.fwd.schedule; import com.alibaba.fastjson.JSON; -import com.xiang.xservice.fwd.entity.param.FwdOrderTaskParam; -import com.xiang.xservice.fwd.entity.pojo.FAudienceConfig; -import com.xiang.xservice.fwd.entity.pojo.FUserConfig; -import com.xiang.xservice.fwd.mapper.FwdAudienceConfigMapper; -import com.xiang.xservice.fwd.mapper.FwdUserConfigMapper; -import com.xiang.xservice.fwd.service.IPerformService; +import com.xiang.xservice.application.script.fwd.entity.param.FwdOrderTaskParam; +import com.xiang.xservice.application.script.fwd.entity.pojo.FAudienceConfig; +import com.xiang.xservice.application.script.fwd.entity.pojo.FUserConfig; +import com.xiang.xservice.application.script.fwd.mapper.FwdAudienceConfigMapper; +import com.xiang.xservice.application.script.fwd.mapper.FwdUserConfigMapper; +import com.xiang.xservice.application.script.fwd.service.IPerformService; import com.xiang.xservice.schedule.service.IDynamicTaskSchedulerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/xservice/fwd/server/FwdDataController.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdDataController.java similarity index 91% rename from script/src/main/java/com/xiang/xservice/fwd/server/FwdDataController.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdDataController.java index f43227c..b955e5f 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/server/FwdDataController.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdDataController.java @@ -1,13 +1,13 @@ -package com.xiang.xservice.fwd.server; +package com.xiang.xservice.application.script.fwd.server; import com.xiang.xservice.basic.common.resp.Result; import com.xiang.xservice.basic.utils.DateUtils; -import com.xiang.xservice.fwd.entity.pojo.FPerformConfig; -import com.xiang.xservice.fwd.entity.pojo.FPerformProjectInfo; -import com.xiang.xservice.fwd.entity.pojo.FPerformSeatInfo; -import com.xiang.xservice.fwd.entity.resp.http.perform.*; -import com.xiang.xservice.fwd.service.IPerformService; -import com.xiang.xservice.fwd.service.IPerformServiceHttp; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformConfig; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformProjectInfo; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformSeatInfo; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.*; +import com.xiang.xservice.application.script.fwd.service.IPerformService; +import com.xiang.xservice.application.script.fwd.service.IPerformServiceHttp; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; diff --git a/script/src/main/java/com/xiang/xservice/fwd/server/FwdOuterController.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdOuterController.java similarity index 83% rename from script/src/main/java/com/xiang/xservice/fwd/server/FwdOuterController.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdOuterController.java index fb71daa..a1acd25 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/server/FwdOuterController.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdOuterController.java @@ -1,12 +1,12 @@ -package com.xiang.xservice.fwd.server; +package com.xiang.xservice.application.script.fwd.server; import com.xiang.xservice.basic.common.req.BaseRequest; import com.xiang.xservice.basic.common.resp.Result; -import com.xiang.xservice.fwd.entity.resp.http.perform.Perform; -import com.xiang.xservice.fwd.entity.resp.http.perform.ProjectsResp; -import com.xiang.xservice.fwd.entity.resp.http.perform.SeatPlanStatus; -import com.xiang.xservice.fwd.service.IPerformService; -import com.xiang.xservice.fwd.service.IPerformServiceHttp; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.Perform; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.ProjectsResp; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.SeatPlanStatus; +import com.xiang.xservice.application.script.fwd.service.IPerformService; +import com.xiang.xservice.application.script.fwd.service.IPerformServiceHttp; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/script/src/main/java/com/xiang/xservice/fwd/server/FwdUserController.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdUserController.java similarity index 87% rename from script/src/main/java/com/xiang/xservice/fwd/server/FwdUserController.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdUserController.java index 9dec7a3..cd65a97 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/server/FwdUserController.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdUserController.java @@ -1,9 +1,9 @@ -package com.xiang.xservice.fwd.server; +package com.xiang.xservice.application.script.fwd.server; import com.alibaba.fastjson.JSON; import com.xiang.xservice.basic.common.resp.Result; -import com.xiang.xservice.fwd.service.DingTalkScriptFWDService; -import com.xiang.xservice.fwd.service.IPerformService; +import com.xiang.xservice.application.script.fwd.service.DingTalkScriptFWDService; +import com.xiang.xservice.application.script.fwd.service.IPerformService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/script/src/main/java/com/xiang/xservice/fwd/service/DingTalkScriptFWDService.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/DingTalkScriptFWDService.java similarity index 93% rename from script/src/main/java/com/xiang/xservice/fwd/service/DingTalkScriptFWDService.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/service/DingTalkScriptFWDService.java index 2d7bd1f..d4a2450 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/service/DingTalkScriptFWDService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/DingTalkScriptFWDService.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.service; +package com.xiang.xservice.application.script.fwd.service; import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; import com.xiang.xservice.config.DingTalkRobotScriptConfig; diff --git a/script/src/main/java/com/xiang/xservice/fwd/service/IPerformService.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/IPerformService.java similarity index 70% rename from script/src/main/java/com/xiang/xservice/fwd/service/IPerformService.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/service/IPerformService.java index 83c53d7..029407e 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/service/IPerformService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/IPerformService.java @@ -1,8 +1,8 @@ -package com.xiang.xservice.fwd.service; +package com.xiang.xservice.application.script.fwd.service; -import com.xiang.xservice.fwd.entity.pojo.FPerformConfig; -import com.xiang.xservice.fwd.entity.pojo.FPerformProjectInfo; -import com.xiang.xservice.fwd.entity.pojo.FPerformSeatInfo; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformConfig; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformProjectInfo; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformSeatInfo; import java.util.List; diff --git a/script/src/main/java/com/xiang/xservice/fwd/service/IPerformServiceHttp.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/IPerformServiceHttp.java similarity index 64% rename from script/src/main/java/com/xiang/xservice/fwd/service/IPerformServiceHttp.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/service/IPerformServiceHttp.java index 06e9e50..881b78a 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/service/IPerformServiceHttp.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/IPerformServiceHttp.java @@ -1,13 +1,13 @@ -package com.xiang.xservice.fwd.service; +package com.xiang.xservice.application.script.fwd.service; import com.xiang.xservice.basic.common.req.BaseRequest; -import com.xiang.xservice.fwd.entity.req.ProjectOrderCreateReq; -import com.xiang.xservice.fwd.entity.resp.http.audience.AudienceMemberInfo; -import com.xiang.xservice.fwd.entity.resp.http.perform.Perform; -import com.xiang.xservice.fwd.entity.resp.http.perform.ProjectInfoResp; -import com.xiang.xservice.fwd.entity.resp.http.perform.ProjectOrderCreateResp; -import com.xiang.xservice.fwd.entity.resp.http.perform.ProjectsResp; -import com.xiang.xservice.fwd.entity.resp.http.perform.SeatPlanStatus; +import com.xiang.xservice.application.script.fwd.entity.req.ProjectOrderCreateReq; +import com.xiang.xservice.application.script.fwd.entity.resp.http.audience.AudienceMemberInfo; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.Perform; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.ProjectInfoResp; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.ProjectOrderCreateResp; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.ProjectsResp; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.SeatPlanStatus; import java.util.List; diff --git a/script/src/main/java/com/xiang/xservice/fwd/service/impl/PerformServiceHttpServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceHttpServiceImpl.java similarity index 91% rename from script/src/main/java/com/xiang/xservice/fwd/service/impl/PerformServiceHttpServiceImpl.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceHttpServiceImpl.java index f350c62..a0bc378 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/service/impl/PerformServiceHttpServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceHttpServiceImpl.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.service.impl; +package com.xiang.xservice.application.script.fwd.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -7,16 +7,16 @@ import com.google.common.collect.Maps; import com.xiang.xservice.basic.common.req.BaseRequest; import com.xiang.xservice.basic.utils.HttpUtils; import com.xiang.xservice.basic.utils.JsonUtils; -import com.xiang.xservice.fwd.constants.CodeConstants; -import com.xiang.xservice.fwd.constants.UrlConstants; -import com.xiang.xservice.fwd.entity.req.ProjectOrderCreateReq; -import com.xiang.xservice.fwd.entity.resp.http.audience.AudienceMemberInfo; -import com.xiang.xservice.fwd.entity.resp.http.perform.Perform; -import com.xiang.xservice.fwd.entity.resp.http.perform.ProjectInfoResp; -import com.xiang.xservice.fwd.entity.resp.http.perform.ProjectOrderCreateResp; -import com.xiang.xservice.fwd.entity.resp.http.perform.ProjectsResp; -import com.xiang.xservice.fwd.entity.resp.http.perform.SeatPlanStatus; -import com.xiang.xservice.fwd.service.IPerformServiceHttp; +import com.xiang.xservice.application.script.fwd.constants.CodeConstants; +import com.xiang.xservice.application.script.fwd.constants.UrlConstants; +import com.xiang.xservice.application.script.fwd.entity.req.ProjectOrderCreateReq; +import com.xiang.xservice.application.script.fwd.entity.resp.http.audience.AudienceMemberInfo; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.Perform; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.ProjectInfoResp; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.ProjectOrderCreateResp; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.ProjectsResp; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.SeatPlanStatus; +import com.xiang.xservice.application.script.fwd.service.IPerformServiceHttp; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/xservice/fwd/service/impl/PerformServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceImpl.java similarity index 85% rename from script/src/main/java/com/xiang/xservice/fwd/service/impl/PerformServiceImpl.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceImpl.java index 99bea6b..e6762e5 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/service/impl/PerformServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceImpl.java @@ -1,20 +1,20 @@ -package com.xiang.xservice.fwd.service.impl; +package com.xiang.xservice.application.script.fwd.service.impl; import com.alibaba.fastjson2.JSONObject; import com.xiang.xservice.basic.config.MyThreadFactory; -import com.xiang.xservice.fwd.entity.pojo.FPerformConfig; -import com.xiang.xservice.fwd.entity.pojo.FPerformProjectInfo; -import com.xiang.xservice.fwd.entity.pojo.FPerformSeatInfo; -import com.xiang.xservice.fwd.entity.pojo.FUserConfig; -import com.xiang.xservice.fwd.entity.req.ProjectOrderCreateReq; -import com.xiang.xservice.fwd.entity.resp.http.perform.ProjectOrderCreateResp; -import com.xiang.xservice.fwd.mapper.FwdPerformConfigMapper; -import com.xiang.xservice.fwd.mapper.FwdPerformProjectInfoMapper; -import com.xiang.xservice.fwd.mapper.FwdPerformSeatInfoMapper; -import com.xiang.xservice.fwd.mapper.FwdUserConfigMapper; -import com.xiang.xservice.fwd.service.DingTalkScriptFWDService; -import com.xiang.xservice.fwd.service.IPerformService; -import com.xiang.xservice.fwd.service.IPerformServiceHttp; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformConfig; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformProjectInfo; +import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformSeatInfo; +import com.xiang.xservice.application.script.fwd.entity.pojo.FUserConfig; +import com.xiang.xservice.application.script.fwd.entity.req.ProjectOrderCreateReq; +import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.ProjectOrderCreateResp; +import com.xiang.xservice.application.script.fwd.mapper.FwdPerformConfigMapper; +import com.xiang.xservice.application.script.fwd.mapper.FwdPerformProjectInfoMapper; +import com.xiang.xservice.application.script.fwd.mapper.FwdPerformSeatInfoMapper; +import com.xiang.xservice.application.script.fwd.mapper.FwdUserConfigMapper; +import com.xiang.xservice.application.script.fwd.service.DingTalkScriptFWDService; +import com.xiang.xservice.application.script.fwd.service.IPerformService; +import com.xiang.xservice.application.script.fwd.service.IPerformServiceHttp; import com.xiang.xservice.http.helper.HttpRequestHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/script/src/main/java/com/xiang/xservice/fwd/utils/TimeSyncUtils.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/utils/TimeSyncUtils.java similarity index 93% rename from script/src/main/java/com/xiang/xservice/fwd/utils/TimeSyncUtils.java rename to script/src/main/java/com/xiang/xservice/application/script/fwd/utils/TimeSyncUtils.java index ba8fa5c..982f05b 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/utils/TimeSyncUtils.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/utils/TimeSyncUtils.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.utils; +package com.xiang.xservice.application.script.fwd.utils; import java.time.Instant; import java.time.LocalDateTime; diff --git a/script/src/main/java/com/xiang/xservice/glados/common/GladosConstants.java b/script/src/main/java/com/xiang/xservice/application/script/glados/common/GladosConstants.java similarity index 87% rename from script/src/main/java/com/xiang/xservice/glados/common/GladosConstants.java rename to script/src/main/java/com/xiang/xservice/application/script/glados/common/GladosConstants.java index baa0570..9425aba 100644 --- a/script/src/main/java/com/xiang/xservice/glados/common/GladosConstants.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/common/GladosConstants.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.glados.common; +package com.xiang.xservice.application.script.glados.common; /** * @Author: xiang diff --git a/script/src/main/java/com/xiang/xservice/glados/common/URLConstants.java b/script/src/main/java/com/xiang/xservice/application/script/glados/common/URLConstants.java similarity index 81% rename from script/src/main/java/com/xiang/xservice/glados/common/URLConstants.java rename to script/src/main/java/com/xiang/xservice/application/script/glados/common/URLConstants.java index 41adbca..18c203c 100644 --- a/script/src/main/java/com/xiang/xservice/glados/common/URLConstants.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/common/URLConstants.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.glados.common; +package com.xiang.xservice.application.script.glados.common; public class URLConstants { diff --git a/script/src/main/java/com/xiang/xservice/glados/controller/GLaDOSController.java b/script/src/main/java/com/xiang/xservice/application/script/glados/controller/GLaDOSController.java similarity index 76% rename from script/src/main/java/com/xiang/xservice/glados/controller/GLaDOSController.java rename to script/src/main/java/com/xiang/xservice/application/script/glados/controller/GLaDOSController.java index 817415d..12518d9 100644 --- a/script/src/main/java/com/xiang/xservice/glados/controller/GLaDOSController.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/controller/GLaDOSController.java @@ -1,8 +1,8 @@ -package com.xiang.xservice.glados.controller; +package com.xiang.xservice.application.script.glados.controller; import com.xiang.xservice.basic.common.resp.Result; -import com.xiang.xservice.glados.entity.req.GladosCheckInReq; -import com.xiang.xservice.glados.service.GLaDOSService; +import com.xiang.xservice.application.script.glados.entity.req.GladosCheckInReq; +import com.xiang.xservice.application.script.glados.service.GLaDOSService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/script/src/main/java/com/xiang/xservice/glados/entity/GladosRunLog.java b/script/src/main/java/com/xiang/xservice/application/script/glados/entity/GladosRunLog.java similarity index 91% rename from script/src/main/java/com/xiang/xservice/glados/entity/GladosRunLog.java rename to script/src/main/java/com/xiang/xservice/application/script/glados/entity/GladosRunLog.java index da0ed22..d50c930 100644 --- a/script/src/main/java/com/xiang/xservice/glados/entity/GladosRunLog.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/entity/GladosRunLog.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.glados.entity; +package com.xiang.xservice.application.script.glados.entity; import lombok.Builder; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/glados/entity/req/GladosCheckInReq.java b/script/src/main/java/com/xiang/xservice/application/script/glados/entity/req/GladosCheckInReq.java similarity index 72% rename from script/src/main/java/com/xiang/xservice/glados/entity/req/GladosCheckInReq.java rename to script/src/main/java/com/xiang/xservice/application/script/glados/entity/req/GladosCheckInReq.java index d3b8f96..d1eaaef 100644 --- a/script/src/main/java/com/xiang/xservice/glados/entity/req/GladosCheckInReq.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/entity/req/GladosCheckInReq.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.glados.entity.req; +package com.xiang.xservice.application.script.glados.entity.req; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/glados/entity/resp/GLaDOSResponse.java b/script/src/main/java/com/xiang/xservice/application/script/glados/entity/resp/GLaDOSResponse.java similarity index 79% rename from script/src/main/java/com/xiang/xservice/glados/entity/resp/GLaDOSResponse.java rename to script/src/main/java/com/xiang/xservice/application/script/glados/entity/resp/GLaDOSResponse.java index e13ba53..85721ed 100644 --- a/script/src/main/java/com/xiang/xservice/glados/entity/resp/GLaDOSResponse.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/entity/resp/GLaDOSResponse.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.glados.entity.resp; +package com.xiang.xservice.application.script.glados.entity.resp; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/glados/repository/GladosMapper.java b/script/src/main/java/com/xiang/xservice/application/script/glados/repository/GladosMapper.java similarity index 69% rename from script/src/main/java/com/xiang/xservice/glados/repository/GladosMapper.java rename to script/src/main/java/com/xiang/xservice/application/script/glados/repository/GladosMapper.java index dd06ecb..a6fa330 100644 --- a/script/src/main/java/com/xiang/xservice/glados/repository/GladosMapper.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/repository/GladosMapper.java @@ -1,7 +1,7 @@ -package com.xiang.xservice.glados.repository; +package com.xiang.xservice.application.script.glados.repository; -import com.xiang.xservice.glados.entity.GladosRunLog; -import com.xiang.xservice.xb.entity.pojo.User; +import com.xiang.xservice.application.script.glados.entity.GladosRunLog; +import com.xiang.xservice.application.script.xb.entity.pojo.User; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/script/src/main/java/com/xiang/xservice/glados/schedule/GladosCheckInJob.java b/script/src/main/java/com/xiang/xservice/application/script/glados/schedule/GladosCheckInJob.java similarity index 81% rename from script/src/main/java/com/xiang/xservice/glados/schedule/GladosCheckInJob.java rename to script/src/main/java/com/xiang/xservice/application/script/glados/schedule/GladosCheckInJob.java index 631df26..daf878d 100644 --- a/script/src/main/java/com/xiang/xservice/glados/schedule/GladosCheckInJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/schedule/GladosCheckInJob.java @@ -1,6 +1,6 @@ -package com.xiang.xservice.glados.schedule; +package com.xiang.xservice.application.script.glados.schedule; -import com.xiang.xservice.glados.service.GLaDOSService; +import com.xiang.xservice.application.script.glados.service.GLaDOSService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/script/src/main/java/com/xiang/xservice/glados/service/DingTalkScriptGladosService.java b/script/src/main/java/com/xiang/xservice/application/script/glados/service/DingTalkScriptGladosService.java similarity index 93% rename from script/src/main/java/com/xiang/xservice/glados/service/DingTalkScriptGladosService.java rename to script/src/main/java/com/xiang/xservice/application/script/glados/service/DingTalkScriptGladosService.java index 646eccf..1eb119e 100644 --- a/script/src/main/java/com/xiang/xservice/glados/service/DingTalkScriptGladosService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/service/DingTalkScriptGladosService.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.glados.service; +package com.xiang.xservice.application.script.glados.service; import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; import com.xiang.xservice.config.DingTalkRobotScriptConfig; diff --git a/script/src/main/java/com/xiang/xservice/glados/service/GLaDOSService.java b/script/src/main/java/com/xiang/xservice/application/script/glados/service/GLaDOSService.java similarity index 69% rename from script/src/main/java/com/xiang/xservice/glados/service/GLaDOSService.java rename to script/src/main/java/com/xiang/xservice/application/script/glados/service/GLaDOSService.java index 5198720..b1733ea 100644 --- a/script/src/main/java/com/xiang/xservice/glados/service/GLaDOSService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/service/GLaDOSService.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.glados.service; +package com.xiang.xservice.application.script.glados.service; /** * @Author: xiang diff --git a/script/src/main/java/com/xiang/xservice/glados/service/GLaDOSServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/glados/service/GLaDOSServiceImpl.java similarity index 90% rename from script/src/main/java/com/xiang/xservice/glados/service/GLaDOSServiceImpl.java rename to script/src/main/java/com/xiang/xservice/application/script/glados/service/GLaDOSServiceImpl.java index 1e470ef..b83407e 100644 --- a/script/src/main/java/com/xiang/xservice/glados/service/GLaDOSServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/service/GLaDOSServiceImpl.java @@ -1,14 +1,14 @@ -package com.xiang.xservice.glados.service; +package com.xiang.xservice.application.script.glados.service; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Maps; import com.xiang.xservice.basic.utils.HttpUtils; -import com.xiang.xservice.glados.common.GladosConstants; -import com.xiang.xservice.glados.common.URLConstants; -import com.xiang.xservice.glados.entity.GladosRunLog; -import com.xiang.xservice.glados.entity.resp.GLaDOSResponse; -import com.xiang.xservice.glados.repository.GladosMapper; -import com.xiang.xservice.xb.entity.pojo.User; +import com.xiang.xservice.application.script.glados.common.GladosConstants; +import com.xiang.xservice.application.script.glados.common.URLConstants; +import com.xiang.xservice.application.script.glados.entity.GladosRunLog; +import com.xiang.xservice.application.script.glados.entity.resp.GLaDOSResponse; +import com.xiang.xservice.application.script.glados.repository.GladosMapper; +import com.xiang.xservice.application.script.xb.entity.pojo.User; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/JntyzxResponse.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/JntyzxResponse.java similarity index 79% rename from script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/JntyzxResponse.java rename to script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/JntyzxResponse.java index 7c973ba..e99ab69 100644 --- a/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/JntyzxResponse.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/JntyzxResponse.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.jntyzx.entity.resp; +package com.xiang.xservice.application.script.jntyzx.entity.resp; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/QueryVenueResponse.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/query/QueryVenueResponse.java similarity index 74% rename from script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/QueryVenueResponse.java rename to script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/query/QueryVenueResponse.java index 8bf8320..77982c5 100644 --- a/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/QueryVenueResponse.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/query/QueryVenueResponse.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.jntyzx.entity.resp.query; +package com.xiang.xservice.application.script.jntyzx.entity.resp.query; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/SitePositionList.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/query/SitePositionList.java similarity index 91% rename from script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/SitePositionList.java rename to script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/query/SitePositionList.java index dc0c20a..7b8e134 100644 --- a/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/SitePositionList.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/query/SitePositionList.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.jntyzx.entity.resp.query; +package com.xiang.xservice.application.script.jntyzx.entity.resp.query; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/TimeList.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/query/TimeList.java similarity index 86% rename from script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/TimeList.java rename to script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/query/TimeList.java index 6ff50ef..54a5ec5 100644 --- a/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/TimeList.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/query/TimeList.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.jntyzx.entity.resp.query; +package com.xiang.xservice.application.script.jntyzx.entity.resp.query; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/VenueList.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/query/VenueList.java similarity index 77% rename from script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/VenueList.java rename to script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/query/VenueList.java index 1bb6953..7c295e7 100644 --- a/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/VenueList.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/entity/resp/query/VenueList.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.jntyzx.entity.resp.query; +package com.xiang.xservice.application.script.jntyzx.entity.resp.query; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/jntyzx/service/JntyzxService.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/JntyzxService.java similarity index 73% rename from script/src/main/java/com/xiang/xservice/jntyzx/service/JntyzxService.java rename to script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/JntyzxService.java index 5e48e17..8482e81 100644 --- a/script/src/main/java/com/xiang/xservice/jntyzx/service/JntyzxService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/JntyzxService.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.jntyzx.service; +package com.xiang.xservice.application.script.jntyzx.service; /** * @Author: xiang diff --git a/script/src/main/java/com/xiang/xservice/jntyzx/service/JntyzxServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/JntyzxServiceImpl.java similarity index 89% rename from script/src/main/java/com/xiang/xservice/jntyzx/service/JntyzxServiceImpl.java rename to script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/JntyzxServiceImpl.java index cdbf235..30094b6 100644 --- a/script/src/main/java/com/xiang/xservice/jntyzx/service/JntyzxServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/JntyzxServiceImpl.java @@ -1,14 +1,14 @@ -package com.xiang.xservice.jntyzx.service; +package com.xiang.xservice.application.script.jntyzx.service; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Maps; import com.xiang.xservice.basic.utils.HttpUtils; import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; -import com.xiang.xservice.xb.common.URLConstants; -import com.xiang.xservice.jntyzx.entity.resp.JntyzxResponse; -import com.xiang.xservice.jntyzx.entity.resp.query.QueryVenueResponse; -import com.xiang.xservice.jntyzx.entity.resp.query.SitePositionList; -import com.xiang.xservice.jntyzx.entity.resp.query.VenueList; +import com.xiang.xservice.application.script.xb.common.URLConstants; +import com.xiang.xservice.application.script.jntyzx.entity.resp.JntyzxResponse; +import com.xiang.xservice.application.script.jntyzx.entity.resp.query.QueryVenueResponse; +import com.xiang.xservice.application.script.jntyzx.entity.resp.query.SitePositionList; +import com.xiang.xservice.application.script.jntyzx.entity.resp.query.VenueList; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/script/src/main/java/com/xiang/xservice/stock/data/common/constants/RedisConstants.java b/script/src/main/java/com/xiang/xservice/application/script/stock/data/common/constants/RedisConstants.java similarity index 80% rename from script/src/main/java/com/xiang/xservice/stock/data/common/constants/RedisConstants.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/data/common/constants/RedisConstants.java index 7582d65..5fa0341 100644 --- a/script/src/main/java/com/xiang/xservice/stock/data/common/constants/RedisConstants.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/data/common/constants/RedisConstants.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.stock.data.common.constants; +package com.xiang.xservice.application.script.stock.data.common.constants; import com.xiang.xservice.basic.utils.DateUtils; diff --git a/script/src/main/java/com/xiang/xservice/stock/data/common/constants/UrlConstants.java b/script/src/main/java/com/xiang/xservice/application/script/stock/data/common/constants/UrlConstants.java similarity index 70% rename from script/src/main/java/com/xiang/xservice/stock/data/common/constants/UrlConstants.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/data/common/constants/UrlConstants.java index a495181..fa00c43 100644 --- a/script/src/main/java/com/xiang/xservice/stock/data/common/constants/UrlConstants.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/data/common/constants/UrlConstants.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.stock.data.common.constants; +package com.xiang.xservice.application.script.stock.data.common.constants; public class UrlConstants { diff --git a/script/src/main/java/com/xiang/xservice/stock/data/entity/StockSinaDataRecordDO.java b/script/src/main/java/com/xiang/xservice/application/script/stock/data/entity/StockSinaDataRecordDO.java similarity index 93% rename from script/src/main/java/com/xiang/xservice/stock/data/entity/StockSinaDataRecordDO.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/data/entity/StockSinaDataRecordDO.java index 55aa6e2..11ade04 100644 --- a/script/src/main/java/com/xiang/xservice/stock/data/entity/StockSinaDataRecordDO.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/data/entity/StockSinaDataRecordDO.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.stock.data.entity; +package com.xiang.xservice.application.script.stock.data.entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/stock/data/mapper/StockSinaDataRecordPullMapper.java b/script/src/main/java/com/xiang/xservice/application/script/stock/data/mapper/StockSinaDataRecordPullMapper.java similarity index 67% rename from script/src/main/java/com/xiang/xservice/stock/data/mapper/StockSinaDataRecordPullMapper.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/data/mapper/StockSinaDataRecordPullMapper.java index 5b17000..b5591fc 100644 --- a/script/src/main/java/com/xiang/xservice/stock/data/mapper/StockSinaDataRecordPullMapper.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/data/mapper/StockSinaDataRecordPullMapper.java @@ -1,6 +1,6 @@ -package com.xiang.xservice.stock.data.mapper; +package com.xiang.xservice.application.script.stock.data.mapper; -import com.xiang.xservice.stock.data.entity.StockSinaDataRecordDO; +import com.xiang.xservice.application.script.stock.data.entity.StockSinaDataRecordDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/script/src/main/java/com/xiang/xservice/stock/data/schedule/DataMsgSendJob.java b/script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/DataMsgSendJob.java similarity index 87% rename from script/src/main/java/com/xiang/xservice/stock/data/schedule/DataMsgSendJob.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/DataMsgSendJob.java index e185fc2..56d02fb 100644 --- a/script/src/main/java/com/xiang/xservice/stock/data/schedule/DataMsgSendJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/DataMsgSendJob.java @@ -1,13 +1,13 @@ -package com.xiang.xservice.stock.data.schedule; +package com.xiang.xservice.application.script.stock.data.schedule; import com.xiang.xservice.basic.utils.DateUtils; import com.xiang.xservice.cache.service.IRedisService; -import com.xiang.xservice.stock.data.common.constants.RedisConstants; -import com.xiang.xservice.stock.data.entity.StockSinaDataRecordDO; -import com.xiang.xservice.stock.data.service.DingTalkScriptStockService; -import com.xiang.xservice.stock.data.service.IStockDataService; -import com.xiang.xservice.stock.gnshyx.entity.StockGnshyxRecordDataDO; -import com.xiang.xservice.stock.gnshyx.service.ICloudRecordDataService; +import com.xiang.xservice.application.script.stock.data.common.constants.RedisConstants; +import com.xiang.xservice.application.script.stock.data.entity.StockSinaDataRecordDO; +import com.xiang.xservice.application.script.stock.data.service.DingTalkScriptStockService; +import com.xiang.xservice.application.script.stock.data.service.IStockDataService; +import com.xiang.xservice.application.script.stock.gnshyx.entity.StockGnshyxRecordDataDO; +import com.xiang.xservice.application.script.stock.gnshyx.service.ICloudRecordDataService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/script/src/main/java/com/xiang/xservice/stock/data/schedule/StockDataPullJob.java b/script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/StockDataPullJob.java similarity index 85% rename from script/src/main/java/com/xiang/xservice/stock/data/schedule/StockDataPullJob.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/StockDataPullJob.java index a91351d..8be84e3 100644 --- a/script/src/main/java/com/xiang/xservice/stock/data/schedule/StockDataPullJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/StockDataPullJob.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.stock.data.schedule; +package com.xiang.xservice.application.script.stock.data.schedule; import com.alibaba.fastjson.JSON; import com.google.common.collect.Lists; @@ -6,10 +6,10 @@ import com.xiang.xservice.basic.utils.DateUtils; import com.xiang.xservice.cache.service.IRedisService; import com.xiang.xservice.common.entity.DayResult; import com.xiang.xservice.common.enums.RedisConstant; -import com.xiang.xservice.stock.data.entity.StockSinaDataRecordDO; -import com.xiang.xservice.stock.data.service.IStockDataService; -import com.xiang.xservice.stock.gnshyx.entity.StockGnshyxRecordDataDO; -import com.xiang.xservice.stock.gnshyx.service.ICloudRecordDataService; +import com.xiang.xservice.application.script.stock.data.entity.StockSinaDataRecordDO; +import com.xiang.xservice.application.script.stock.data.service.IStockDataService; +import com.xiang.xservice.application.script.stock.gnshyx.entity.StockGnshyxRecordDataDO; +import com.xiang.xservice.application.script.stock.gnshyx.service.ICloudRecordDataService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/xservice/stock/data/service/DingTalkScriptStockService.java b/script/src/main/java/com/xiang/xservice/application/script/stock/data/service/DingTalkScriptStockService.java similarity index 93% rename from script/src/main/java/com/xiang/xservice/stock/data/service/DingTalkScriptStockService.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/data/service/DingTalkScriptStockService.java index d054579..0a217fa 100644 --- a/script/src/main/java/com/xiang/xservice/stock/data/service/DingTalkScriptStockService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/data/service/DingTalkScriptStockService.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.stock.data.service; +package com.xiang.xservice.application.script.stock.data.service; import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; import com.xiang.xservice.config.DingTalkRobotXbConfig; diff --git a/script/src/main/java/com/xiang/xservice/stock/data/service/IStockDataService.java b/script/src/main/java/com/xiang/xservice/application/script/stock/data/service/IStockDataService.java similarity index 62% rename from script/src/main/java/com/xiang/xservice/stock/data/service/IStockDataService.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/data/service/IStockDataService.java index 8bcf5d6..7a4c198 100644 --- a/script/src/main/java/com/xiang/xservice/stock/data/service/IStockDataService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/data/service/IStockDataService.java @@ -1,6 +1,6 @@ -package com.xiang.xservice.stock.data.service; +package com.xiang.xservice.application.script.stock.data.service; -import com.xiang.xservice.stock.data.entity.StockSinaDataRecordDO; +import com.xiang.xservice.application.script.stock.data.entity.StockSinaDataRecordDO; import java.util.List; diff --git a/script/src/main/java/com/xiang/xservice/stock/data/service/StockDataServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/stock/data/service/StockDataServiceImpl.java similarity index 92% rename from script/src/main/java/com/xiang/xservice/stock/data/service/StockDataServiceImpl.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/data/service/StockDataServiceImpl.java index f3cda9f..57f9cc0 100644 --- a/script/src/main/java/com/xiang/xservice/stock/data/service/StockDataServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/data/service/StockDataServiceImpl.java @@ -1,11 +1,11 @@ -package com.xiang.xservice.stock.data.service; +package com.xiang.xservice.application.script.stock.data.service; import com.google.common.collect.Maps; import com.xiang.xservice.basic.exception.BusinessException; import com.xiang.xservice.basic.utils.HttpUtils; -import com.xiang.xservice.stock.data.common.constants.UrlConstants; -import com.xiang.xservice.stock.data.entity.StockSinaDataRecordDO; -import com.xiang.xservice.stock.data.mapper.StockSinaDataRecordPullMapper; +import com.xiang.xservice.application.script.stock.data.common.constants.UrlConstants; +import com.xiang.xservice.application.script.stock.data.entity.StockSinaDataRecordDO; +import com.xiang.xservice.application.script.stock.data.mapper.StockSinaDataRecordPullMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/script/src/main/java/com/xiang/xservice/stock/gnshyx/common/constants/UrlConstant.java b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/common/constants/UrlConstant.java similarity index 81% rename from script/src/main/java/com/xiang/xservice/stock/gnshyx/common/constants/UrlConstant.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/common/constants/UrlConstant.java index 394b4d1..badc133 100644 --- a/script/src/main/java/com/xiang/xservice/stock/gnshyx/common/constants/UrlConstant.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/common/constants/UrlConstant.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.stock.gnshyx.common.constants; +package com.xiang.xservice.application.script.stock.gnshyx.common.constants; public class UrlConstant { diff --git a/script/src/main/java/com/xiang/xservice/stock/gnshyx/entity/StockGnshyxRecordDataDO.java b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/entity/StockGnshyxRecordDataDO.java similarity index 94% rename from script/src/main/java/com/xiang/xservice/stock/gnshyx/entity/StockGnshyxRecordDataDO.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/entity/StockGnshyxRecordDataDO.java index a0990c2..e806d1b 100644 --- a/script/src/main/java/com/xiang/xservice/stock/gnshyx/entity/StockGnshyxRecordDataDO.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/entity/StockGnshyxRecordDataDO.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.stock.gnshyx.entity; +package com.xiang.xservice.application.script.stock.gnshyx.entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/stock/gnshyx/entity/resp/GnshyxBaseResp.java b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/entity/resp/GnshyxBaseResp.java similarity index 83% rename from script/src/main/java/com/xiang/xservice/stock/gnshyx/entity/resp/GnshyxBaseResp.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/entity/resp/GnshyxBaseResp.java index a034908..c7dd1fc 100644 --- a/script/src/main/java/com/xiang/xservice/stock/gnshyx/entity/resp/GnshyxBaseResp.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/entity/resp/GnshyxBaseResp.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.stock.gnshyx.entity.resp; +package com.xiang.xservice.application.script.stock.gnshyx.entity.resp; import com.alibaba.fastjson.annotation.JSONField; import lombok.AllArgsConstructor; diff --git a/script/src/main/java/com/xiang/xservice/stock/gnshyx/entity/resp/ListLastDataResp.java b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/entity/resp/ListLastDataResp.java similarity index 92% rename from script/src/main/java/com/xiang/xservice/stock/gnshyx/entity/resp/ListLastDataResp.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/entity/resp/ListLastDataResp.java index cca3bf9..48c58c0 100644 --- a/script/src/main/java/com/xiang/xservice/stock/gnshyx/entity/resp/ListLastDataResp.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/entity/resp/ListLastDataResp.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.stock.gnshyx.entity.resp; +package com.xiang.xservice.application.script.stock.gnshyx.entity.resp; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/enums/GnshyxUrlEnum.java b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/enums/GnshyxUrlEnum.java new file mode 100644 index 0000000..4648e09 --- /dev/null +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/enums/GnshyxUrlEnum.java @@ -0,0 +1,6 @@ +package com.xiang.xservice.application.script.stock.gnshyx.enums; + +public enum GnshyxUrlEnum { + + +} diff --git a/script/src/main/java/com/xiang/xservice/stock/gnshyx/mapper/StockGnshyxRecordDataMapper.java b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/mapper/StockGnshyxRecordDataMapper.java similarity index 79% rename from script/src/main/java/com/xiang/xservice/stock/gnshyx/mapper/StockGnshyxRecordDataMapper.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/mapper/StockGnshyxRecordDataMapper.java index b294fa8..2bcbdf1 100644 --- a/script/src/main/java/com/xiang/xservice/stock/gnshyx/mapper/StockGnshyxRecordDataMapper.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/mapper/StockGnshyxRecordDataMapper.java @@ -1,6 +1,6 @@ -package com.xiang.xservice.stock.gnshyx.mapper; +package com.xiang.xservice.application.script.stock.gnshyx.mapper; -import com.xiang.xservice.stock.gnshyx.entity.StockGnshyxRecordDataDO; +import com.xiang.xservice.application.script.stock.gnshyx.entity.StockGnshyxRecordDataDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/script/src/main/java/com/xiang/xservice/stock/gnshyx/schedule/CloudRecordDataJob.java b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/schedule/CloudRecordDataJob.java similarity index 91% rename from script/src/main/java/com/xiang/xservice/stock/gnshyx/schedule/CloudRecordDataJob.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/schedule/CloudRecordDataJob.java index ee9b909..6d970ca 100644 --- a/script/src/main/java/com/xiang/xservice/stock/gnshyx/schedule/CloudRecordDataJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/schedule/CloudRecordDataJob.java @@ -1,13 +1,13 @@ -package com.xiang.xservice.stock.gnshyx.schedule; +package com.xiang.xservice.application.script.stock.gnshyx.schedule; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.xiang.xservice.basic.utils.DateUtils; import com.xiang.xservice.basic.utils.HttpUtils; -import com.xiang.xservice.stock.gnshyx.common.constants.UrlConstant; -import com.xiang.xservice.stock.gnshyx.entity.StockGnshyxRecordDataDO; -import com.xiang.xservice.stock.gnshyx.entity.resp.ListLastDataResp; -import com.xiang.xservice.stock.gnshyx.service.ICloudRecordDataService; +import com.xiang.xservice.application.script.stock.gnshyx.common.constants.UrlConstant; +import com.xiang.xservice.application.script.stock.gnshyx.entity.StockGnshyxRecordDataDO; +import com.xiang.xservice.application.script.stock.gnshyx.entity.resp.ListLastDataResp; +import com.xiang.xservice.application.script.stock.gnshyx.service.ICloudRecordDataService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/xservice/stock/gnshyx/service/CloudRecordDataServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/service/CloudRecordDataServiceImpl.java similarity index 80% rename from script/src/main/java/com/xiang/xservice/stock/gnshyx/service/CloudRecordDataServiceImpl.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/service/CloudRecordDataServiceImpl.java index 8c41f28..b21af18 100644 --- a/script/src/main/java/com/xiang/xservice/stock/gnshyx/service/CloudRecordDataServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/service/CloudRecordDataServiceImpl.java @@ -1,7 +1,7 @@ -package com.xiang.xservice.stock.gnshyx.service; +package com.xiang.xservice.application.script.stock.gnshyx.service; -import com.xiang.xservice.stock.gnshyx.entity.StockGnshyxRecordDataDO; -import com.xiang.xservice.stock.gnshyx.mapper.StockGnshyxRecordDataMapper; +import com.xiang.xservice.application.script.stock.gnshyx.entity.StockGnshyxRecordDataDO; +import com.xiang.xservice.application.script.stock.gnshyx.mapper.StockGnshyxRecordDataMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/script/src/main/java/com/xiang/xservice/stock/gnshyx/service/ICloudRecordDataService.java b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/service/ICloudRecordDataService.java similarity index 69% rename from script/src/main/java/com/xiang/xservice/stock/gnshyx/service/ICloudRecordDataService.java rename to script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/service/ICloudRecordDataService.java index a4f0159..a41fb6e 100644 --- a/script/src/main/java/com/xiang/xservice/stock/gnshyx/service/ICloudRecordDataService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/gnshyx/service/ICloudRecordDataService.java @@ -1,6 +1,6 @@ -package com.xiang.xservice.stock.gnshyx.service; +package com.xiang.xservice.application.script.stock.gnshyx.service; -import com.xiang.xservice.stock.gnshyx.entity.StockGnshyxRecordDataDO; +import com.xiang.xservice.application.script.stock.gnshyx.entity.StockGnshyxRecordDataDO; import java.util.List; diff --git a/script/src/main/java/com/xiang/xservice/xb/common/URLConstants.java b/script/src/main/java/com/xiang/xservice/application/script/xb/common/URLConstants.java similarity index 94% rename from script/src/main/java/com/xiang/xservice/xb/common/URLConstants.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/common/URLConstants.java index fdff752..c484cee 100644 --- a/script/src/main/java/com/xiang/xservice/xb/common/URLConstants.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/common/URLConstants.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.common; +package com.xiang.xservice.application.script.xb.common; /** * @Author: xiang diff --git a/script/src/main/java/com/xiang/xservice/xb/controller/XBController.java b/script/src/main/java/com/xiang/xservice/application/script/xb/controller/XBController.java similarity index 74% rename from script/src/main/java/com/xiang/xservice/xb/controller/XBController.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/controller/XBController.java index d8e7f30..b0ec8e9 100644 --- a/script/src/main/java/com/xiang/xservice/xb/controller/XBController.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/controller/XBController.java @@ -1,14 +1,14 @@ -package com.xiang.xservice.xb.controller; +package com.xiang.xservice.application.script.xb.controller; import com.google.common.collect.Lists; import com.xiang.xservice.basic.common.resp.Result; -import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; -import com.xiang.xservice.xb.entity.request.xb.fund.QueryFundInfoReq; -import com.xiang.xservice.xb.entity.request.xb.fund.QueryFundListReq; -import com.xiang.xservice.xb.entity.request.xb.fund.QueryXbFundListReq; -import com.xiang.xservice.xb.entity.response.xbyj.fund.FundInfo; -import com.xiang.xservice.xb.entity.response.xbyj.fund.FundList; -import com.xiang.xservice.xb.service.FundService; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundList; +import com.xiang.xservice.application.script.xb.entity.request.xb.fund.QueryFundInfoReq; +import com.xiang.xservice.application.script.xb.entity.request.xb.fund.QueryFundListReq; +import com.xiang.xservice.application.script.xb.entity.request.xb.fund.QueryXbFundListReq; +import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundInfo; +import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundList; +import com.xiang.xservice.application.script.xb.service.FundService; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; diff --git a/script/src/main/java/com/xiang/xservice/xb/entity/pojo/User.java b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/User.java similarity index 79% rename from script/src/main/java/com/xiang/xservice/xb/entity/pojo/User.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/User.java index d6b442d..0b99e39 100644 --- a/script/src/main/java/com/xiang/xservice/xb/entity/pojo/User.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/User.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.entity.pojo; +package com.xiang.xservice.application.script.xb.entity.pojo; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/FundInfo.java b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/xb/FundInfo.java similarity index 82% rename from script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/FundInfo.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/xb/FundInfo.java index 2a27c98..701aedd 100644 --- a/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/FundInfo.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/xb/FundInfo.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.entity.pojo.xb; +package com.xiang.xservice.application.script.xb.entity.pojo.xb; import lombok.Builder; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/FundMessage.java b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/xb/FundMessage.java similarity index 88% rename from script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/FundMessage.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/xb/FundMessage.java index ac69d31..13dd727 100644 --- a/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/FundMessage.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/xb/FundMessage.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.entity.pojo.xb; +package com.xiang.xservice.application.script.xb.entity.pojo.xb; import lombok.Builder; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/XbFundCount.java b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/xb/XbFundCount.java similarity index 89% rename from script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/XbFundCount.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/xb/XbFundCount.java index 82dced3..8806f8a 100644 --- a/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/XbFundCount.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/xb/XbFundCount.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.entity.pojo.xb; +package com.xiang.xservice.application.script.xb.entity.pojo.xb; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/XbFundList.java b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/xb/XbFundList.java similarity index 86% rename from script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/XbFundList.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/xb/XbFundList.java index cee6fc4..313c4d6 100644 --- a/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/XbFundList.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/pojo/xb/XbFundList.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.entity.pojo.xb; +package com.xiang.xservice.application.script.xb.entity.pojo.xb; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryFundInfoReq.java b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/request/xb/fund/QueryFundInfoReq.java similarity index 65% rename from script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryFundInfoReq.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/entity/request/xb/fund/QueryFundInfoReq.java index c28f0d8..a6280d0 100644 --- a/script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryFundInfoReq.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/request/xb/fund/QueryFundInfoReq.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.entity.request.xb.fund; +package com.xiang.xservice.application.script.xb.entity.request.xb.fund; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryFundListReq.java b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/request/xb/fund/QueryFundListReq.java similarity index 78% rename from script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryFundListReq.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/entity/request/xb/fund/QueryFundListReq.java index d6fa798..72d1312 100644 --- a/script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryFundListReq.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/request/xb/fund/QueryFundListReq.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.entity.request.xb.fund; +package com.xiang.xservice.application.script.xb.entity.request.xb.fund; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryXbFundListReq.java b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/request/xb/fund/QueryXbFundListReq.java similarity index 66% rename from script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryXbFundListReq.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/entity/request/xb/fund/QueryXbFundListReq.java index ea797fc..b2a455f 100644 --- a/script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryXbFundListReq.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/request/xb/fund/QueryXbFundListReq.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.entity.request.xb.fund; +package com.xiang.xservice.application.script.xb.entity.request.xb.fund; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/FundInfo.java b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/response/xbyj/fund/FundInfo.java similarity index 90% rename from script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/FundInfo.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/entity/response/xbyj/fund/FundInfo.java index 93a3fae..59fe670 100644 --- a/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/FundInfo.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/response/xbyj/fund/FundInfo.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.entity.response.xbyj.fund; +package com.xiang.xservice.application.script.xb.entity.response.xbyj.fund; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/FundList.java b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/response/xbyj/fund/FundList.java similarity index 83% rename from script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/FundList.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/entity/response/xbyj/fund/FundList.java index 654efa0..72e7159 100644 --- a/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/FundList.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/response/xbyj/fund/FundList.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.entity.response.xbyj.fund; +package com.xiang.xservice.application.script.xb.entity.response.xbyj.fund; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/QueryFundInfoResponse.java b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/response/xbyj/fund/QueryFundInfoResponse.java similarity index 72% rename from script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/QueryFundInfoResponse.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/entity/response/xbyj/fund/QueryFundInfoResponse.java index ac771ae..2614b20 100644 --- a/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/QueryFundInfoResponse.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/response/xbyj/fund/QueryFundInfoResponse.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.entity.response.xbyj.fund; +package com.xiang.xservice.application.script.xb.entity.response.xbyj.fund; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/QueryFundListResponse.java b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/response/xbyj/fund/QueryFundListResponse.java similarity index 75% rename from script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/QueryFundListResponse.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/entity/response/xbyj/fund/QueryFundListResponse.java index 595d469..26d6318 100644 --- a/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/QueryFundListResponse.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/entity/response/xbyj/fund/QueryFundListResponse.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.entity.response.xbyj.fund; +package com.xiang.xservice.application.script.xb.entity.response.xbyj.fund; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/xb/repository/XBFundMapper.java b/script/src/main/java/com/xiang/xservice/application/script/xb/repository/XBFundMapper.java similarity index 65% rename from script/src/main/java/com/xiang/xservice/xb/repository/XBFundMapper.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/repository/XBFundMapper.java index dabc3d0..eb20079 100644 --- a/script/src/main/java/com/xiang/xservice/xb/repository/XBFundMapper.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/repository/XBFundMapper.java @@ -1,8 +1,8 @@ -package com.xiang.xservice.xb.repository; +package com.xiang.xservice.application.script.xb.repository; -import com.xiang.xservice.xb.entity.pojo.xb.FundInfo; -import com.xiang.xservice.xb.entity.pojo.xb.XbFundCount; -import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.FundInfo; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundCount; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundList; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundCountJob.java b/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundCountJob.java similarity index 90% rename from script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundCountJob.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundCountJob.java index dc5e471..a9d20b3 100644 --- a/script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundCountJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundCountJob.java @@ -1,13 +1,13 @@ -package com.xiang.xservice.xb.schedule.xb; +package com.xiang.xservice.application.script.xb.schedule.xb; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Lists; import com.xiang.xservice.basic.utils.DateUtils; -import com.xiang.xservice.xb.entity.pojo.xb.XbFundCount; -import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; -import com.xiang.xservice.xb.entity.response.xbyj.fund.FundList; -import com.xiang.xservice.xb.service.DingTalkRobotService; -import com.xiang.xservice.xb.service.FundService; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundCount; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundList; +import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundList; +import com.xiang.xservice.application.script.xb.service.DingTalkRobotService; +import com.xiang.xservice.application.script.xb.service.FundService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundInfoQueryJob.java b/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundInfoQueryJob.java similarity index 84% rename from script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundInfoQueryJob.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundInfoQueryJob.java index 1a36ebe..fa19b5d 100644 --- a/script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundInfoQueryJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundInfoQueryJob.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.schedule.xb; +package com.xiang.xservice.application.script.xb.schedule.xb; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSONObject; @@ -9,12 +9,12 @@ import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; import com.xiang.xservice.cache.service.IRedisService; import com.xiang.xservice.common.entity.DayResult; import com.xiang.xservice.common.enums.RedisConstant; -import com.xiang.xservice.xb.entity.pojo.xb.FundMessage; -import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; -import com.xiang.xservice.xb.entity.response.xbyj.fund.FundInfo; -import com.xiang.xservice.xb.entity.response.xbyj.fund.FundList; -import com.xiang.xservice.xb.repository.XBFundMapper; -import com.xiang.xservice.xb.service.FundService; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.FundMessage; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundList; +import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundInfo; +import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundList; +import com.xiang.xservice.application.script.xb.repository.XBFundMapper; +import com.xiang.xservice.application.script.xb.service.FundService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -78,14 +78,14 @@ public class FundInfoQueryJob { String dayResult = (String) redisService.hGet(RedisConstant.DAY_INFO_PREFIX_KEY, DateUtils.getDateFromDate(now)); if (com.xiang.xservice.common.utils.DateUtils.validHoliday(JSON.parseObject(dayResult, DayResult.class))) return; - List fundInfos = xbFundMapper.queryListIn2Min(); + List fundInfos = xbFundMapper.queryListIn2Min(); if (CollectionUtils.isEmpty(fundInfos)) { return; } - Map> map = fundInfos.stream().collect(Collectors.groupingBy(com.xiang.xservice.xb.entity.pojo.xb.FundInfo::getCode)); + Map> map = fundInfos.stream().collect(Collectors.groupingBy(com.xiang.xservice.application.script.xb.entity.pojo.xb.FundInfo::getCode)); StringBuffer sb = new StringBuffer(); map.entrySet().parallelStream().forEach(entry -> { - List infos = entry.getValue(); + List infos = entry.getValue(); BigDecimal sum = new BigDecimal("0"); for (int i = 0; i < infos.size() - 1; i++) { BigDecimal subtract = new BigDecimal(infos.get(i + 1).getChange()).subtract(new BigDecimal(infos.get(i).getChange())); @@ -116,12 +116,12 @@ public class FundInfoQueryJob { return; } List futures = Lists.newArrayList(); - List fundInfoList = Lists.newCopyOnWriteArrayList(); + List fundInfoList = Lists.newCopyOnWriteArrayList(); fundMessageList.parallelStream().forEach(fundMessage -> { CompletableFuture future = CompletableFuture.runAsync(() -> { FundInfo fundInfo = fundService.queryFundInfo(fundMessage.getCode()); - com.xiang.xservice.xb.entity.pojo.xb.FundInfo info = com.xiang.xservice.xb.entity.pojo.xb.FundInfo.builder() + com.xiang.xservice.application.script.xb.entity.pojo.xb.FundInfo info = com.xiang.xservice.application.script.xb.entity.pojo.xb.FundInfo.builder() .code(fundMessage.getCode()) .name(fundInfo.getName()) .change(fundMessage.getChange().multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP).toString()) diff --git a/script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundMsgReportJob.java b/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundMsgReportJob.java similarity index 94% rename from script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundMsgReportJob.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundMsgReportJob.java index f28f36b..34dabc0 100644 --- a/script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundMsgReportJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundMsgReportJob.java @@ -1,10 +1,10 @@ -package com.xiang.xservice.xb.schedule.xb; +package com.xiang.xservice.application.script.xb.schedule.xb; import com.alibaba.fastjson.JSON; -import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; -import com.xiang.xservice.xb.entity.response.xbyj.fund.FundList; -import com.xiang.xservice.xb.service.DingTalkRobotService; -import com.xiang.xservice.xb.service.FundService; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundList; +import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundList; +import com.xiang.xservice.application.script.xb.service.DingTalkRobotService; +import com.xiang.xservice.application.script.xb.service.FundService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/xservice/xb/service/DingTalkRobotService.java b/script/src/main/java/com/xiang/xservice/application/script/xb/service/DingTalkRobotService.java similarity index 93% rename from script/src/main/java/com/xiang/xservice/xb/service/DingTalkRobotService.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/service/DingTalkRobotService.java index 69d41b4..3b2b024 100644 --- a/script/src/main/java/com/xiang/xservice/xb/service/DingTalkRobotService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/service/DingTalkRobotService.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.xb.service; +package com.xiang.xservice.application.script.xb.service; import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; import com.xiang.xservice.config.DingTalkRobotXbConfig; diff --git a/script/src/main/java/com/xiang/xservice/xb/service/FundService.java b/script/src/main/java/com/xiang/xservice/application/script/xb/service/FundService.java similarity index 65% rename from script/src/main/java/com/xiang/xservice/xb/service/FundService.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/service/FundService.java index afeee54..bb5ee34 100644 --- a/script/src/main/java/com/xiang/xservice/xb/service/FundService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/service/FundService.java @@ -1,9 +1,9 @@ -package com.xiang.xservice.xb.service; +package com.xiang.xservice.application.script.xb.service; -import com.xiang.xservice.xb.entity.pojo.xb.XbFundCount; -import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; -import com.xiang.xservice.xb.entity.response.xbyj.fund.FundInfo; -import com.xiang.xservice.xb.entity.response.xbyj.fund.FundList; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundCount; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundList; +import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundInfo; +import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundList; import java.util.List; diff --git a/script/src/main/java/com/xiang/xservice/xb/service/FundServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/xb/service/FundServiceImpl.java similarity index 84% rename from script/src/main/java/com/xiang/xservice/xb/service/FundServiceImpl.java rename to script/src/main/java/com/xiang/xservice/application/script/xb/service/FundServiceImpl.java index 2d5f1b3..bd4544d 100644 --- a/script/src/main/java/com/xiang/xservice/xb/service/FundServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/service/FundServiceImpl.java @@ -1,16 +1,16 @@ -package com.xiang.xservice.xb.service; +package com.xiang.xservice.application.script.xb.service; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Lists; import com.xiang.xservice.basic.utils.HttpUtils; -import com.xiang.xservice.xb.common.URLConstants; -import com.xiang.xservice.xb.entity.pojo.xb.XbFundCount; -import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; -import com.xiang.xservice.xb.entity.response.xbyj.fund.FundInfo; -import com.xiang.xservice.xb.entity.response.xbyj.fund.FundList; -import com.xiang.xservice.xb.entity.response.xbyj.fund.QueryFundInfoResponse; -import com.xiang.xservice.xb.entity.response.xbyj.fund.QueryFundListResponse; -import com.xiang.xservice.xb.repository.XBFundMapper; +import com.xiang.xservice.application.script.xb.common.URLConstants; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundCount; +import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundList; +import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundInfo; +import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundList; +import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.QueryFundInfoResponse; +import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.QueryFundListResponse; +import com.xiang.xservice.application.script.xb.repository.XBFundMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/req/PrivilegeCode.java b/script/src/main/java/com/xiang/xservice/fwd/entity/req/PrivilegeCode.java deleted file mode 100644 index 074a2c0..0000000 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/req/PrivilegeCode.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.xiang.xservice.fwd.entity.req; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.checkerframework.checker.units.qual.N; - -@Data -@AllArgsConstructor -public class PrivilegeCode { - -} diff --git a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/StandByNotice.java b/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/StandByNotice.java deleted file mode 100644 index 46a7e34..0000000 --- a/script/src/main/java/com/xiang/xservice/fwd/entity/resp/http/perform/StandByNotice.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.xiang.xservice.fwd.entity.resp.http.perform; - -public class StandByNotice { -} diff --git a/script/src/main/java/com/xiang/xservice/stock/gnshyx/enums/GnshyxUrlEnum.java b/script/src/main/java/com/xiang/xservice/stock/gnshyx/enums/GnshyxUrlEnum.java deleted file mode 100644 index d50a013..0000000 --- a/script/src/main/java/com/xiang/xservice/stock/gnshyx/enums/GnshyxUrlEnum.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.xiang.xservice.stock.gnshyx.enums; - -public enum GnshyxUrlEnum { - - -} diff --git a/script/src/main/resources/mapper/fwd/FwdAudienceConfigMapper.xml b/script/src/main/resources/mapper/fwd/FwdAudienceConfigMapper.xml index 3215229..677fd5a 100644 --- a/script/src/main/resources/mapper/fwd/FwdAudienceConfigMapper.xml +++ b/script/src/main/resources/mapper/fwd/FwdAudienceConfigMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/script/src/main/resources/mapper/fwd/FwdPerformConfigMapper.xml b/script/src/main/resources/mapper/fwd/FwdPerformConfigMapper.xml index dd55130..afb5649 100644 --- a/script/src/main/resources/mapper/fwd/FwdPerformConfigMapper.xml +++ b/script/src/main/resources/mapper/fwd/FwdPerformConfigMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/script/src/main/resources/mapper/fwd/FwdPerformProjectInfoMapper.xml b/script/src/main/resources/mapper/fwd/FwdPerformProjectInfoMapper.xml index 3bbbb70..0070982 100644 --- a/script/src/main/resources/mapper/fwd/FwdPerformProjectInfoMapper.xml +++ b/script/src/main/resources/mapper/fwd/FwdPerformProjectInfoMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -48,7 +48,7 @@ pre_sale_time - + INSERT INTO fwd_perform_project_info @@ -170,7 +170,7 @@ - + UPDATE fwd_perform_project_info project_name = #{projectName}, diff --git a/script/src/main/resources/mapper/fwd/FwdPerformProjectSeatInfoMapper.xml b/script/src/main/resources/mapper/fwd/FwdPerformProjectSeatInfoMapper.xml index 4d14ee9..fa2d1c2 100644 --- a/script/src/main/resources/mapper/fwd/FwdPerformProjectSeatInfoMapper.xml +++ b/script/src/main/resources/mapper/fwd/FwdPerformProjectSeatInfoMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -58,7 +58,7 @@ sold_out - + INSERT INTO fwd_perform_seat_info @@ -234,7 +234,7 @@ - + UPDATE fwd_perform_seat_info seat_plan_id = #{seatPlanId}, diff --git a/script/src/main/resources/mapper/fwd/FwdUserConfigMapper.xml b/script/src/main/resources/mapper/fwd/FwdUserConfigMapper.xml index 3c3913d..a384233 100644 --- a/script/src/main/resources/mapper/fwd/FwdUserConfigMapper.xml +++ b/script/src/main/resources/mapper/fwd/FwdUserConfigMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -13,7 +13,7 @@ id, name, token, status - + insert into fwd_user_config (name, token, status) values (#{name}, #{token}, #{status}); diff --git a/script/src/main/resources/mapper/glados/GladosMapper.xml b/script/src/main/resources/mapper/glados/GladosMapper.xml index 966c242..199c07b 100644 --- a/script/src/main/resources/mapper/glados/GladosMapper.xml +++ b/script/src/main/resources/mapper/glados/GladosMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -18,7 +18,7 @@ status - + insert into scirpt_glados_run(time, status, response, user, user_id, code) values (#{time}, #{status}, #{response}, #{user}, #{userId}, #{code}) diff --git a/script/src/main/resources/mapper/stock/StockGnshyxRecordDataMapper.xml b/script/src/main/resources/mapper/stock/StockGnshyxRecordDataMapper.xml index f1d63b8..5d231c2 100644 --- a/script/src/main/resources/mapper/stock/StockGnshyxRecordDataMapper.xml +++ b/script/src/main/resources/mapper/stock/StockGnshyxRecordDataMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -35,7 +35,7 @@ create_time - + INSERT INTO stock_gnshyx_record_data @@ -160,7 +160,7 @@ from stock_gnshyx_record_data where stock_code = #{stockCode} - + UPDATE stock_gnshyx_record_data symbol_name = #{symbolName}, diff --git a/script/src/main/resources/mapper/stock/StockSinaDataRecordPullMapper.xml b/script/src/main/resources/mapper/stock/StockSinaDataRecordPullMapper.xml index 11d8c71..629cf60 100644 --- a/script/src/main/resources/mapper/stock/StockSinaDataRecordPullMapper.xml +++ b/script/src/main/resources/mapper/stock/StockSinaDataRecordPullMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -29,7 +29,7 @@ update_time - + INSERT INTO stock_sina_record_data @@ -105,7 +105,7 @@ WHERE id = #{id} - + UPDATE stock_sina_record_data name = #{name}, diff --git a/script/src/main/resources/mapper/xb/XBFundMapper.xml b/script/src/main/resources/mapper/xb/XBFundMapper.xml index 6102915..c3f2ed0 100644 --- a/script/src/main/resources/mapper/xb/XBFundMapper.xml +++ b/script/src/main/resources/mapper/xb/XBFundMapper.xml @@ -3,14 +3,14 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + @@ -50,7 +50,7 @@ and type = #{type} - select * from xb_fund_count where update_time between NOW() - INTERVAL 7 DAY and NOW()