HandsomeAq/AI-accounting-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: HandsomeAq:master
Branches Tags
HandsomeAq:master
HandsomeAq:dev-nzy
..
compare: HandsomeAq:dev-nzy
Branches Tags
HandsomeAq:master
HandsomeAq:dev-nzy

No commits in common. "master" and "dev-nzy" have entirely different histories.
master ... dev-nzy

3 changed files with 10 additions and 75 deletions
Show Stats Expand all files Collapse all files

26
src/main/java/com/accounting/config/SchedulerConfig.java
View File

@ -1,34 +1,10 @@
package com.accounting.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.lang.NonNull;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
@Configuration
@EnableScheduling
public class SchedulerConfig implements SchedulingConfigurer {
/**
* 配置定时任务为单线程执行，避免并发问题
*/
@Override
public void configureTasks(@NonNull ScheduledTaskRegistrar taskRegistrar) {
taskRegistrar.setScheduler(taskExecutor());
}
@Bean(destroyMethod = "shutdown")
public Executor taskExecutor() {
return Executors.newSingleThreadScheduledExecutor(r -> {
Thread thread = new Thread(r, "gold-price-scheduler");
thread.setDaemon(true);
return thread;
});
}
public class SchedulerConfig {
}

9
src/main/java/com/accounting/mapper/GoldPriceMapper.java
View File

@ -20,13 +20,4 @@ public interface GoldPriceMapper extends BaseMapper<GoldPrice> {
@Select("SELECT MAX(price_date) FROM gold_price WHERE gold_id = #{goldId}")
LocalDate selectLatestDate(@Param("goldId") String goldId);
/**
* 检查指定时间点是否已存在数据（用于防重复插入）
* @param goldId 黄金品种ID
* @param updateTime 更新时间
* @return 存在的记录数
*/
@Select("SELECT COUNT(*) FROM gold_price WHERE gold_id = #{goldId} AND update_time = #{updateTime}")
int countByGoldIdAndUpdateTime(@Param("goldId") String goldId, @Param("updateTime") java.time.LocalDateTime updateTime);
}

50
src/main/java/com/accounting/service/impl/GoldPriceServiceImpl.java
View File

@ -18,6 +18,7 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
@Slf4j
@ -50,8 +51,6 @@ public class GoldPriceServiceImpl implements GoldPriceService {
@Override
@Transactional
public void refreshCurrentPrice(String goldId) {
log.info("Starting refreshCurrentPrice for goldId={}", goldId);
K780Response response = k780ApiClient.fetchGoldPrice(goldId);
if (!"1".equals(response.getSuccess()) || response.getResult() == null) {
@ -59,39 +58,14 @@ public class GoldPriceServiceImpl implements GoldPriceService {
}
K780Result result = response.getResult();
// 记录API返回的所有数据，用于调试
if (result.getDtList() != null) {
log.info("API returned {} gold price records", result.getDtList().size());
result.getDtList().forEach((id, data) -> {
log.info("Gold price data - goldId: {}, uptime: {}, lastPrice: {}",
id, data.getUptime(), data.getLastPrice());
});
}
K780Result.GoldPriceData goldPriceData = extractGoldPriceData(result, goldId);
log.info("Extracted gold price data - goldId: {}, uptime: {}, lastPrice: {}",
goldPriceData.getGoldId(), goldPriceData.getUptime(), goldPriceData.getLastPrice());
GoldPrice goldPrice = convertToEntity(goldPriceData);
log.info("Converted to entity - goldId: {}, updateTime: {}, priceDate: {}",
goldPrice.getGoldId(), goldPrice.getUpdateTime(), goldPrice.getPriceDate());
// 防重复插入：检查是否已存在相同时间点的数据
int existingCount = goldPriceMapper.countByGoldIdAndUpdateTime(goldId, goldPrice.getUpdateTime());
if (existingCount > 0) {
log.warn("Gold price data already exists for goldId={}, updateTime={}, skipping insert",
goldId, goldPrice.getUpdateTime());
return;
}
// 插入新记录 每15分钟查询一次结果并存储
goldPrice.setCreateTime(LocalDateTime.now());
goldPriceMapper.insert(goldPrice);
log.info("Successfully inserted gold price - id: {}, goldId: {}, priceDate: {}, updateTime: {}, createTime: {}",
goldPrice.getId(), goldPrice.getGoldId(), goldPrice.getPriceDate(),
goldPrice.getUpdateTime(), goldPrice.getCreateTime());
log.info("Refreshed gold price for goldId={}, priceDate={}", goldPrice.getGoldId(), goldPrice.getPriceDate());
}
@Override
@ -163,22 +137,16 @@ public class GoldPriceServiceImpl implements GoldPriceService {
// 解析更新时间
if (data.getUptime() != null && !data.getUptime().isEmpty()) {
try {
LocalDateTime parsedTime = LocalDateTime.parse(data.getUptime(), DATE_TIME_FORMATTER);
entity.setUpdateTime(parsedTime);
entity.setPriceDate(parsedTime.toLocalDate());
log.debug("Successfully parsed update time: {} -> {}", data.getUptime(), parsedTime);
entity.setUpdateTime(LocalDateTime.parse(data.getUptime(), DATE_TIME_FORMATTER));
entity.setPriceDate(entity.getUpdateTime().toLocalDate());
} catch (Exception e) {
log.warn("Failed to parse update time: {}, error: {}, using current time instead",
data.getUptime(), e.getMessage());
LocalDateTime now = LocalDateTime.now();
entity.setUpdateTime(now);
entity.setPriceDate(now.toLocalDate());
log.warn("Failed to parse update time: {}", data.getUptime());
entity.setUpdateTime(LocalDateTime.now());
entity.setPriceDate(LocalDate.now());
}
} else {
log.warn("Uptime is null or empty, using current time");
LocalDateTime now = LocalDateTime.now();
entity.setUpdateTime(now);
entity.setPriceDate(now.toLocalDate());
entity.setUpdateTime(LocalDateTime.now());
entity.setPriceDate(LocalDate.now());
}
return entity;