From ea83224f58d60aebf4b6a7a9533bcc14e5d41b91 Mon Sep 17 00:00:00 2001
From: istars <drwangmingxing@163.com>
Date: Mon, 14 Jan 2019 17:40:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9controller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo/pom.xml                                  |  6 +++++
 .../com/example/demo/Dao/usageDateMapper.java |  2 +-
 .../controller/SearchServiceController.java   | 22 +++++++++----------
 .../impl/ProductSearchServiceImpl.java        |  4 ++--
 demo/src/main/resources/static/index.html     |  4 ++--
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/demo/pom.xml b/demo/pom.xml
index 3bc2f42..b65b330 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -103,6 +103,12 @@
             <artifactId>tomcat-embed-jasper</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/demo/src/main/java/com/example/demo/Dao/usageDateMapper.java b/demo/src/main/java/com/example/demo/Dao/usageDateMapper.java
index 7bc503e..1b8b02c 100644
--- a/demo/src/main/java/com/example/demo/Dao/usageDateMapper.java
+++ b/demo/src/main/java/com/example/demo/Dao/usageDateMapper.java
@@ -16,7 +16,7 @@ public interface usageDateMapper {
 
 
     @Select("select productNum from usageDate group by productNum order by count(productNum) DESC")
-    public List<Integer> selectByCount();
+    public List<Long> selectByCount();
 
     @Insert("insert into usagedate(checkNum, productNum, userNum," +
             " bankAccount, bankNum, year, amount, startTime)" +
diff --git a/demo/src/main/java/com/example/demo/searchService/controller/SearchServiceController.java b/demo/src/main/java/com/example/demo/searchService/controller/SearchServiceController.java
index f8ba075..4d9fdef 100644
--- a/demo/src/main/java/com/example/demo/searchService/controller/SearchServiceController.java
+++ b/demo/src/main/java/com/example/demo/searchService/controller/SearchServiceController.java
@@ -22,7 +22,7 @@ import java.util.List;
 //@Controller
 @RestController
 @RequestMapping("/search")
-public class SearchServiceController extends HttpServlet {
+public class SearchServiceController{
     @Autowired
     private ProductSearchService productSearchService;
 
@@ -32,7 +32,7 @@ public class SearchServiceController extends HttpServlet {
         List<Product> list = new ArrayList<Product>();
         String productName = request.getParameter("productName");
         String category = request.getParameter("category");
-        float intrate = Float.parseFloat(request.getParameter("intrate"));
+        //float intrate = Float.parseFloat(request.getParameter("intrate"));
         if(productName!=null){
             list = productSearchService.findByNameLike(productName);
 
@@ -40,24 +40,22 @@ public class SearchServiceController extends HttpServlet {
         }else if(category!=null){
             list = productSearchService.findByCategory(category);
             //按产品类别搜索
-        }else if(intrate!=0){
-            list = productSearchService.findByIntrate(intrate);
-            //按利率排序由低到高
+//        }else if(intrate!=0){
+//            list = productSearchService.findByIntrate(intrate);
+//            //按利率排序由低到高
         }else{
             list = productSearchService.findByCount();
             //默认按产品使用的产品的数量由高到低排序
         }
-//        String json = JSONObject.toJSONString(list);
-//        response.getWriter().print(json);
         return list;
     }
 
-    @PostMapping("/showIndex")
-    public void showPro(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException{
+    @RequestMapping(value = "/showIndex",method = RequestMethod.POST)
+    public List<Product> showPro(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException{
         List<Product> products = productSearchService.findByCount();
-        String json = JSONObject.toJSONString(products);
-        System.out.println(json);
         response.setCharacterEncoding("utf-8");
-        response.getWriter().print(json);
+        return products;
+        //String json = JSONObject.toJSONString(list);
+        // response.getWriter().print(json);
     }
 }
diff --git a/demo/src/main/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java b/demo/src/main/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java
index 054c52f..ce1d895 100644
--- a/demo/src/main/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java
+++ b/demo/src/main/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java
@@ -36,8 +36,8 @@ public class ProductSearchServiceImpl implements ProductSearchService {
     public List<Product> findByCount(){
         Product product = new Product();
         List<Product> productList = new ArrayList<Product>();
-        List<Integer> listusage = usageDateMapper.selectByCount();
-        int[] arr = listusage.stream().mapToInt(Integer::valueOf).toArray();
+        List<Long> listusage = usageDateMapper.selectByCount();
+        long [] arr = listusage.stream().mapToLong(t->t.longValue()).toArray();
         for(int i=0;i<arr.length;i++){
             product = productMapper.selectProductByProductNum(arr[i]);
             productList.add(product);
diff --git a/demo/src/main/resources/static/index.html b/demo/src/main/resources/static/index.html
index d88e6d1..6d3ba2c 100644
--- a/demo/src/main/resources/static/index.html
+++ b/demo/src/main/resources/static/index.html
@@ -178,9 +178,9 @@
                 setInterval('AutoScroll("#aui-show")', 3000)
             });
 
-            window.onload(function requestData(){
+            $(function () {
                 $.ajax({
-                    url: "/showIndex",
+                    url: "/search/showIndex",
                     type: "post",
                     dataType: "json",
                     success: function(data){