xservice/xservice-script
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:集合非空校验，数据库update脚本修改

Browse Source
This commit is contained in:
Zhujx
2025-07-25 14:12:45 +08:00
parent 6eb2fe01f8
commit e6b0fa2ff8
3 changed files with 95 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
script/src/main/java/com/xiang/xservice/fwd/entity/pojo/FPerformProjectInfo.java
View File

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@@ -51,4 +52,6 @@ public class FPerformProjectInfo {
private LocalDate projectEndDate; private LocalDate projectEndDate;
private String subClassifyName; private String subClassifyName;
private LocalDateTime preSaleTime;
} }

152
script/src/main/java/com/xiang/xservice/fwd/schedule/PullDataFromFWDJob.java
View File

@@ -59,9 +59,9 @@ public class PullDataFromFWDJob {
new ThreadPoolExecutor.AbortPolicy()); new ThreadPoolExecutor.AbortPolicy());
/** /**
* 定时任务 每日2点爬取芬玩岛数据演出列表数据 * 定时任务 每日1点爬取芬玩岛数据演出列表数据
*/ */
@Scheduled(cron = "0 0 2 1/1 * ?") @Scheduled(cron = "0 0 1 1/1 * ?")
@PostMapping("/pullProjectsDataJob") @PostMapping("/pullProjectsDataJob")
public void pullProjectsDataJob() { public void pullProjectsDataJob() {
ProjectsResp showProjectsFromHttp = performServiceHttp.getShowProjectsFromHttp(); ProjectsResp showProjectsFromHttp = performServiceHttp.getShowProjectsFromHttp();
@@ -96,52 +96,58 @@ public class PullDataFromFWDJob {
projectInfo.setShortCity(project.getShortCity()); projectInfo.setShortCity(project.getShortCity());
projectInfo.setVenueName(project.getVenueName()); projectInfo.setVenueName(project.getVenueName());
projectInfo.setLowestPrice(project.getLowestPrice()); projectInfo.setLowestPrice(project.getLowestPrice());
if (StringUtils.isNotBlank(projectInfoFromHttp.getPreSaleTime())) {
projectInfo.setPreSaleTime(DateUtils.getDateTimeFromStr(projectInfoFromHttp.getPreSaleTime()));
}
performProjectInfoMapper.update(projectInfo); performProjectInfoMapper.update(projectInfo);
List<FPerformSeatInfo> fPerformSeatInfoInsertList = Lists.newArrayList(); List<FPerformSeatInfo> fPerformSeatInfoInsertList = Lists.newArrayList();
for (PerformInfo performInfo : performsByProjectIdFromHttp.getPerformInfos()) { if (CollectionUtils.isNotEmpty(performsByProjectIdFromHttp.getPerformInfos())) {
if (CollectionUtils.isNotEmpty(performInfo.getPerformInfo())) { for (PerformInfo performInfo : performsByProjectIdFromHttp.getPerformInfos()) {
for (PerformDetail performDetail : performInfo.getPerformInfo()) { if (CollectionUtils.isNotEmpty(performInfo.getPerformInfo())) {
if (CollectionUtils.isNotEmpty(performDetail.getSeatPlans())) { for (PerformDetail performDetail : performInfo.getPerformInfo()) {
for (SeatPlan seatPlan : performDetail.getSeatPlans()) { if (CollectionUtils.isNotEmpty(performDetail.getSeatPlans())) {
FPerformSeatInfo fPerformSeatInfo = new FPerformSeatInfo(); for (SeatPlan seatPlan : performDetail.getSeatPlans()) {
fPerformSeatInfo.setSeatPlanId(seatPlan.getSeatPlanId()); FPerformSeatInfo fPerformSeatInfo = new FPerformSeatInfo();
fPerformSeatInfo.setSeatPlanName(seatPlan.getSeatPlanName()); fPerformSeatInfo.setSeatPlanId(seatPlan.getSeatPlanId());
fPerformSeatInfo.setPerformId(seatPlan.getPerformId()); fPerformSeatInfo.setSeatPlanName(seatPlan.getSeatPlanName());
fPerformSeatInfo.setPerformName(seatPlan.getPerformName()); fPerformSeatInfo.setPerformId(seatPlan.getPerformId());
fPerformSeatInfo.setStopSale(seatPlan.getStopSale()); fPerformSeatInfo.setPerformName(seatPlan.getPerformName());
fPerformSeatInfo.setShelfStatus(seatPlan.getShelfStatus()); fPerformSeatInfo.setStopSale(seatPlan.getStopSale());
fPerformSeatInfo.setPrice(seatPlan.getPrice()); fPerformSeatInfo.setShelfStatus(seatPlan.getShelfStatus());
fPerformSeatInfo.setDiscountPrice(seatPlan.getDiscountPrice()); fPerformSeatInfo.setPrice(seatPlan.getPrice());
fPerformSeatInfo.setSubStatus(seatPlan.getSubStatus()); fPerformSeatInfo.setDiscountPrice(seatPlan.getDiscountPrice());
fPerformSeatInfo.setQuantity(seatPlan.getQuantity()); fPerformSeatInfo.setSubStatus(seatPlan.getSubStatus());
fPerformSeatInfo.setStatus(seatPlan.getStatus()); fPerformSeatInfo.setQuantity(seatPlan.getQuantity());
fPerformSeatInfo.setMaxSellStock(seatPlan.getMaxSellStock()); fPerformSeatInfo.setStatus(seatPlan.getStatus());
fPerformSeatInfo.setSoldStock(seatPlan.getSoldStock()); fPerformSeatInfo.setMaxSellStock(seatPlan.getMaxSellStock());
fPerformSeatInfo.setLeftStock(seatPlan.getLeftStock()); fPerformSeatInfo.setSoldStock(seatPlan.getSoldStock());
fPerformSeatInfo.setAbleSaleQuantity(seatPlan.getAbleSaleQuantity()); fPerformSeatInfo.setLeftStock(seatPlan.getLeftStock());
fPerformSeatInfo.setAshShow(seatPlan.getAshShow()); fPerformSeatInfo.setAbleSaleQuantity(seatPlan.getAbleSaleQuantity());
fPerformSeatInfo.setAshShowDesc(seatPlan.getAshShow()); fPerformSeatInfo.setAshShow(seatPlan.getAshShow());
fPerformSeatInfo.setSelectable(seatPlan.getSelectable()); fPerformSeatInfo.setAshShowDesc(seatPlan.getAshShow());
fPerformSeatInfo.setDisplay(seatPlan.getDisplay()); fPerformSeatInfo.setSelectable(seatPlan.getSelectable());
fPerformSeatInfo.setAvailableTicketQuantity(seatPlan.getAvailableTicketQuantity()); fPerformSeatInfo.setDisplay(seatPlan.getDisplay());
fPerformSeatInfo.setAvailableAllTicketQuantity(seatPlan.getAvailableAllTicketQuantity()); fPerformSeatInfo.setAvailableTicketQuantity(seatPlan.getAvailableTicketQuantity());
if (StringUtils.isNotBlank(seatPlan.getSaleTime())) { fPerformSeatInfo.setAvailableAllTicketQuantity(seatPlan.getAvailableAllTicketQuantity());
fPerformSeatInfo.setSaleTime(DateUtils.getTimeFromStr(seatPlan.getSaleTime())); if (StringUtils.isNotBlank(seatPlan.getSaleTime())) {
} fPerformSeatInfo.setSaleTime(DateUtils.getTimeFromStr(seatPlan.getSaleTime()));
fPerformSeatInfo.setProjectId(project.getProjectId()); }
FPerformSeatInfo seatInfo = performSeatInfoMapper.getPerformSeatInfoBySeatIdAndPerformIdAndProjectId(fPerformSeatInfo.getSeatPlanId(), fPerformSeatInfo.getPerformId(), project.getProjectId()); fPerformSeatInfo.setProjectId(project.getProjectId());
if (Objects.nonNull(seatInfo)) { FPerformSeatInfo seatInfo = performSeatInfoMapper.getPerformSeatInfoBySeatIdAndPerformIdAndProjectId(fPerformSeatInfo.getSeatPlanId(), fPerformSeatInfo.getPerformId(), project.getProjectId());
fPerformSeatInfo.setId(seatInfo.getId()); if (Objects.nonNull(seatInfo)) {
performSeatInfoMapper.update(fPerformSeatInfo); fPerformSeatInfo.setId(seatInfo.getId());
} else { performSeatInfoMapper.update(fPerformSeatInfo);
fPerformSeatInfoInsertList.add(fPerformSeatInfo); } else {
fPerformSeatInfoInsertList.add(fPerformSeatInfo);
}
} }
} }
}
}
} }
} }
} }
if (CollectionUtils.isNotEmpty(fPerformSeatInfoInsertList)) { if (CollectionUtils.isNotEmpty(fPerformSeatInfoInsertList)) {
performSeatInfoMapper.batchSave(fPerformSeatInfoInsertList); performSeatInfoMapper.batchSave(fPerformSeatInfoInsertList);
} }
@@ -167,45 +173,51 @@ public class PullDataFromFWDJob {
fPerformProjectInfo.setShortCity(project.getShortCity()); fPerformProjectInfo.setShortCity(project.getShortCity());
fPerformProjectInfo.setVenueName(project.getVenueName()); fPerformProjectInfo.setVenueName(project.getVenueName());
fPerformProjectInfo.setLowestPrice(project.getLowestPrice()); fPerformProjectInfo.setLowestPrice(project.getLowestPrice());
if (StringUtils.isNotBlank(projectInfoFromHttp.getPreSaleTime())) {
fPerformProjectInfo.setPreSaleTime(DateUtils.getDateTimeFromStr(projectInfoFromHttp.getPreSaleTime()));
}
performProjectInfoMapper.insert(fPerformProjectInfo); performProjectInfoMapper.insert(fPerformProjectInfo);
List<FPerformSeatInfo> fPerformSeatInfos = Lists.newArrayList(); List<FPerformSeatInfo> fPerformSeatInfos = Lists.newArrayList();
for (PerformInfo performInfo : performsByProjectIdFromHttp.getPerformInfos()) { if (CollectionUtils.isNotEmpty(performsByProjectIdFromHttp.getPerformInfos())) {
if (CollectionUtils.isNotEmpty(performInfo.getPerformInfo())) { for (PerformInfo performInfo : performsByProjectIdFromHttp.getPerformInfos()) {
for (PerformDetail performDetail : performInfo.getPerformInfo()) { if (CollectionUtils.isNotEmpty(performInfo.getPerformInfo())) {
if (CollectionUtils.isNotEmpty(performDetail.getSeatPlans())) { for (PerformDetail performDetail : performInfo.getPerformInfo()) {
for (SeatPlan seatPlan : performDetail.getSeatPlans()) { if (CollectionUtils.isNotEmpty(performDetail.getSeatPlans())) {
FPerformSeatInfo fPerformSeatInfo = new FPerformSeatInfo(); for (SeatPlan seatPlan : performDetail.getSeatPlans()) {
fPerformSeatInfo.setSeatPlanId(seatPlan.getSeatPlanId()); FPerformSeatInfo fPerformSeatInfo = new FPerformSeatInfo();
fPerformSeatInfo.setSeatPlanName(seatPlan.getSeatPlanName()); fPerformSeatInfo.setSeatPlanId(seatPlan.getSeatPlanId());
fPerformSeatInfo.setPerformId(seatPlan.getPerformId()); fPerformSeatInfo.setSeatPlanName(seatPlan.getSeatPlanName());
fPerformSeatInfo.setPerformName(seatPlan.getPerformName()); fPerformSeatInfo.setPerformId(seatPlan.getPerformId());
fPerformSeatInfo.setStopSale(seatPlan.getStopSale()); fPerformSeatInfo.setPerformName(seatPlan.getPerformName());
fPerformSeatInfo.setShelfStatus(seatPlan.getShelfStatus()); fPerformSeatInfo.setStopSale(seatPlan.getStopSale());
fPerformSeatInfo.setPrice(seatPlan.getPrice()); fPerformSeatInfo.setShelfStatus(seatPlan.getShelfStatus());
fPerformSeatInfo.setDiscountPrice(seatPlan.getDiscountPrice()); fPerformSeatInfo.setPrice(seatPlan.getPrice());
fPerformSeatInfo.setSubStatus(seatPlan.getSubStatus()); fPerformSeatInfo.setDiscountPrice(seatPlan.getDiscountPrice());
fPerformSeatInfo.setQuantity(seatPlan.getQuantity()); fPerformSeatInfo.setSubStatus(seatPlan.getSubStatus());
fPerformSeatInfo.setStatus(seatPlan.getStatus()); fPerformSeatInfo.setQuantity(seatPlan.getQuantity());
fPerformSeatInfo.setMaxSellStock(seatPlan.getMaxSellStock()); fPerformSeatInfo.setStatus(seatPlan.getStatus());
fPerformSeatInfo.setSoldStock(seatPlan.getSoldStock()); fPerformSeatInfo.setMaxSellStock(seatPlan.getMaxSellStock());
fPerformSeatInfo.setLeftStock(seatPlan.getLeftStock()); fPerformSeatInfo.setSoldStock(seatPlan.getSoldStock());
fPerformSeatInfo.setAbleSaleQuantity(seatPlan.getAbleSaleQuantity()); fPerformSeatInfo.setLeftStock(seatPlan.getLeftStock());
fPerformSeatInfo.setAshShow(seatPlan.getAshShow()); fPerformSeatInfo.setAbleSaleQuantity(seatPlan.getAbleSaleQuantity());
fPerformSeatInfo.setAshShowDesc(seatPlan.getAshShow()); fPerformSeatInfo.setAshShow(seatPlan.getAshShow());
fPerformSeatInfo.setSelectable(seatPlan.getSelectable()); fPerformSeatInfo.setAshShowDesc(seatPlan.getAshShow());
fPerformSeatInfo.setDisplay(seatPlan.getDisplay()); fPerformSeatInfo.setSelectable(seatPlan.getSelectable());
fPerformSeatInfo.setAvailableTicketQuantity(seatPlan.getAvailableTicketQuantity()); fPerformSeatInfo.setDisplay(seatPlan.getDisplay());
fPerformSeatInfo.setAvailableAllTicketQuantity(seatPlan.getAvailableAllTicketQuantity()); fPerformSeatInfo.setAvailableTicketQuantity(seatPlan.getAvailableTicketQuantity());
if (StringUtils.isNotBlank(seatPlan.getSaleTime())) { fPerformSeatInfo.setAvailableAllTicketQuantity(seatPlan.getAvailableAllTicketQuantity());
fPerformSeatInfo.setSaleTime(DateUtils.getTimeFromStr(seatPlan.getSaleTime())); if (StringUtils.isNotBlank(seatPlan.getSaleTime())) {
fPerformSeatInfo.setSaleTime(DateUtils.getTimeFromStr(seatPlan.getSaleTime()));
}
fPerformSeatInfo.setProjectId(project.getProjectId());
} }
fPerformSeatInfo.setProjectId(project.getProjectId());
} }
} }
} }
} }
} }
if (CollectionUtils.isNotEmpty(fPerformSeatInfos)) { if (CollectionUtils.isNotEmpty(fPerformSeatInfos)) {
performSeatInfoMapper.batchSave(fPerformSeatInfos); performSeatInfoMapper.batchSave(fPerformSeatInfos);
} }

13
script/src/main/resources/mapper/fwd/FwdPerformProjectInfoMapper.xml
View File

@@ -101,7 +101,10 @@
project_end_date, project_end_date,
</if> </if>
<if test="null != subClassifyName and '' != subClassifyName"> <if test="null != subClassifyName and '' != subClassifyName">
sub_classify_name sub_classify_name,
</if>
<if test="null != preSaleTime">
pre_sale_time
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -157,7 +160,10 @@
#{projectEndDate}, #{projectEndDate},
</if> </if>
<if test="null != subClassifyName and '' != subClassifyName"> <if test="null != subClassifyName and '' != subClassifyName">
#{subClassifyName} #{subClassifyName},
</if>
<if test="null != preSaleTime">
#{preSaleTime}
</if> </if>
</trim> </trim>
</insert> </insert>
@@ -182,7 +188,8 @@
<if test="null != projectPrice ">project_price = #{projectPrice},</if> <if test="null != projectPrice ">project_price = #{projectPrice},</if>
<if test="null != projectStartDate ">project_start_date = #{projectStartDate},</if> <if test="null != projectStartDate ">project_start_date = #{projectStartDate},</if>
<if test="null != projectEndDate ">project_end_date = #{projectEndDate},</if> <if test="null != projectEndDate ">project_end_date = #{projectEndDate},</if>
<if test="null != subClassifyName and '' != subClassifyName">sub_classify_name = #{subClassifyName}</if> <if test="null != subClassifyName and '' != subClassifyName">sub_classify_name = #{subClassifyName},</if>
<if test="null != preSaleTime">pre_sale_time = #{preSaleTime}</if>
</set> </set>
WHERE id = #{id} WHERE id = #{id}
</update> </update>