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 @@ tomcat-embed-jasper provided + + org.springframework.boot + spring-boot-starter-web + RELEASE + compile + 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 selectByCount(); + public List selectByCount(); @Insert("insert into usagedate(checkNum, productNum, userNum," + " bankAccount, bankNum, year, amount, startTime)" + diff --git a/demo/src/main/java/com/example/demo/DemoApplication.java b/demo/src/main/java/com/example/demo/DemoApplication.java index 083ce0f..d95cf7a 100644 --- a/demo/src/main/java/com/example/demo/DemoApplication.java +++ b/demo/src/main/java/com/example/demo/DemoApplication.java @@ -3,14 +3,11 @@ package com.example.demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.context.annotation.ComponentScan; @SpringBootApplication -@ServletComponentScan() -//@ComponentScan() +@ServletComponentScan("com.example.demo") //@MapperScan("com.example.demo.Dao") -public class DemoApplication extends SpringBootServletInitializer { +public class DemoApplication { public static void main(String[] args) { SpringApplication.run(DemoApplication.class, args); } diff --git a/demo/src/main/java/com/example/demo/loginService/API/impl/UserService.java b/demo/src/main/java/com/example/demo/loginService/API/impl/UserService.java index c1aca6c..7cc7345 100644 --- a/demo/src/main/java/com/example/demo/loginService/API/impl/UserService.java +++ b/demo/src/main/java/com/example/demo/loginService/API/impl/UserService.java @@ -7,6 +7,6 @@ import org.springframework.stereotype.Service; public abstract class UserService { public User selectUserByuserName(String userName){return null;} public User selectUserBytelephoneNum(String telephoneNum){return null;} - public void insertUser(long userNum, String userName, String userPwd, String registerTime, String userRight){} + public void addUser(User users){} public long count(){return 0;} } diff --git a/demo/src/main/java/com/example/demo/loginService/API/impl/UserServiceImpl.java b/demo/src/main/java/com/example/demo/loginService/API/impl/UserServiceImpl.java index 0f22007..9c61346 100644 --- a/demo/src/main/java/com/example/demo/loginService/API/impl/UserServiceImpl.java +++ b/demo/src/main/java/com/example/demo/loginService/API/impl/UserServiceImpl.java @@ -21,7 +21,7 @@ public class UserServiceImpl extends UserService{ return this.UserMapper.selectUserBytelephoneNum(telephoneNum); } @Transactional(propagation=Propagation.REQUIRED,readOnly = false) - public void insertUser(User user){ + public void addUser(User user){ this.UserMapper.addUser(user); } @Transactional(propagation=Propagation.REQUIRED,readOnly = true) diff --git a/demo/src/main/java/com/example/demo/loginService/UserController.java b/demo/src/main/java/com/example/demo/loginService/UserController.java index 5c9aa30..63f5137 100644 --- a/demo/src/main/java/com/example/demo/loginService/UserController.java +++ b/demo/src/main/java/com/example/demo/loginService/UserController.java @@ -51,8 +51,7 @@ public class UserController extends HttpServlet { String userName = request.getParameter("userName"); String userPwd = request.getParameter("userPwd"); String userPwd1=request.getParameter("userPwd1"); - User user=new User(); - user = this.userServiceImpl.selectUserByuserName(userName); + User user = this.userServiceImpl.selectUserByuserName(userName); long count = 0; int result = 0; if(user!=null){ @@ -74,7 +73,7 @@ public class UserController extends HttpServlet { }else{ result = 3; } - if(result==1)response.sendRedirect("Register.html"); + if(result==1)response.sendRedirect("RegisterSuccess.html"); else if(result==2)response.sendRedirect("userExisted.html"); else response.sendRedirect("userPwdNotSame.html"); } 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 91fe23d..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 @@ -6,9 +6,10 @@ import com.example.demo.bean.Product; import com.example.demo.searchService.service.ProductSearchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -18,18 +19,20 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -@Controller -public class SearchServiceController extends HttpServlet { +//@Controller +@RestController +@RequestMapping("/search") +public class SearchServiceController{ @Autowired private ProductSearchService productSearchService; - @RequestMapping("/search") - public void doPost(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException { + @RequestMapping(value = "/show",method = RequestMethod.POST) + public List search(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException { response.setContentType("text/html;charset=utf-8"); List list = new ArrayList(); String productName = request.getParameter("productName"); String category = request.getParameter("category"); - float intrate = Integer.parseInt(request.getParameter("intrate")); + //float intrate = Float.parseFloat(request.getParameter("intrate")); if(productName!=null){ list = productSearchService.findByNameLike(productName); @@ -37,25 +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 showPro(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException{ List products = productSearchService.findByCount(); - System.out.println(products); - 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 findByCount(){ Product product = new Product(); List productList = new ArrayList(); - List listusage = usageDateMapper.selectByCount(); - int[] arr = listusage.stream().mapToInt(Integer::valueOf).toArray(); + List listusage = usageDateMapper.selectByCount(); + long [] arr = listusage.stream().mapToLong(t->t.longValue()).toArray(); for(int i=0;i - + \ No newline at end of file diff --git a/demo/src/main/resources/static/allOrders.html b/demo/src/main/resources/static/allOrders.html index d14d2a4..33e4629 100644 --- a/demo/src/main/resources/static/allOrders.html +++ b/demo/src/main/resources/static/allOrders.html @@ -10,7 +10,6 @@ - diff --git a/demo/src/main/resources/static/index.html b/demo/src/main/resources/static/index.html index ecacebb..b1eb56a 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){ diff --git a/demo/src/main/resources/static/js/productshow.js b/demo/src/main/resources/static/js/productshow.js index 491b244..bea9696 100644 --- a/demo/src/main/resources/static/js/productshow.js +++ b/demo/src/main/resources/static/js/productshow.js @@ -1,9 +1,11 @@ -window.onload(function requestData(){ +$(function(){ $.ajax({ url: "/search", type: "post", + data: {}, dataType: "json", success: function(data){ + console.log(data);//查看从后台传值内容 /*这个方法里是ajax发送请求成功之后执行的代码*/ showData(data);//我们仅做数据展示 }, @@ -19,7 +21,7 @@ function showData(data) { $("#content").html=null; for (var i = 0; i < data.length; i++) { var pro = data[i]; - var str = '
'+pro.productName+'

'+pro.productNum+'

'; + str = '
'+pro.productName+'

'+pro.productNum+'

'; $("#content").append(str); } diff --git a/demo/src/main/resources/static/search.html b/demo/src/main/resources/static/search.html index 245d7fb..eba380a 100644 --- a/demo/src/main/resources/static/search.html +++ b/demo/src/main/resources/static/search.html @@ -9,22 +9,25 @@ +
-

产品信息

-

内容简介

+

产品搜索

+
- + +
- - +
+ diff --git a/demo/src/main/resources/static/userPwdError.html b/demo/src/main/resources/static/userPwdError.html index d283643..f4d127c 100644 --- a/demo/src/main/resources/static/userPwdError.html +++ b/demo/src/main/resources/static/userPwdError.html @@ -3,7 +3,7 @@ Title - +