Ver Fonte

初始化

z há 4 anos atrás
pai
commit
591a39389f

+ 3 - 4
src/main/java/com/zx/dataservice/service/impl/ChoiceBondServiceImpl.java

@@ -5,7 +5,6 @@ import com.zx.dataservice.mapper2.StockMapper;
 import com.zx.dataservice.mapper3.ChoiceBondMapper;
 import com.zx.dataservice.pojo.StockRestPojo;
 import com.zx.dataservice.service.ChoiceBondService;
-import com.zx.dataservice.utils.DateTimeUtil;
 import com.zx.dataservice.utils.FileBondUtil;
 import com.zx.dataservice.utils.HttpRequest;
 import com.zx.dataservice.utils.TimeUtil;
@@ -44,7 +43,7 @@ public class ChoiceBondServiceImpl implements ChoiceBondService {
         }
         List<StockRestPojo> stockRestPojoList = new ArrayList<>();
         for (File file : files) {
-            log.info("债券==当前操作文件名==" + file.getName());
+//            log.info("债券==当前操作文件名==" + file.getName());
             // 2.移动文件去另外一个文件夹
             FileBondUtil.moveFile(sourceFileUrl + File.separator + file.getName(), goalFileUrl);
             // 3.读取文件内容
@@ -179,7 +178,7 @@ public class ChoiceBondServiceImpl implements ChoiceBondService {
     }
 
     private void insertList(List<StockRestPojo> list) {
-        log.info("=====入库==债券==开始,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
+//        log.info("=====入库==债券==开始,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
         int insertLength = list.size();
         int i = 0;
         int insertSize = 500;
@@ -207,6 +206,6 @@ public class ChoiceBondServiceImpl implements ChoiceBondService {
             });
 //            thread.start();
         }
-        log.info("=====入库==债券==结束,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
+//        log.info("=====入库==债券==结束,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
     }
 }

+ 3 - 4
src/main/java/com/zx/dataservice/service/impl/ChoiceStockServiceImpl.java

@@ -5,7 +5,6 @@ import com.zx.dataservice.mapper1.ChoiceStockMapper;
 import com.zx.dataservice.mapper2.StockMapper;
 import com.zx.dataservice.pojo.StockRestPojo;
 import com.zx.dataservice.service.ChoiceStockService;
-import com.zx.dataservice.utils.DateTimeUtil;
 import com.zx.dataservice.utils.FileStockUtil;
 import com.zx.dataservice.utils.HttpRequest;
 import com.zx.dataservice.utils.TimeUtil;
@@ -49,7 +48,7 @@ public class ChoiceStockServiceImpl implements ChoiceStockService {
         }
         List<StockRestPojo> stockRestPojoList = new ArrayList<>();
         for (File file : files){
-            log.info("股票==当前操作文件名==" + file.getName());
+//            log.info("股票==当前操作文件名==" + file.getName());
             // 2.移动文件去另外一个文件夹
             FileStockUtil.moveFile(sourceFileUrl + File.separator + file.getName(), goalFileUrl);
             // 3.读取文件内容
@@ -183,7 +182,7 @@ public class ChoiceStockServiceImpl implements ChoiceStockService {
     }
 
     private void insertList(List<StockRestPojo> list) {
-        log.info("=====入库===股票==开始,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
+//        log.info("=====入库===股票==开始,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
         int insertLength = list.size();
         int i = 0;
         int insertSize = 500;
@@ -211,6 +210,6 @@ public class ChoiceStockServiceImpl implements ChoiceStockService {
             });
 //            thread.start();
         }
-        log.info("=====入库==股票==结束,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
+//        log.info("=====入库==股票==结束,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
     }
 }

+ 20 - 4
src/main/java/com/zx/dataservice/service/impl/CreatorServiceImpl.java

@@ -187,15 +187,31 @@ public class CreatorServiceImpl implements CreatorService {
             }else{
                 stockRestPojo.setNow(String.valueOf(random(historyPojo, initNow, now)));
             }
