Merge remote-tracking branch 'origin/master'

# Conflicts:
#	demo/src/main/java/com/example/demo/DemoApplication.java

demo/src/main/java/com/example/demo/Dao/productHistroyMapper.java

@@ -2,6 +2,7 @@ package com.example.demo.Dao;
 
 
 import com.example.demo.bean.ProductHistroy;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
@@ -16,10 +17,10 @@ public interface productHistroyMapper {
     @Select("select * from producthistroy")
     public List<ProductHistroy> select();
 
-    @Insert("insert into productHistroy(productNum, productName, category, " +
+    @Insert("insert into producthistory(productNum, productName, category, " +
             "intrate, bankNum, productDescription, uploadTime, deleteTime, alterTime,managerNum)" +
             " values (#{productNum},#{productName},#{category},#{intrate},#{bankNum}," +
-            "#{productDescription},#{uploadTime},#{deleteTime},#{alterTime})")
+            "#{productDescription},#{upLoadTime},#{deleteTime},#{alterTime},#{managerNum})")
     public void addProductHistroy(ProductHistroy productHistroys);
 
 //    @Update("update producthistroy set productNum=#{productNum},productName=#{productName}" +

demo/src/main/java/com/example/demo/Dao/productMapper.java

@@ -39,5 +39,5 @@ public interface productMapper {
 
 
     @Delete("delete from product where productNum=#{productNum}")
-    public void deleteProduct(int productNum);
+    public void deleteProduct(long productNum);
 }

demo/src/main/java/com/example/demo/Dao/userBankIdMapper.java

@@ -0,0 +1,29 @@
+package com.example.demo.Dao;
+
+import com.example.demo.bean.UserBankIdentify;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
+
+@Mapper
+public interface userBankIdMapper {
+    @Select("select * from userBankIdentify where userNum = #{userNum}")
+    public UserBankIdentify selectUsageDateByCheckNum(long userNum);
+
+    @Select("select * from userBankIdentify")
+    public List<UserBankIdentify> select();
+
+    @Insert("insert into userBankIdentify(userNum, bankAccount,trueName," +
+            "idNum,telephoneNum, bankAccountIdentify)" +
+            " values (#{userNum},#{bankAccount},#{trueName}," +
+            "#{idNum},#{telephoneNum},#{bankAccountIdentify})")
+    public void addUserBankIdentify(UserBankIdentify userBankIdentifys);
+
+    @Update("update userBankIdentify set userNum=#{userNum                                                                                 },bankAccount=#{bankAccount}" +
+            ",trueName=#{trueName},idNum=#{idNum},telephoneNum=#{telephoneNum}," +
+            "bankAccountIdentify=#{bankAccountIdentify}")
+    public void updateUserBankIdentify(UserBankIdentify userBankIdentifys);
+
+    @Delete("delete from userBankIdentify where userNum=#{userNum}")
+    public void deleteUserBankIdentify(long userNum);
+}

demo/src/main/java/com/example/demo/Dao/userBankIdentify.java

@@ -1,27 +0,0 @@
-package com.example.demo.Dao;
-
-import com.example.demo.bean.UserBankIdentify;
-import org.apache.ibatis.annotations.*;
-
-import java.util.List;
-
-@Mapper
-public interface userBankIdentify {
-    @Select("select * from userbankidentify where userName = #{userName}")
-    public UserBankIdentify selectUsageDateByCheckNum(String userName);
-
-    @Select("select * from userBankIdentify")
-    public List<UserBankIdentify> select();
-
-    @Insert("insert into usagedate(userName, bankAccount,trueName,idNum,telephoneNum, bankAccountIdentify)" +
-            " values (#{userName},#{bankAccount},#{bankAccountIdentify})")
-    public void addUserBankIdentify(UserBankIdentify userBankIdentifys);
-
-    @Update("update usagedate set userName=#{userName},bankAccount=#{bankAccount}" +
-            ",trueName=#{trueName},idNum=#{idNum},telephoneNum=#{telephoneNum}," +
-            "bankAccountIdentify=#{bankAccountIdentify}")
-    public void updateUserBankIdentify(UserBankIdentify userBankIdentifys);
-
-    @Delete("delete from usagedate where userName=#{userName}")
-    public void deleteUserBankIdentify(String userName);
-}

demo/src/main/java/com/example/demo/bean/ProductHistroy.java

@@ -22,7 +22,7 @@ public class ProductHistroy {
     private String category;
     private float intrate;
     private String productDescription;
-    private String upLoadTime;
+    private String upLoadTime;  //数据库是小写的uploadTime
     private String deleteTime;
     private String alterTime;
 

demo/src/main/java/com/example/demo/bean/UserBankIdentify.java

@@ -14,7 +14,7 @@ import javax.persistence.Id;
 public class UserBankIdentify {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private String userName;
+    private long userNum;
     private String bankAccount;
     private short bankAccountIdentify;
     private String idNum;

demo/src/main/java/com/example/demo/loanService/controller/startController.java

@@ -0,0 +1,31 @@
+package com.example.demo.loanService.controller;
+
+
+import com.example.demo.Dao.userMapper;
+import com.example.demo.bean.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+public class startController {
+    @Autowired
+    private userMapper userMapper;
+    private User user=new User();
+
+    @RequestMapping("")//浏览商品之后点击申请贷款的按钮之后跳到的界面
+    public String doPost(HttpServletResponse response, HttpServletRequest request){
+        int num=1;//从登陆那里得到登陆者的序号
+        user=userMapper.selectUserByuserNum(num);
+        if(user.getIsIdentify()=="1"){
+            return "";//验证手机号的界面二号
+        }if(user.getIsIdentify()=="0"){
+            return "";//认证的界面
+        }else{
+            return "";//页面出错的界面
+        }
+    }
+}

demo/src/main/java/com/example/demo/productService/controller/addController.java

@@ -1,7 +1,7 @@
 package com.example.demo.productService.controller;
 
 import com.example.demo.bean.Product;
-import com.example.demo.productService.tools.addPro;
+import com.example.demo.productService.service.addPro;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,11 +20,11 @@ public class addController extends HttpServlet {
         Product product=new Product();
         PrintWriter writer=null;
         try{
-            product.setProductNum(Integer.parseInt(request.getParameter("productNum")));
+            product.setProductNum(Long.parseLong(request.getParameter("productNum")));
             product.setProductName(request.getParameter("productName"));
             product.setBankNum(Integer.parseInt(request.getParameter("bankNum")));
             product.setCategory(request.getParameter("productName"));
-            product.setIntrate(Integer.parseInt(request.getParameter("intrate")));
+            product.setIntrate(Float.parseFloat(request.getParameter("intrate")));
             product.setProductDescription(request.getParameter("description"));
             product.setPictureAddress(request.getParameter("address"));
             int result= addPro.add(product);
@@ -33,6 +33,9 @@ public class addController extends HttpServlet {
             if(result==1){
                 writer.write("增加成功");
                 return "/";//返回增加删除修改的总页面
+            }else if(result==-1){
+                writer.write("已存在该产品");
+                return "/";
             }
             writer.write("增加失败");
             return "/";//返回增加的页面

demo/src/main/java/com/example/demo/productService/controller/deleteController.java

@@ -2,31 +2,35 @@ package com.example.demo.productService.controller;
 
 
 import com.example.demo.bean.Product;
-import com.example.demo.productService.tools.deletePro;
+import com.example.demo.productService.service.deletePro;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
 
 @Controller
-public class deleteController {
+public class deleteController extends HttpServlet {
     @Autowired
-    private deletePro deletes;
+    deletePro deletes;
     @RequestMapping("/deleteproduct")
     public String doPost(HttpServletResponse response, HttpServletRequest request){
         PrintWriter writer=null;
-        Product product=new Product();
+        Product product = new Product();
         try{
-            int productNum=Integer.parseInt(request.getParameter("productNum"));
+            long productNum=Long.parseLong(request.getParameter("productNum"));
             int result= deletes.delete(productNum);
             response.setContentType("text/hmtl;charset=utf-8");
             writer=response.getWriter();
             if(result==1){
                 writer.write("删除成功");
                 return "/";//返回增加删除修改的总页面
+            }if(result==-1){
+                writer.write("无此业务");
+                return "/";
             }
             writer.write("删除失败");
             return "/";//返回删除的页面

demo/src/main/java/com/example/demo/productService/controller/updateController.java

@@ -1,29 +1,30 @@
 package com.example.demo.productService.controller;
 
 import com.example.demo.bean.Product;
-import com.example.demo.productService.tools.updatePro;
+import com.example.demo.productService.service.updatePro;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
 
 @Controller
-public class updateController {
-    @Autowired
-    private updatePro updatePro;
+public class updateController extends HttpServlet {
+   @Autowired
+    updatePro updatePro;
     @RequestMapping("/updateproduct")
     public String doPost(HttpServletResponse response, HttpServletRequest request){
         PrintWriter writer=null;
         Product product=new Product();
         try{
-            product.setProductNum(Integer.parseInt(request.getParameter("productNum")));
+            product.setProductNum(Long.parseLong(request.getParameter("productNum")));
             product.setProductName(request.getParameter("productName"));
             product.setBankNum(Integer.parseInt(request.getParameter("bankNum")));
             product.setCategory(request.getParameter("productName"));
-            product.setIntrate(Integer.parseInt(request.getParameter("intrate")));
+            product.setIntrate(Float.parseFloat(request.getParameter("intrate")));
             product.setProductDescription(request.getParameter("description"));
             product.setPictureAddress(request.getParameter("address"));
             int result= updatePro.update(product);
@@ -32,6 +33,9 @@ public class updateController {
             if(result==1){
                 writer.write("修改成功");
                 return "/";//返回增加删除修改的总页面
+            }else if(result==-1){
+                writer.write("此业务不存在 ");
+                return "/";
             }
             writer.write("修改失败");
             return "/";//返回修改的页面

demo/src/main/java/com/example/demo/productService/service/addPro.java

@@ -1,22 +1,23 @@
-package com.example.demo.productService.tools;
+package com.example.demo.productService.service;
 
 import com.example.demo.Dao.productHistroyMapper;
 import com.example.demo.Dao.productMapper;
 import com.example.demo.bean.Product;
 import com.example.demo.bean.ProductHistroy;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+@Service
 public class addPro {
-
       private nowTime nowTime=new nowTime();
       @Autowired
       private productMapper productMapper;
       @Autowired
       private productHistroyMapper proHisMapper;
-      @Autowired
-      private ProductHistroy productHistroy;
 
       public int add(Product product1){
+            ProductHistroy productHistroy = new ProductHistroy();
+            if(productMapper.selectProductByProductNum(product1.getProductNum())!=null)return -1;
             productMapper.addProduct(product1);
             productHistroy.setProductNum(product1.getProductNum());
             productHistroy.setProductName(product1.getProductName());
@@ -26,6 +27,7 @@ public class addPro {
             //productHistroy.setManagerNum(); manager.setManagerNum();调用登陆里面的一个接口得到managerNum
             productHistroy.setProductDescription(product1.getProductDescription());
             productHistroy.setUpLoadTime(nowTime.nowTime());
+            //System.out.println(productHistroy.getUpLoadTime()+productHistroy.getBankNum());
             proHisMapper.addProductHistroy(productHistroy);
             return 1;
       }

demo/src/main/java/com/example/demo/productService/service/deletePro.java

@@ -0,0 +1,37 @@
+package com.example.demo.productService.service;
+
+import com.example.demo.Dao.productHistroyMapper;
+import com.example.demo.Dao.productMapper;
+import com.example.demo.bean.Product;
+import com.example.demo.bean.ProductHistroy;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class deletePro {
+    private nowTime nowTime = new nowTime();
+    @Autowired
+    private productMapper productMapper;
+    @Autowired
+    private productHistroyMapper proHisMapper;
+
+
+    public int delete(long productNum){
+        ProductHistroy productHistroy = new ProductHistroy();
+        if(productMapper.selectProductByProductNum(productNum)==null)return -1;
+        Product product = productMapper.selectProductByProductNum(productNum);
+        if(product == null)return -1;
+        productHistroy.setProductNum(product.getProductNum());
+        productHistroy.setProductName(product.getProductName());
+        productHistroy.setBankNum(product.getBankNum());
+        productHistroy.setCategory(product.getCategory());
+        productHistroy.setIntrate(product.getIntrate());
+        productHistroy.setProductDescription(product.getProductDescription());
+
+        productMapper.deleteProduct(productNum);
+        //productHistroy.setManagerNum(); manager.setManagerNum();调用登陆里面的一个接口得到managerNum
+        productHistroy.setDeleteTime(nowTime.nowTime());
+        proHisMapper.addProductHistroy(productHistroy);
+        return 1;
+    }
+}

demo/src/main/java/com/example/demo/productService/service/nowTime.java

@@ -1,4 +1,4 @@
-package com.example.demo.productService.tools;
+package com.example.demo.productService.service;
 
 
 import java.text.SimpleDateFormat;

demo/src/main/java/com/example/demo/productService/service/updatePro.java

@@ -1,17 +1,23 @@
-package com.example.demo.productService.tools;
+package com.example.demo.productService.service;
 
 import com.example.demo.Dao.productHistroyMapper;
 import com.example.demo.Dao.productMapper;
 import com.example.demo.bean.Product;
 import com.example.demo.bean.ProductHistroy;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+@Service
 public class updatePro {
-    private com.example.demo.productService.tools.nowTime nowTime;
+    private nowTime nowTime=new nowTime();
+    @Autowired
     private productMapper productMapper;
+    @Autowired
     private productHistroyMapper proHisMapper;
-    private ProductHistroy productHistroy;
 
     public int update(Product product1){
+        ProductHistroy productHistroy = new ProductHistroy();
+        if(productMapper.selectProductByProductNum(product1.getProductNum())==null)return -1;
         productMapper.updateProduct(product1);
         productHistroy.setProductNum(product1.getProductNum());
         productHistroy.setProductName(product1.getProductName());

demo/src/main/java/com/example/demo/productService/tools/deletePro.java

@@ -1,20 +0,0 @@
-package com.example.demo.productService.tools;
-
-import com.example.demo.Dao.productHistroyMapper;
-import com.example.demo.bean.ProductHistroy;
-
-public class deletePro {
-    private com.example.demo.productService.tools.nowTime nowTime;
-    private com.example.demo.Dao.productMapper productMapper;
-    private productHistroyMapper proHisMapper;
-    private ProductHistroy productHistroy;
-
-    public int delete(int productNum){
-        productMapper.deleteProduct(productNum);
-        productHistroy.setProductNum(productNum);
-        //productHistroy.setManagerNum(); manager.setManagerNum();调用登陆里面的一个接口得到managerNum
-        productHistroy.setUpLoadTime(nowTime.nowTime());
-        proHisMapper.addProductHistroy(productHistroy);
-        return 1;
-    }
-}

demo/src/main/java/com/example/demo/register/controller/bankCardController.java

@@ -0,0 +1,36 @@
+package com.example.demo.register.controller;
+
+
+import com.example.demo.Dao.userBankIdMapper;
+import com.example.demo.bean.UserBankIdentify;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+public class bankCardController extends HttpServlet {
+
+    @Autowired
+    userBankIdMapper userBankIdMapper;
+
+    @RequestMapping("")//手机表单界面
+    public String doPost(HttpServletResponse response, HttpServletRequest request){
+        try{
+            long num=1;//获取得到userNum
+            UserBankIdentify userBankIdentify=new UserBankIdentify();
+            userBankIdentify.setBankAccount(request.getParameter("mobile"));
+            userBankIdentify.setTrueName(request.getParameter("realname"));
+            userBankIdentify.setIdNum(request.getParameter("idNum"));
+            userBankIdentify.setTelephoneNum(request.getParameter("phoneNum"));
+            userBankIdentify.setUserNum(num);
+            userBankIdMapper.addUserBankIdentify(userBankIdentify);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return "";//返回首页
+    }
+}

demo/src/main/java/com/example/demo/register/controller/phoRegController.java

@@ -0,0 +1,35 @@
+package com.example.demo.register.controller;
+
+import com.example.demo.register.phone;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+@Controller
+public class phoRegController {
+
+    phone phone=new phone();
+
+    @RequestMapping("")//第一个手机验证界面
+    public String doPost(HttpServletRequest request, HttpServletResponse response){
+        PrintWriter writer=null;
+        try{
+            int num=Integer.parseInt(request.getParameter("phoneNum"));
+            response.setContentType("text/hmtl;charset=utf-8");
+            writer=response.getWriter();
+            if(phone.phoneRegister(num)==1){
+                return "";//跳转到bankCardManager界面
+            }else{
+                writer.write("验证失败");
+                return "";//跳转到第一个手机验证界面
+            }
+        }catch (IOException e){
+            e.printStackTrace();
+        }
+        return "页面出错";
+    }
+}

demo/src/main/java/com/example/demo/register/controller/phoRegController2.java

@@ -0,0 +1,35 @@
+package com.example.demo.register.controller;
+
+import com.example.demo.register.phone;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+@Controller
+public class phoRegController2 {
+
+    phone phone=new phone();
+
+    @RequestMapping("")//第二个手机验证界面
+    public String doPost(HttpServletRequest request, HttpServletResponse response){
+        PrintWriter writer=null;
+        try{
+            int num=Integer.parseInt(request.getParameter("phoneNum"));
+            response.setContentType("text/hmtl;charset=utf-8");
+            writer=response.getWriter();
+            if(phone.phoneRegister(num)==1){
+                return "";//跳转到Loan界面
+            }else{
+                writer.write("验证失败");
+                return "";//跳转到第二个手机验证界面
+            }
+        }catch (IOException e){
+            e.printStackTrace();
+        }
+        return "页面出错";
+    }
+}

demo/src/main/java/com/example/demo/register/phone.java

@@ -0,0 +1,15 @@
+package com.example.demo.register;
+
+
+//有一个mob网站可以提供一些手机号验证
+public class phone {
+    public phone(){};
+
+    public int phoneRegister(int num){
+        if(num==1){
+            return 1;
+        }else{
+            return 0;
+        }
+    }
+}