diff --git a/EastLineServer/src/main/java/me/bello/eastline/controller/StockController.java b/EastLineServer/src/main/java/me/bello/eastline/controller/StockController.java
index b9d5b04..4f878ad 100644
--- a/EastLineServer/src/main/java/me/bello/eastline/controller/StockController.java
+++ b/EastLineServer/src/main/java/me/bello/eastline/controller/StockController.java
@@ -6,6 +6,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -207,7 +208,7 @@
         }
 
         List<Map<String, Object>> dayList = stockService.queryDayLineFromCode(code);
-        List<Map<String, Object>> timeList = stockService.queryTimeLineFromCode(code);
+        List<Map<String, Object>> timeList = stockService.queryTimeLineFromCode(code, 83);
         List<Map<String, Object>> banKuaiList = stockService.queryBanKuaiFromCode(code);
 
 
@@ -224,5 +225,47 @@
 
     }
 
+    /**
+     * 按code查询一支票的日线和今日时分线
+     *
+     * @param req
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = {"/search"}, method = RequestMethod.POST)
+    public RspData search(HttpServletRequest req) throws Exception {
+        RspData rspData = new RspData();
+
+        String key = req.getParameter("key");
+        if (key == null || key.isEmpty()) {
+            rspData.setCode(RSP_FAIL);
+            rspData.setMsg("key is null.");
+            logger.error("key is null.");
+            return rspData;
+        }
+
+        logger.info("start...........");
+        List<Map<String, Object>> list = new ArrayList<>();
+
+        List<Map<String, Object>> keyList = stockService.searchStock(key);
+        if (!keyList.isEmpty()){
+            for (int i = 0; i < keyList.size(); i++) {
+                String code = keyList.get(i).get("code").toString();
+                List<Map<String, Object>> codeList = stockService.queryTimeLineFromCode(code, 1);
+                if (codeList!=null && codeList.size()>0){
+                    list.add(codeList.get(0));
+                }
+            }
+        }
+
+        rspData.setCode(RSP_OK);
+        rspData.setMsg("OK");
+        rspData.setData(list);
+
+
+        return rspData;
+
+    }
+
 
 }