diff --git a/demo/src/main/java/com/example/demo/DemoApplication.java b/demo/src/main/java/com/example/demo/DemoApplication.java index d95cf7a..676325a 100644 --- a/demo/src/main/java/com/example/demo/DemoApplication.java +++ b/demo/src/main/java/com/example/demo/DemoApplication.java @@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; @SpringBootApplication -@ServletComponentScan("com.example.demo") +//@ServletComponentScan("com.example.demo") //@MapperScan("com.example.demo.Dao") public class DemoApplication { public static void main(String[] args) { diff --git a/demo/src/main/java/com/example/demo/circulator/controller/SumCirController.java b/demo/src/main/java/com/example/demo/circulator/controller/SumCirController.java index eaedb5c..6da3f4a 100644 --- a/demo/src/main/java/com/example/demo/circulator/controller/SumCirController.java +++ b/demo/src/main/java/com/example/demo/circulator/controller/SumCirController.java @@ -1,16 +1,22 @@ package com.example.demo.circulator.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.example.demo.circulator.service.CirService; import com.example.demo.circulator.service.EPAIR_CirService; import com.example.demo.circulator.service.EPR_CirService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.configurationprocessor.json.JSONArray; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; @Controller public class SumCirController { @@ -57,11 +63,35 @@ public class SumCirController { @GetMapping("/sum") - public String SumCir(HttpServletRequest request, HttpServletResponse response){ - double amount = Double.parseDouble(request.getParameter("amount")); - float intrate = Float.parseFloat(request.getParameter("intrate")); - int year = Integer.parseInt(request.getParameter("year")); - int equation = Integer.parseInt(request.getParameter("equation")); + //@ResponseBody + public void SumCir(HttpServletRequest request, HttpServletResponse response)throws IOException{ + double amount =0; + float intrate = 0; + int year = 0; + int equation = 0; + Map map = new HashMap(); + try{ + amount = Double.parseDouble(request.getParameter("amount")); + intrate = Float.parseFloat(request.getParameter("intrate")); + year = Integer.parseInt(request.getParameter("year")); + equation = Integer.parseInt(request.getParameter("equation")); + }catch (Exception e){ + map.put("value",0); + String json = JSONObject.toJSONString(map); + //System.out.println(json); + response.getWriter().print(json); + return; + }finally { + + } + + if(amount<0||intrate<0||year<0||equation<0){ + map.put("value",-1); + String json = JSONObject.toJSONString(map); + //System.out.println(json); + response.getWriter().print(json); + return; + } double sum_principal_and_intrate = 0; switch (equation){ @@ -81,10 +111,18 @@ public class SumCirController { if(sum_principal_and_intrate>=0) { request.setAttribute("sum", sum_principal_and_intrate); }else{ - return "计算失败!"; + map.put("value",-2); + String json = JSONObject.toJSONString(map); + //System.out.println(json); + response.getWriter().print(json); + return; } - System.out.println(sum_principal_and_intrate); - return "/circulator"; + //System.out.println(sum_principal_and_intrate); + map.put("value",sum_principal_and_intrate); + String json = JSONObject.toJSONString(map); + //System.out.println(json); + response.getWriter().print(json); + return; } } 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 f8ce61c..84a7d27 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 @@ -16,7 +16,7 @@ public class compController { @Autowired com.example.demo.Dao.auditMapper auditMapper; - @RequestMapping("")//已经完成的订单浏览的界面 + @RequestMapping("/comp")//已经完成的订单浏览的界面 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 e3a0844..b6072a8 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 @@ -3,8 +3,10 @@ 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 javax.servlet.ServletException; @@ -18,10 +20,10 @@ import java.util.List; public class orderController extends HttpServlet { @Autowired - private orderService orderService; + private orderServiceImpl orderService; - @RequestMapping("/orderlist") - public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + @PostMapping("/orderlist") + public void orderList(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/html;charset=utf-8"); HttpSession session = request.getSession(); User user = new User(); 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 4fbba15..6215855 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 @@ -22,7 +22,7 @@ public class showController extends HttpServlet { @Autowired com.example.demo.Dao.auditMapper auditMapper; - @RequestMapping("")//订单浏览的界面 + @RequestMapping("/show")//订单浏览的界面 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/register/controller/pwdController.java b/demo/src/main/java/com/example/demo/register/controller/pwdController.java index 18f984b..7845023 100644 --- a/demo/src/main/java/com/example/demo/register/controller/pwdController.java +++ b/demo/src/main/java/com/example/demo/register/controller/pwdController.java @@ -16,7 +16,7 @@ public class pwdController extends HttpServlet { @Autowired userMapper userMapper; - @RequestMapping("/")//再一次确认密码界面 + @RequestMapping("/pwd")//再一次确认密码界面 public String doPost(HttpServletResponse response, HttpServletRequest request){ HttpSession session=request.getSession(); User user=new User(); 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 0c5aec3..cfe904f 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 @@ -26,7 +26,7 @@ public class SearchServiceController{ @Autowired private ProductSearchService productSearchService; - @RequestMapping(value = "/show",method = RequestMethod.POST) + @RequestMapping(value = "/search/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(); diff --git a/demo/src/main/resources/static/countCenter.html b/demo/src/main/resources/static/countCenter.html index 0722098..9c43c63 100644 --- a/demo/src/main/resources/static/countCenter.html +++ b/demo/src/main/resources/static/countCenter.html @@ -8,9 +8,48 @@ - + + @@ -28,6 +67,7 @@ +
    @@ -42,7 +82,7 @@

    贷款金额

- +
@@ -51,8 +91,8 @@

贷款期限

- - 日 + + 年
@@ -60,11 +100,11 @@

贷款利率

- + + + +
@@ -72,148 +112,26 @@

还款方式

-
- - +
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- +
+ +
+
+
- diff --git a/demo/src/main/resources/static/css/countCenter.css b/demo/src/main/resources/static/css/countCenter.css index 82ddb9e..cd60bd8 100644 --- a/demo/src/main/resources/static/css/countCenter.css +++ b/demo/src/main/resources/static/css/countCenter.css @@ -432,3 +432,16 @@ a { border-radius: 5px; border: none; } + +.tab-input input { + width: 92%; + margin: 0 auto; + display: block; + background: #fa623d; + color: #fff; + height: 3rem; + line-height: 3rem; + box-shadow: 0 3px 9px #d0d0d0; + border-radius: 5px; + border: none; +} \ No newline at end of file diff --git a/demo/src/main/resources/static/index.html b/demo/src/main/resources/static/index.html index 6bb1d4e..2a40618 100644 --- a/demo/src/main/resources/static/index.html +++ b/demo/src/main/resources/static/index.html @@ -13,7 +13,7 @@ - + + + @@ -39,78 +87,78 @@
-
- -
-
订单1
-
-
-

1111

- -
-
-
- -
-
-
- - -
-
订单2
-
-
-

2222

-
-
-
- -
-
-
- - -
-
订单3
-
-
-

3333

-
-
-
- -
-
-
- - -
-
订单4
-
-
-

4444

-
-
-
- -
-
-
- - -
-
订单5
-
-
-

55555

-
-
-
- -
-
-
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +