Merge remote-tracking branch 'origin/develop' into develop

src/main/java/cn/stock/market/domain/basic/repository/BtodayStockRepository.java

@@ -5,7 +5,9 @@ import cn.qutaojing.common.domain.respostory.SimplePoConvertEntityRepository;
 import cn.qutaojing.common.utils.SpringUtils;
 import cn.stock.market.domain.basic.convert.BtodayStockConvert;
 import cn.stock.market.domain.basic.entity.BtodayStock;
+import cn.stock.market.domain.basic.entity.Stock;
 import cn.stock.market.infrastructure.db.po.BtodayStockPO;
+import cn.stock.market.infrastructure.db.po.QBtodayStockPO;
 import cn.stock.market.infrastructure.db.repo.BtodayStockRepo;
 import com.rp.spring.jpa.GenericJpaRepository;
 import java.lang.Integer;
@@ -30,6 +32,8 @@ public class BtodayStockRepository extends SimplePoConvertEntityRepository<Btoda
 
   final BtodayStockConvert convert;
 
+  final QBtodayStockPO q = QBtodayStockPO.btodayStockPO;
+
   @Override
   public GenericJpaRepository<BtodayStockPO, Integer> repo() {
     return repo;
@@ -43,4 +47,8 @@ public class BtodayStockRepository extends SimplePoConvertEntityRepository<Btoda
   public static BtodayStockRepository of() {
     return SpringUtils.getBean(BtodayStockRepository.class);
   }
+
+  public BtodayStock findBtStockByCoCode(String coCode,String stockType) {
+    return findOneIfMutil(q.coCode.eq(coCode),q.stockType.eq(stockType));
+  }
 }

src/main/java/cn/stock/market/domain/basic/service/BtodayStockService.java

@@ -1,6 +1,7 @@
 package cn.stock.market.domain.basic.service;
 
 import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.BtodayStock;
 import cn.stock.market.domain.basic.factory.BtodayStockFactory;
 import cn.stock.market.domain.basic.repository.BtodayStockRepository;
 import lombok.RequiredArgsConstructor;
@@ -30,4 +31,8 @@ public class BtodayStockService {
   public static BtodayStockService of() {
     return SpringUtils.getBean(BtodayStockService.class);
   }
+
+  public BtodayStock findBtStockByCoCode(String coCode,String stockType){
+    return repository.findBtStockByCoCode(coCode,stockType);
+  }
 }

src/main/java/cn/stock/market/web/BTodayStockController.java

@@ -1,13 +1,18 @@
 package cn.stock.market.web;
 
+import cn.stock.market.domain.basic.entity.BtodayStock;
+import cn.stock.market.domain.basic.service.BtodayStockService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import net.sf.json.JSONArray;
+//import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+//import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,6 +31,8 @@ public class BTodayStockController {
 
     @Autowired
     private RestTemplate restTemplate;
+    @Autowired
+    private BtodayStockService btodayStockService;
 
     @GetMapping("/api/bToday/kLine")
     @ApiOperation(value = "股票详情K线图",httpMethod = "GET")
@@ -139,12 +146,17 @@ public class BTodayStockController {
         if (StringUtils.isBlank(exchange) || StringUtils.isBlank(coCode) ) {
             return new com.alibaba.fastjson.JSONObject();
         }
+        BtodayStock btodayStock = btodayStockService.findBtStockByCoCode(coCode,exchange);
+        if(btodayStock == null){
+            return new com.alibaba.fastjson.JSONObject();
+        }
         // 构建请求URL
         String apiUrl = buildDetailApiUrl(exchange, coCode);
 
         String forObject = restTemplate.getForObject(apiUrl, String.class);
-
+        JSONObject jsonObject = JSON.parseObject(forObject);
-        return com.alibaba.fastjson.JSONObject.parseObject(forObject);
+        jsonObject.put("id",btodayStock.getId());
+        return jsonObject;
     }
 
     private String buildDetailApiUrl(String exchange, String coCode) {