+            //设置最高
+            if(Double.valueOf(stockRestPojo.getNow())  > Double.valueOf(entry.getHigh())){
+                stockRestPojo.setHigh(stockRestPojo.getNow());
+            }else{
+                stockRestPojo.setHigh(entry.getHigh());
+            }
+
+            //设置最低
+            if(Double.valueOf(stockRestPojo.getNow())  < Double.valueOf(entry.getLow())){
+                stockRestPojo.setLow(stockRestPojo.getNow());
+            }else{
+                stockRestPojo.setLow(entry.getLow());
+            }
+            stockRestPojo.setOpen(entry.getOpen());
+            /*System.out.println("最高:"+stockRestPojo.getHigh());
+            System.out.println("最低:"+stockRestPojo.getLow());*/
         }
-        stockRestPojo.setHigh(stockRestPojo.getNow());
-        stockRestPojo.setLow(stockRestPojo.getNow());
-        stockRestPojo.setOpen(stockRestPojo.getNow());
+        stockRestPojo.setHigh(stockRestPojo.getHigh());
+        stockRestPojo.setLow(stockRestPojo.getLow());
+        stockRestPojo.setOpen(stockRestPojo.getOpen());
         stockRestPojo.setPreclose(initNow);
         stockRestPojo.setRoundlot(String.valueOf(new BigDecimal(entry.getRoundlot()).add(random(historyPojo, initNow, now))));
         stockRestPojo.setChange(String.valueOf(new BigDecimal(stockRestPojo.getNow()).subtract(new BigDecimal(initNow))));
         stockRestPojo.setPctchange(String.valueOf((new BigDecimal(stockRestPojo.getNow()).subtract(new BigDecimal(initNow))).divide(new BigDecimal(initNow),2 ,4)));
-        stockRestPojo.setVolume(String.valueOf(new BigDecimal(randomInt())));
+        stockRestPojo.setVolume(String.valueOf(new BigDecimal(entry.getVolume()).add(new BigDecimal(randomInt()))));
         stockRestPojo.setAmount(String.valueOf(new BigDecimal(entry.getNow()).multiply(new BigDecimal(stockRestPojo.getVolume()))));
         stockRestPojo.setVolumeratio("");
         stockRestPojo.setCommissionratio("");

+ 2 - 5
src/main/java/com/zx/dataservice/task/AnalysisBondRestDataTask.java

@@ -1,7 +1,6 @@
 package com.zx.dataservice.task;
 
 import com.zx.dataservice.service.ChoiceBondService;
-import com.zx.dataservice.utils.DateTimeUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,8 +8,6 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
-
 /**
  * 解析东方财富实时数据
  */
@@ -25,9 +22,9 @@ public class AnalysisBondRestDataTask {
     @Async("executorBond")
     @Scheduled(fixedRate=10)
     public void toAnalysisRestData() {
-        log.info("=====定时任务===解析东方财富数据==债券==开始,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
+//        log.info("=====定时任务===解析东方财富数据==债券==开始,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
         doTask();
-        log.info("=====定时任务===解析东方财富数据==债券==结束,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
+//        log.info("=====定时任务===解析东方财富数据==债券==结束,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
     }
 
     public void doTask() {

+ 2 - 5
src/main/java/com/zx/dataservice/task/AnalysisStockRestDataTask.java

@@ -1,7 +1,6 @@
 package com.zx.dataservice.task;
 
 import com.zx.dataservice.service.ChoiceStockService;
-import com.zx.dataservice.utils.DateTimeUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,8 +8,6 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
-
 /**
  * 解析东方财富实时数据
  */
@@ -25,9 +22,9 @@ public class AnalysisStockRestDataTask {
     @Async("executorStock")
     @Scheduled(fixedRate=10)
     public void toAnalysisRestData() {
-        log.info("=====定时任务===解析东方财富数据==股票==开始,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
+//        log.info("=====定时任务===解析东方财富数据==股票==开始,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
         doTask();
-        log.info("=====定时任务===解析东方财富数据==股票==结束,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
+//        log.info("=====定时任务===解析东方财富数据==股票==结束,当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
     }
 
     public void doTask() {

+ 1 - 1
src/main/java/com/zx/dataservice/utils/FileBondUtil.java

@@ -140,7 +140,7 @@ public class FileBondUtil {
                 }
             }
         }
-//        deleteFile(fileName);
+        deleteFile(fileName);
         return sbf.toString();
     }