Merge remote-tracking branch 'origin/master'

.idea/encodings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$/demo" charset="UTF-8" />
   </component>
 </project>

.idea/misc.xml

@@ -7,7 +7,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

demo/pom.xml

@@ -15,6 +15,8 @@
     <description>Demo project for Spring Boot</description>
 
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
     </properties>
 
@@ -29,27 +31,78 @@
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>1.3.2</version>
         </dependency>
+
+
         <dependency>
+            <!-- Spring Boot JPA -->
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
+
+        <!-- tomcat的支持.-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.2</version>
+        </dependency>
+
+
+        <!-- mysql -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.13</version>
+        </dependency>
+
+        <!-- mybatis -->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional> <!-- 这个需要为 true 热部署才有效 -->
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <!-- servlet依赖. -->
+        <!-- <dependency>
+             <groupId>javax.servlet</groupId>
+             <artifactId>javax.servlet-api</artifactId>
+             <scope>provided</scope>
+         </dependency>-->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

demo/src/test/java/com/example/demo/Dao/auditMapper.java

@@ -1,6 +1,6 @@
 package com.example.demo.Dao;
 
-import com.example.demo.bean.audio;
+import com.example.demo.bean.Audit;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
@@ -11,25 +11,25 @@ import java.util.List;
 
 @Mapper
 public interface auditMapper {
-    @Select("select * from audio where checkNum = #{checkNum}")
-    public audio selectAudioByCheckNum(String checkNum);
+    @Select("select * from audit where checkNum = #{checkNum}")
+    public Audit selectAudioByCheckNum(String checkNum);
 
-    @Select("select * from audio")
-    public List<audio> select();
+    @Select("select * from audit")
+    public List<Audit> select();
 
-    @Insert("insert into audio(checkNum, userNum, productNum, " +
+    @Insert("insert into audit(checkNum, userNum, productNum, " +
             "bankAccount, checkState, contractNum, " +
             "isSignContract, year, amount, applyTime)" +
             " values (#{checkNum},#{userNum},#{productNum},#{bankAccount},#{checkState}," +
             "#{contractNum},#{isSignContract},#{year},#{amount},#{applyTime})")
-    public void addAudio(audio Audios);
+    public void addAudit(Audit audits);
 
-    @Update("update audio set checkNum=#{checkNum},userNum=#{userNum}" +
+    @Update("update audit set checkNum=#{checkNum},userNum=#{userNum}" +
             ",productNum=#{productNum},checkState=#{checkState},contractNum=#{contractNum}," +
             "isSignContract=#{isSignContract},year=#{year},amount=#{amount}," +
             "applyTime=#{applyTime}where checkNum=#{checkNum}")
-    public void updateAudio(audio Audios);
+    public void updateAudit(Audit audits);
 
-    @Delete("delete from audio where checkNum=#{checkNum}")
-    public void deleteAudio(String checkNum);
+    @Delete("delete from audit where checkNum=#{checkNum}")
+    public void deleteAudit(String checkNum);
 }

demo/src/test/java/com/example/demo/Dao/bankMapper.java

@@ -1,31 +1,29 @@
 package com.example.demo.Dao;
 
-import com.example.demo.bean.bank;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import com.example.demo.bean.Bank;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
+@Mapper
 public interface bankMapper {
 
     @Select("select * from bank where bankNum = #{bankNum}")
-    public bank selectBankByBankNum(String bankNum);
+    public Bank selectBankByBankNum(String bankNum);
 
     @Select("select * from bank where bankName = #{bankName}")
-    public bank selectBankByBankName(String bankName);
+    public Bank selectBankByBankName(String bankName);
 
     @Select("select * from bank")
-    public List<bank> select();
+    public List<Bank> select();
 
     @Insert("insert into bank(bankNum, bankName, contact, " +
             " values (#{bankNum},#{bankName},#{contact},)")
-    public void addBank(bank banks);
+    public void addBank(Bank banks);
 
     @Update("update bank set bankNum=#{bankNum},bankName=#{bankName}" +
             ",contact=#{contact} where bankNum=#{bankNum}")
-    public void updateBank(bank banks);
+    public void updateBank(Bank banks);
 
 //    @Delete("delete from bank where bankNum=#{bankNum}")
 //    public void deleteBank(String bankNum);

demo/src/test/java/com/example/demo/Dao/managerMapper.java

@@ -1,6 +1,6 @@
 package com.example.demo.Dao;
 
-import com.example.demo.bean.manager;
+import com.example.demo.bean.Manager;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
@@ -8,16 +8,16 @@ import java.util.List;
 @Mapper
 public interface managerMapper {
     @Select("select * from manager where managerNum = #{managerName}")
-    public manager selectManagerByManagerName(String managerName);
+    public Manager selectManagerByManagerName(String managerName);
 
     @Insert("insert into manager(managerNum, managerName, managerPwd, " +
             "managerRight, telephoneNum) values (#{managerNum},#{managerName}," +
             "#{managerPwd},#{managerRight},#{telephoneNum})")
-    public void addManager(manager managers);
+    public void addManager(Manager managers);
 
     @Update("update manager set managerNum=#{managerNum},managerName=#{managerName}" +
             ",managerPwd=#{managerPwd},managerRight=#{managerRight},telephoneNum=#{telephoneNum},")
-    public void updateManager(manager managers);
+    public void updateManager(Manager managers);
 
 //    @Delete("delete from manager where managerNum=#{managerNum}")
 //    public void deleteManager(String managerNum);

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

@@ -1,6 +1,6 @@
 package com.example.demo.Dao;
 
-import com.example.demo.bean.product;
+import com.example.demo.bean.Product;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
@@ -8,24 +8,27 @@ import java.util.List;
 @Mapper
 public interface productMapper {
     @Select("select * from product where productNum = #{productNum}")
-    public product selectProductByProductNum(String productNum);
+    public Product selectProductByProductNum(String productNum);
+
+    @Select("select intrate from product where productNum = #{productNum}")
+    public Product selectProductIntrateByProductNum(String productNum);
 
     @Select("select * from product where productName = #{productName}")
-    public product selectProductByProductName(String productName);
+    public Product selectProductByProductName(String productName);
 
     @Select("select * from product")
-    public List<product> select();
+    public List<Product> select();
 
     @Insert("insert into product(productNum, productName, category, intrate, " +
             "bankNum, productDescription, pictureAddress)" +
             " values (#{productNum},#{productName},#{category},#{intrate},#{bankNum}," +
             "#{productDescription},#{pictureAddress})")
-    public void addProduct(product products);
+    public void addProduct(Product products);
 
     @Update("update product set productNum=#{productNum},productName=#{productName}" +
             ",category=#{category},intrate=#{intrate},bankNum=#{bankNum}," +
             "productDescription=#{productDescription},pictureAddress=#{pictureAddress}")
-    public void updateAudio(product products);
+    public void updateAudio(Product products);
 
     @Delete("delete from product where productNum=#{productNum}")
     public void deleteAudio(String productNum);

demo/src/test/java/com/example/demo/Dao/transationMapping.java

@@ -0,0 +1,8 @@
+package com.example.demo.Dao;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface transationMapping {
+
+}

demo/src/test/java/com/example/demo/Dao/usageDateMapping.java

@@ -0,0 +1,7 @@
+package com.example.demo.Dao;
+
+import org.apache.ibatis.annotations.Mapper;
+@Mapper
+public interface usageDateMapping {
+
+}

demo/src/test/java/com/example/demo/Dao/userMapper.java

@@ -1,6 +1,6 @@
 package com.example.demo.Dao;
 
-import com.example.demo.bean.user;
+import com.example.demo.bean.User;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
@@ -8,22 +8,22 @@ import java.util.List;
 @Mapper
 public interface userMapper {
     @Select("select * from user where userNum = #{userNum}")
-    public user selectUserByuserNum(String userNum);
+    public User selectUserByuserNum(String userNum);
 
     @Select("select * from user")
-    public List<user> select();
+    public List<User> select();
 
     @Insert("insert into user(userNum, userName, userPwd, userRight," +
             " tureName, idNum, telephoneNum, address, isIdentify, registerTime)" +
             " values (#{userNum},#{userName},#{userPwd},#{userRight},#{tureName}," +
             "#{idNum},#{telephoneNum},#{address},#{isIdentify},#{registerTime})")
-    public void addUser(user users);
+    public void addUser(User users);
 
     @Update("update user set userNum=#{userNum},userName=#{userName}" +
             ",userPwd=#{userPwd},userRight=#{userRight},tureName=#{tureName}," +
             "idNum=#{idNum},telephoneNum=#{telephoneNum},address=#{address}," +
             "isIdentify=#{isIdentify},registerTime=#{registerTime}where userNum=#{userNum}")
-    public void updateUser(user users);
+    public void updateUser(User users);
 
     @Delete("delete from user where userNum=#{userNum}")
     public void deleteUser(String userNum);

demo/src/test/java/com/example/demo/bean/Audit.java

@@ -5,7 +5,7 @@ import javax.persistence.*;
 
 
 @Entity
-public class audio {
+public class Audit {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private String checkNum;
@@ -19,7 +19,7 @@ public class audio {
     private  String productNum;
     private  int year;
 
-    public audio(){};
+    public Audit(){};
 
     public int getYear() {
         return year;

demo/src/test/java/com/example/demo/bean/Bank.java

@@ -4,12 +4,12 @@ package com.example.demo.bean;
 import javax.persistence.*;
 
 @Entity
-public class bank {
+public class Bank {
     private String bankNum;
     private String bankName;
     private String contact;//联系方式
 
-    public bank(){};
+    public Bank(){};
 
     public String getBankNum() {
         return bankNum;

demo/src/test/java/com/example/demo/bean/Manager.java

@@ -6,7 +6,7 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
 @Entity
-public class manager {
+public class Manager {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private String managerNum;
@@ -15,7 +15,7 @@ public class manager {
     private String managerRight;
     private String telephoneNum;
 
-    public manager(){};
+    public Manager(){};
 
     public String getTelephoneNum() {
         return telephoneNum;

demo/src/test/java/com/example/demo/bean/Product.java

@@ -6,7 +6,7 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
 @Entity
-public class product {
+public class Product {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private String productNum;
@@ -17,7 +17,7 @@ public class product {
     private String productDescription;
     private String pictureAddress;
 
-    public product(){};
+    public Product(){};
 
     public String getPictureAddress() {
         return pictureAddress;

demo/src/test/java/com/example/demo/bean/Transaction.java

@@ -6,7 +6,7 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
 @Entity
-public class transaction {
+public class Transaction {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private String transaction;
@@ -16,7 +16,7 @@ public class transaction {
     private float transactionAmount;
     private String note;
 
-    public transaction(){};
+    public Transaction(){};
 
     public String getNote() {
         return note;

demo/src/test/java/com/example/demo/bean/UsageDate.java

@@ -0,0 +1,18 @@
+package com.example.demo.bean;
+
+import lombok.Getter;
+
+import javax.persistence.Entity;
+
+@Getter
+@Entity
+public class UsageDate {
+    private String checkNum;
+    private String productNum;
+    private String userNum;
+    private String bankAccount;
+    private String bankNum;
+    private int year;
+    private float amount;
+    private String startTime;
+}

demo/src/test/java/com/example/demo/bean/User.java

@@ -6,7 +6,7 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
 @Entity
-public class user {
+public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private String userNum;
@@ -20,7 +20,7 @@ public class user {
     private int isIdentify;
     private String registerTime;
 
-    public user(){};
+    public User(){};
 
     public String getRegisterTime() {
         return registerTime;

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

@@ -0,0 +1,13 @@
+package com.example.demo.bean;
+
+import lombok.Getter;
+
+import javax.persistence.Entity;
+
+@Getter
+@Entity
+public class UserBankIdentify {
+    private String userNum;
+    private String bankAccount;
+    private short bankAccountIdentify;
+}

demo/src/test/java/com/example/demo/circulator/service/CirculatorService.java

@@ -0,0 +1,25 @@
+package com.example.demo.circulator.service;
+
+import com.example.demo.Dao.auditMapper;
+import com.example.demo.Dao.productMapper;
+import com.example.demo.bean.Product;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+
+public class CirculatorService {
+    @Autowired
+    private productMapper productMapper;
+    private auditMapper auditMapper;
+
+    @PostConstruct
+    public void init(){}
+
+    @Transactional //数据库与事物的一致性
+    public double countSumCirculator(String userNum,String productNum,float amount,int year){
+        Product product  = productMapper.selectProductIntrateByProductNum(productNum);
+        float intrate = product.getIntrate();
+        return intrate;
+    }
+}

demo/src/test/java/com/example/demo/circulator/service/controller/SumCirculatorController.java

@@ -0,0 +1,4 @@
+package com.example.demo.circulator.service.controller;
+
+public class SumCirculatorController {
+}