diff --git a/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/impl/StockDailyTradeServiceImpl.java b/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/impl/StockDailyTradeServiceImpl.java index 04030bc..16bb076 100644 --- a/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/impl/StockDailyTradeServiceImpl.java +++ b/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/impl/StockDailyTradeServiceImpl.java @@ -97,16 +97,25 @@ public class StockDailyTradeServiceImpl implements IStockDailyTradeService @Override @Transactional - public int importStockDailyTrade(List stockDailyTradeList, Date tradeDate) + public int importStockDailyTrade(List stockDailyTradeList1, Date tradeDate) { - if (stockDailyTradeList == null || stockDailyTradeList.isEmpty()) + if (stockDailyTradeList1 == null || stockDailyTradeList1.isEmpty()) { return 0; } - + + List stockDailyTradeList = new ArrayList<>(); // 设置交易日期 - for (TStockDailyTrade stockDailyTrade : stockDailyTradeList) + for (TStockDailyTrade stockDailyTrade : stockDailyTradeList1) { + if(stockDailyTrade.getStockCode() == null || stockDailyTrade.getStockCode().trim().isEmpty()) + continue; + if(stockDailyTrade.getStockName() == null || stockDailyTrade.getStockName().trim().isEmpty()) + continue; + if(stockDailyTrade.getIndustryIndexName() == null || stockDailyTrade.getIndustryIndexName().trim().isEmpty()) + continue; + if(stockDailyTrade.getClosePrice() == null) + continue; if (stockDailyTrade.getTradeDate() == null) { stockDailyTrade.setTradeDate(tradeDate); @@ -120,6 +129,7 @@ public class StockDailyTradeServiceImpl implements IStockDailyTradeService { stockDailyTrade.setIsLimitDown(0); } + stockDailyTradeList.add(stockDailyTrade); } long startTime = System.currentTimeMillis(); @@ -203,7 +213,7 @@ public class StockDailyTradeServiceImpl implements IStockDailyTradeService { // 如果不存在,创建新的股票基础数据记录 // 只有当必要字段不为空时才插入 - if (stockDailyTrade.getStockCode() != null && stockDailyTrade.getStockName() != null) + if (stockDailyTrade.getStockCode() != null && !stockDailyTrade.getStockCode().trim().isEmpty() && stockDailyTrade.getStockName() != null && !stockDailyTrade.getStockName().trim().isEmpty()) { TStockBasic newBasic = new TStockBasic(); newBasic.setStockCode(stockDailyTrade.getStockCode()); @@ -215,7 +225,7 @@ public class StockDailyTradeServiceImpl implements IStockDailyTradeService } else { newBasic.setIndustryIndexCode(""); // 设置默认值 } - if (stockDailyTrade.getIndustryIndexName() != null) { + if (stockDailyTrade.getIndustryIndexName() != null && !stockDailyTrade.getIndustryIndexName().trim().isEmpty()) { newBasic.setIndustryIndexName(stockDailyTrade.getIndustryIndexName()); } else { newBasic.setIndustryIndexName("");