diff --git a/demo/src/main/java/com/example/demo/order/controller/compController.java b/demo/src/main/java/com/example/demo/order/controller/compController.java index 7d069b5..7619c77 100644 --- a/demo/src/main/java/com/example/demo/order/controller/compController.java +++ b/demo/src/main/java/com/example/demo/order/controller/compController.java @@ -13,13 +13,12 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.util.List; -//@Controller -@RestController +@Controller public class compController { @Autowired com.example.demo.Dao.auditMapper auditMapper; - @RequestMapping(value="/finished",method = RequestMethod.POST)//已经完成的订单浏览的界面 + @RequestMapping("/finished")//已经完成的订单浏览的界面 public List doPost(HttpServletResponse response, HttpServletRequest request){ HttpSession session=request.getSession(); User user=new User(); diff --git a/demo/src/main/java/com/example/demo/order/controller/orderController.java b/demo/src/main/java/com/example/demo/order/controller/orderController.java index c310c7f..bfa7529 100644 --- a/demo/src/main/java/com/example/demo/order/controller/orderController.java +++ b/demo/src/main/java/com/example/demo/order/controller/orderController.java @@ -1,40 +1,40 @@ -//package com.example.demo.order.controller; -// -//import com.alibaba.fastjson.JSONObject; -//import com.example.demo.bean.Audit; -//import com.example.demo.bean.User; -//import com.example.demo.order.service.impl.orderServiceImpl; -//import com.example.demo.order.service.orderService; -//import org.springframework.beans.factory.annotation.Autowired; -//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; -//import javax.servlet.http.HttpServletRequest; -//import javax.servlet.http.HttpServletResponse; -//import javax.servlet.http.HttpSession; -//import java.io.IOException; -//import java.util.ArrayList; -//import java.util.List; -//@RestController -//public class orderController{ -// @Autowired -// private orderServiceImpl orderService; -// -// @RequestMapping(value = "/orderlist",method = RequestMethod.POST) -// public List orderList(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { -// response.setContentType("text/html;charset=utf-8"); -// HttpSession session = request.getSession(); -// User user = new User(); -// user = (User) session.getAttribute("user"); -// long userNum = user.getUserNum(); -// List list = orderService.selectAuditByUserNum(userNum); -//// String json = JSONObject.toJSONString(list); -//// System.out.println(json); -//// response.getWriter().print(json); -// return list; -// } -//} +package com.example.demo.order.controller; + +import com.alibaba.fastjson.JSONObject; +import com.example.demo.bean.Audit; +import com.example.demo.bean.User; +import com.example.demo.order.service.impl.orderServiceImpl; +import com.example.demo.order.service.orderService; +import org.springframework.beans.factory.annotation.Autowired; +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; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +@RestController +public class orderController{ + @Autowired + private orderServiceImpl orderService; + + @RequestMapping(value = "/orderlist",method = RequestMethod.POST) + public List orderList(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html;charset=utf-8"); + HttpSession session = request.getSession(); + User user = new User(); + user = (User) session.getAttribute("user"); + long userNum = user.getUserNum(); + List list = orderService.selectAuditByUserNum(userNum); +// String json = JSONObject.toJSONString(list); +// System.out.println(json); +// response.getWriter().print(json); + return list; + } +} diff --git a/demo/src/main/java/com/example/demo/order/controller/showController.java b/demo/src/main/java/com/example/demo/order/controller/showController.java index 66126ff..3ecef10 100644 --- a/demo/src/main/java/com/example/demo/order/controller/showController.java +++ b/demo/src/main/java/com/example/demo/order/controller/showController.java @@ -19,13 +19,12 @@ import java.util.List; 打印出所有的订单 */ -//@Controller -@RestController +@Controller public class showController extends HttpServlet { @Autowired com.example.demo.Dao.auditMapper auditMapper; - @RequestMapping(value="/order",method = RequestMethod.POST)//订单浏览的界面 + @RequestMapping("/order")//订单浏览的界面 public List doPost(HttpServletResponse response, HttpServletRequest request){ HttpSession session=request.getSession(); User user=new User(); diff --git a/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java b/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java index 8385d12..e9cb0e0 100644 --- a/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java +++ b/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java @@ -4,12 +4,13 @@ import com.example.demo.Dao.auditMapper; import com.example.demo.bean.Audit; import com.example.demo.order.service.orderService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.List; - +@Service public class orderServiceImpl implements orderService { @Autowired - public auditMapper auditMapper; + auditMapper auditMapper; @Override public List selectAuditByUserNum(long userNum){ return auditMapper.selectAuditByUserNum(userNum); diff --git a/demo/src/main/resources/static/index.html b/demo/src/main/resources/static/index.html index 2a40618..4267df0 100644 --- a/demo/src/main/resources/static/index.html +++ b/demo/src/main/resources/static/index.html @@ -8,42 +8,70 @@ +