From 9ba7c9880ae6d37af8fc1692ce2b15c4eeb00081 Mon Sep 17 00:00:00 2001 From: Aokiso <1010390029@qq.com> Date: Tue, 8 Jan 2019 21:25:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/Dao/auditMapper.java | 6 +- .../java/com/example/demo/Dao/bankMapper.java | 5 +- .../com/example/demo/Dao/managerMapper.java | 7 +- .../com/example/demo/Dao/paymentMapper.java | 1 - .../demo/Dao/productHistroyMapper.java | 4 +- .../com/example/demo/Dao/productMapper.java | 11 +- .../com/example/demo/Dao/transMapper.java | 0 .../com/example/demo/Dao/usageDateMapper.java | 3 - .../example/demo/Dao/userBankIdentify.java | 0 .../java/com/example/demo/Dao/userMapper.java | 0 .../java/com/example/demo/bean/Audit.java | 5 +- .../java/com/example/demo/bean/Bank.java | 7 +- .../java/com/example/demo/bean/Manager.java | 0 .../java/com/example/demo/bean/Product.java | 0 .../com/example/demo/bean/ProductHistroy.java | 0 .../java/com/example/demo/bean/Repayment.java | 30 +++ .../com/example/demo/bean/Transaction.java | 0 .../java/com/example/demo/bean/UsageDate.java | 48 +++++ .../java/com/example/demo/bean/User.java | 0 .../example/demo/bean/UserBankIdentify.java | 7 + .../demo/circulator/service/CirService.java | 1 - .../circulator/service/EPAIR_CirService.java | 2 - .../circulator/service/EPR_CirService.java | 2 - .../circulator/service/PayCirService.java | 6 +- .../service/controller/NextCirController.java | 0 .../service/controller/PayCirController.java | 0 .../service/controller/SumCirController.java | 0 .../controller/addController.java | 5 +- .../controller/deleteController.java | 0 .../controller/updateController.java | 0 .../demo/productService/tools/addPro.java | 0 .../demo/productService/tools/deletePro.java | 1 - .../demo/productService/tools/nowTime.java | 2 +- .../demo/productService/tools/updatePro.java | 0 .../controller/SearchServiceController.java | 18 ++ .../repository/ProductRepository.java | 15 ++ .../service/ProductSearchService.java | 6 - .../impl/ProductSearchServiceImpl.java | 171 ++++++++++++++++++ .../java/com/example/demo/bean/Repayment.java | 16 -- .../java/com/example/demo/bean/UsageDate.java | 24 --- .../controller/SearchServiceController.java | 38 ---- .../impl/ProductSearchServiceImpl.java | 44 ----- 42 files changed, 319 insertions(+), 166 deletions(-) rename demo/src/{test => main}/java/com/example/demo/Dao/auditMapper.java (83%) rename demo/src/{test => main}/java/com/example/demo/Dao/bankMapper.java (84%) rename demo/src/{test => main}/java/com/example/demo/Dao/managerMapper.java (82%) rename demo/src/{test => main}/java/com/example/demo/Dao/paymentMapper.java (92%) rename demo/src/{test => main}/java/com/example/demo/Dao/productHistroyMapper.java (90%) rename demo/src/{test => main}/java/com/example/demo/Dao/productMapper.java (71%) rename demo/src/{test => main}/java/com/example/demo/Dao/transMapper.java (100%) rename demo/src/{test => main}/java/com/example/demo/Dao/usageDateMapper.java (88%) rename demo/src/{test => main}/java/com/example/demo/Dao/userBankIdentify.java (100%) rename demo/src/{test => main}/java/com/example/demo/Dao/userMapper.java (100%) rename demo/src/{test => main}/java/com/example/demo/bean/Audit.java (78%) rename demo/src/{test => main}/java/com/example/demo/bean/Bank.java (53%) rename demo/src/{test => main}/java/com/example/demo/bean/Manager.java (100%) rename demo/src/{test => main}/java/com/example/demo/bean/Product.java (100%) rename demo/src/{test => main}/java/com/example/demo/bean/ProductHistroy.java (100%) create mode 100644 demo/src/main/java/com/example/demo/bean/Repayment.java rename demo/src/{test => main}/java/com/example/demo/bean/Transaction.java (100%) create mode 100644 demo/src/main/java/com/example/demo/bean/UsageDate.java rename demo/src/{test => main}/java/com/example/demo/bean/User.java (100%) rename demo/src/{test => main}/java/com/example/demo/bean/UserBankIdentify.java (53%) rename demo/src/{test => main}/java/com/example/demo/circulator/service/CirService.java (87%) rename demo/src/{test => main}/java/com/example/demo/circulator/service/EPAIR_CirService.java (98%) rename demo/src/{test => main}/java/com/example/demo/circulator/service/EPR_CirService.java (98%) rename demo/src/{test => main}/java/com/example/demo/circulator/service/PayCirService.java (89%) rename demo/src/{test => main}/java/com/example/demo/circulator/service/controller/NextCirController.java (100%) rename demo/src/{test => main}/java/com/example/demo/circulator/service/controller/PayCirController.java (100%) rename demo/src/{test => main}/java/com/example/demo/circulator/service/controller/SumCirController.java (100%) rename demo/src/{test => main}/java/com/example/demo/productService/controller/addController.java (96%) rename demo/src/{test => main}/java/com/example/demo/productService/controller/deleteController.java (100%) rename demo/src/{test => main}/java/com/example/demo/productService/controller/updateController.java (100%) rename demo/src/{test => main}/java/com/example/demo/productService/tools/addPro.java (100%) rename demo/src/{test => main}/java/com/example/demo/productService/tools/deletePro.java (95%) rename demo/src/{test => main}/java/com/example/demo/productService/tools/nowTime.java (100%) rename demo/src/{test => main}/java/com/example/demo/productService/tools/updatePro.java (100%) create mode 100644 demo/src/main/java/com/example/demo/searchService/controller/SearchServiceController.java create mode 100644 demo/src/main/java/com/example/demo/searchService/repository/ProductRepository.java rename demo/src/{test => main}/java/com/example/demo/searchService/service/ProductSearchService.java (60%) create mode 100644 demo/src/main/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java delete mode 100644 demo/src/test/java/com/example/demo/bean/Repayment.java delete mode 100644 demo/src/test/java/com/example/demo/bean/UsageDate.java delete mode 100644 demo/src/test/java/com/example/demo/searchService/controller/SearchServiceController.java delete mode 100644 demo/src/test/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java diff --git a/demo/src/test/java/com/example/demo/Dao/auditMapper.java b/demo/src/main/java/com/example/demo/Dao/auditMapper.java similarity index 83% rename from demo/src/test/java/com/example/demo/Dao/auditMapper.java rename to demo/src/main/java/com/example/demo/Dao/auditMapper.java index 236d723..fa4f8eb 100644 --- a/demo/src/test/java/com/example/demo/Dao/auditMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/auditMapper.java @@ -1,11 +1,7 @@ package com.example.demo.Dao; import com.example.demo.bean.Audit; -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Insert; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.*; import java.util.List; diff --git a/demo/src/test/java/com/example/demo/Dao/bankMapper.java b/demo/src/main/java/com/example/demo/Dao/bankMapper.java similarity index 84% rename from demo/src/test/java/com/example/demo/Dao/bankMapper.java rename to demo/src/main/java/com/example/demo/Dao/bankMapper.java index 2c89c79..07efb76 100644 --- a/demo/src/test/java/com/example/demo/Dao/bankMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/bankMapper.java @@ -1,7 +1,10 @@ package com.example.demo.Dao; import com.example.demo.bean.Bank; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; diff --git a/demo/src/test/java/com/example/demo/Dao/managerMapper.java b/demo/src/main/java/com/example/demo/Dao/managerMapper.java similarity index 82% rename from demo/src/test/java/com/example/demo/Dao/managerMapper.java rename to demo/src/main/java/com/example/demo/Dao/managerMapper.java index a890941..aa92471 100644 --- a/demo/src/test/java/com/example/demo/Dao/managerMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/managerMapper.java @@ -1,9 +1,10 @@ package com.example.demo.Dao; import com.example.demo.bean.Manager; -import org.apache.ibatis.annotations.*; - -import java.util.List; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; @Mapper public interface managerMapper { diff --git a/demo/src/test/java/com/example/demo/Dao/paymentMapper.java b/demo/src/main/java/com/example/demo/Dao/paymentMapper.java similarity index 92% rename from demo/src/test/java/com/example/demo/Dao/paymentMapper.java rename to demo/src/main/java/com/example/demo/Dao/paymentMapper.java index 940f988..40fb777 100644 --- a/demo/src/test/java/com/example/demo/Dao/paymentMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/paymentMapper.java @@ -1,7 +1,6 @@ package com.example.demo.Dao; import com.example.demo.bean.Repayment; -import com.example.demo.bean.Transaction; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; diff --git a/demo/src/test/java/com/example/demo/Dao/productHistroyMapper.java b/demo/src/main/java/com/example/demo/Dao/productHistroyMapper.java similarity index 90% rename from demo/src/test/java/com/example/demo/Dao/productHistroyMapper.java rename to demo/src/main/java/com/example/demo/Dao/productHistroyMapper.java index d0fbb2c..ffe7cc4 100644 --- a/demo/src/test/java/com/example/demo/Dao/productHistroyMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/productHistroyMapper.java @@ -2,7 +2,9 @@ package com.example.demo.Dao; import com.example.demo.bean.ProductHistroy; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import java.util.List; diff --git a/demo/src/test/java/com/example/demo/Dao/productMapper.java b/demo/src/main/java/com/example/demo/Dao/productMapper.java similarity index 71% rename from demo/src/test/java/com/example/demo/Dao/productMapper.java rename to demo/src/main/java/com/example/demo/Dao/productMapper.java index 514e642..b0708e3 100644 --- a/demo/src/test/java/com/example/demo/Dao/productMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/productMapper.java @@ -7,20 +7,11 @@ import java.util.List; @Mapper public interface productMapper { - @Select("select * from product where productName like '%#{productName}%'") - public List findByNameLike(String productName); - - @Select("select * from product where productName = #{category}") - public List findByCategory(String category); - - @Select("select * from product where intrate = #{intrate} order by intrate ASC") - public List findByIntrate(float intrate); - @Select("select * from product where productNum = #{productNum}") public Product selectProductByProductNum(long productNum); @Select("select * from product where productName = #{productName}") - public Product selectProductByProductName(String productName); + public Product selectProductByProductName(long productName); @Select("select * from product") public List select(); diff --git a/demo/src/test/java/com/example/demo/Dao/transMapper.java b/demo/src/main/java/com/example/demo/Dao/transMapper.java similarity index 100% rename from demo/src/test/java/com/example/demo/Dao/transMapper.java rename to demo/src/main/java/com/example/demo/Dao/transMapper.java diff --git a/demo/src/test/java/com/example/demo/Dao/usageDateMapper.java b/demo/src/main/java/com/example/demo/Dao/usageDateMapper.java similarity index 88% rename from demo/src/test/java/com/example/demo/Dao/usageDateMapper.java rename to demo/src/main/java/com/example/demo/Dao/usageDateMapper.java index 159968c..ae239f8 100644 --- a/demo/src/test/java/com/example/demo/Dao/usageDateMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/usageDateMapper.java @@ -14,9 +14,6 @@ public interface usageDateMapper { @Select("select * from usagedate") public List select(); - @Select("select productNum from usageDate group by productNum order by count(productNum) DESC") - public List selectByCount(); - @Insert("insert into usagedate(checkNum, productNum, userNum," + " bankAccount, bankNum, year, amount, startTime)" + " values (#{checkNum},#{productNum},#{userNum},#{bankAccount},#{bankNum}," + diff --git a/demo/src/test/java/com/example/demo/Dao/userBankIdentify.java b/demo/src/main/java/com/example/demo/Dao/userBankIdentify.java similarity index 100% rename from demo/src/test/java/com/example/demo/Dao/userBankIdentify.java rename to demo/src/main/java/com/example/demo/Dao/userBankIdentify.java diff --git a/demo/src/test/java/com/example/demo/Dao/userMapper.java b/demo/src/main/java/com/example/demo/Dao/userMapper.java similarity index 100% rename from demo/src/test/java/com/example/demo/Dao/userMapper.java rename to demo/src/main/java/com/example/demo/Dao/userMapper.java diff --git a/demo/src/test/java/com/example/demo/bean/Audit.java b/demo/src/main/java/com/example/demo/bean/Audit.java similarity index 78% rename from demo/src/test/java/com/example/demo/bean/Audit.java rename to demo/src/main/java/com/example/demo/bean/Audit.java index 93ad821..7569c10 100644 --- a/demo/src/test/java/com/example/demo/bean/Audit.java +++ b/demo/src/main/java/com/example/demo/bean/Audit.java @@ -4,7 +4,10 @@ package com.example.demo.bean; import lombok.Getter; import lombok.Setter; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; @Getter @Setter diff --git a/demo/src/test/java/com/example/demo/bean/Bank.java b/demo/src/main/java/com/example/demo/bean/Bank.java similarity index 53% rename from demo/src/test/java/com/example/demo/bean/Bank.java rename to demo/src/main/java/com/example/demo/bean/Bank.java index 4a7bcd9..fb80630 100644 --- a/demo/src/test/java/com/example/demo/bean/Bank.java +++ b/demo/src/main/java/com/example/demo/bean/Bank.java @@ -4,12 +4,17 @@ package com.example.demo.bean; import lombok.Getter; import lombok.Setter; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; @Getter @Setter @Entity public class Bank { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private int bankNum; private String bankName; private String contact;//联系方式 diff --git a/demo/src/test/java/com/example/demo/bean/Manager.java b/demo/src/main/java/com/example/demo/bean/Manager.java similarity index 100% rename from demo/src/test/java/com/example/demo/bean/Manager.java rename to demo/src/main/java/com/example/demo/bean/Manager.java diff --git a/demo/src/test/java/com/example/demo/bean/Product.java b/demo/src/main/java/com/example/demo/bean/Product.java similarity index 100% rename from demo/src/test/java/com/example/demo/bean/Product.java rename to demo/src/main/java/com/example/demo/bean/Product.java diff --git a/demo/src/test/java/com/example/demo/bean/ProductHistroy.java b/demo/src/main/java/com/example/demo/bean/ProductHistroy.java similarity index 100% rename from demo/src/test/java/com/example/demo/bean/ProductHistroy.java rename to demo/src/main/java/com/example/demo/bean/ProductHistroy.java diff --git a/demo/src/main/java/com/example/demo/bean/Repayment.java b/demo/src/main/java/com/example/demo/bean/Repayment.java new file mode 100644 index 0000000..b830553 --- /dev/null +++ b/demo/src/main/java/com/example/demo/bean/Repayment.java @@ -0,0 +1,30 @@ +package com.example.demo.bean; + +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Getter +@Setter +@Entity +public class Repayment { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long checkNum; + private double repAmount; + private double repSum; + + public double getRepAmount() { + return 0; + } + + public void setRepAmount(double repamount) { + } + + public void setRepSum(double pay) { + } +} diff --git a/demo/src/test/java/com/example/demo/bean/Transaction.java b/demo/src/main/java/com/example/demo/bean/Transaction.java similarity index 100% rename from demo/src/test/java/com/example/demo/bean/Transaction.java rename to demo/src/main/java/com/example/demo/bean/Transaction.java diff --git a/demo/src/main/java/com/example/demo/bean/UsageDate.java b/demo/src/main/java/com/example/demo/bean/UsageDate.java new file mode 100644 index 0000000..e5b5aba --- /dev/null +++ b/demo/src/main/java/com/example/demo/bean/UsageDate.java @@ -0,0 +1,48 @@ +package com.example.demo.bean; + +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Getter +@Setter +@Entity +public class UsageDate { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long checkNum; + private long productNum; + private long userNum; + private String bankAccount; + private int bankNum; + private int year; + private float amount; + private String startTime; + + public UsageDate(){}; + private int equation; + + public double getAmount() { + return amount; + } + + public int getYear() { + return year; + } + + public long getProductNum() { + return 0; + } + + public long getUserNum() { + return 0; + } + + public int getBankNum() { + return 0; + } +} diff --git a/demo/src/test/java/com/example/demo/bean/User.java b/demo/src/main/java/com/example/demo/bean/User.java similarity index 100% rename from demo/src/test/java/com/example/demo/bean/User.java rename to demo/src/main/java/com/example/demo/bean/User.java diff --git a/demo/src/test/java/com/example/demo/bean/UserBankIdentify.java b/demo/src/main/java/com/example/demo/bean/UserBankIdentify.java similarity index 53% rename from demo/src/test/java/com/example/demo/bean/UserBankIdentify.java rename to demo/src/main/java/com/example/demo/bean/UserBankIdentify.java index 5eeac50..6889b3b 100644 --- a/demo/src/test/java/com/example/demo/bean/UserBankIdentify.java +++ b/demo/src/main/java/com/example/demo/bean/UserBankIdentify.java @@ -1,12 +1,19 @@ package com.example.demo.bean; +import lombok.Setter; import lombok.Getter; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; @Getter +@Setter @Entity public class UserBankIdentify { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private String userName; private String bankAccount; private short bankAccountIdentify; diff --git a/demo/src/test/java/com/example/demo/circulator/service/CirService.java b/demo/src/main/java/com/example/demo/circulator/service/CirService.java similarity index 87% rename from demo/src/test/java/com/example/demo/circulator/service/CirService.java rename to demo/src/main/java/com/example/demo/circulator/service/CirService.java index c3be9ef..c84f43b 100644 --- a/demo/src/test/java/com/example/demo/circulator/service/CirService.java +++ b/demo/src/main/java/com/example/demo/circulator/service/CirService.java @@ -1,6 +1,5 @@ package com.example.demo.circulator.service; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; diff --git a/demo/src/test/java/com/example/demo/circulator/service/EPAIR_CirService.java b/demo/src/main/java/com/example/demo/circulator/service/EPAIR_CirService.java similarity index 98% rename from demo/src/test/java/com/example/demo/circulator/service/EPAIR_CirService.java rename to demo/src/main/java/com/example/demo/circulator/service/EPAIR_CirService.java index 3efb4d4..a14339f 100644 --- a/demo/src/test/java/com/example/demo/circulator/service/EPAIR_CirService.java +++ b/demo/src/main/java/com/example/demo/circulator/service/EPAIR_CirService.java @@ -7,8 +7,6 @@ import com.example.demo.bean.UsageDate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.PostConstruct; - public class EPAIR_CirService extends CirService{ @Autowired private usageDateMapper usageDateMapper; diff --git a/demo/src/test/java/com/example/demo/circulator/service/EPR_CirService.java b/demo/src/main/java/com/example/demo/circulator/service/EPR_CirService.java similarity index 98% rename from demo/src/test/java/com/example/demo/circulator/service/EPR_CirService.java rename to demo/src/main/java/com/example/demo/circulator/service/EPR_CirService.java index a44fce8..2ad0c38 100644 --- a/demo/src/test/java/com/example/demo/circulator/service/EPR_CirService.java +++ b/demo/src/main/java/com/example/demo/circulator/service/EPR_CirService.java @@ -9,8 +9,6 @@ import com.example.demo.bean.UsageDate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.PostConstruct; - public class EPR_CirService extends CirService{ @Autowired private usageDateMapper usageDateMapper; diff --git a/demo/src/test/java/com/example/demo/circulator/service/PayCirService.java b/demo/src/main/java/com/example/demo/circulator/service/PayCirService.java similarity index 89% rename from demo/src/test/java/com/example/demo/circulator/service/PayCirService.java rename to demo/src/main/java/com/example/demo/circulator/service/PayCirService.java index f656029..af88ae7 100644 --- a/demo/src/test/java/com/example/demo/circulator/service/PayCirService.java +++ b/demo/src/main/java/com/example/demo/circulator/service/PayCirService.java @@ -16,7 +16,7 @@ public class PayCirService { try{ Repayment repayment = paymentMapper.selectPepaymentBycheckNum(checkNum); UsageDate usageDate= usageDateMapper.selectUsageDateByCheckNum(checkNum); - double rep_amount = repayment.getRepAmount(); + double repamount = repayment.getRepAmount(); long userNum = usageDate.getUserNum(); int bankNum = usageDate.getBankNum(); double amount = usageDate.getAmount(); @@ -25,8 +25,8 @@ public class PayCirService { Transaction transaction = new Transaction(checkNum,userNum,bankNum,pay); transMapper.addTransaction(transaction); - rep_amount = pay - amount/(year*12); - repayment.setRepAmount(rep_amount); + repamount = pay - amount/(year*12); + repayment.setRepAmount(repamount); repayment.setRepSum(pay); paymentMapper.updateRepayment(repayment); return 1; diff --git a/demo/src/test/java/com/example/demo/circulator/service/controller/NextCirController.java b/demo/src/main/java/com/example/demo/circulator/service/controller/NextCirController.java similarity index 100% rename from demo/src/test/java/com/example/demo/circulator/service/controller/NextCirController.java rename to demo/src/main/java/com/example/demo/circulator/service/controller/NextCirController.java diff --git a/demo/src/test/java/com/example/demo/circulator/service/controller/PayCirController.java b/demo/src/main/java/com/example/demo/circulator/service/controller/PayCirController.java similarity index 100% rename from demo/src/test/java/com/example/demo/circulator/service/controller/PayCirController.java rename to demo/src/main/java/com/example/demo/circulator/service/controller/PayCirController.java diff --git a/demo/src/test/java/com/example/demo/circulator/service/controller/SumCirController.java b/demo/src/main/java/com/example/demo/circulator/service/controller/SumCirController.java similarity index 100% rename from demo/src/test/java/com/example/demo/circulator/service/controller/SumCirController.java rename to demo/src/main/java/com/example/demo/circulator/service/controller/SumCirController.java diff --git a/demo/src/test/java/com/example/demo/productService/controller/addController.java b/demo/src/main/java/com/example/demo/productService/controller/addController.java similarity index 96% rename from demo/src/test/java/com/example/demo/productService/controller/addController.java rename to demo/src/main/java/com/example/demo/productService/controller/addController.java index 01e1734..f36dc97 100644 --- a/demo/src/test/java/com/example/demo/productService/controller/addController.java +++ b/demo/src/main/java/com/example/demo/productService/controller/addController.java @@ -2,12 +2,13 @@ package com.example.demo.productService.controller; import com.example.demo.bean.Product; import com.example.demo.productService.tools.addPro; +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; -import org.springframework.stereotype.Controller; @Controller public class addController extends HttpServlet { @@ -25,7 +26,7 @@ public class addController extends HttpServlet { product.setProductDescription(request.getParameter("description")); product.setPictureAddress(request.getParameter("address")); int result= addPro.add(product); - response.setContentType("text/html;charset=utf-8"); + response.setContentType("text/hmtl;charset=utf-8"); writer=response.getWriter(); if(result==1){ writer.write("增加成功"); diff --git a/demo/src/test/java/com/example/demo/productService/controller/deleteController.java b/demo/src/main/java/com/example/demo/productService/controller/deleteController.java similarity index 100% rename from demo/src/test/java/com/example/demo/productService/controller/deleteController.java rename to demo/src/main/java/com/example/demo/productService/controller/deleteController.java diff --git a/demo/src/test/java/com/example/demo/productService/controller/updateController.java b/demo/src/main/java/com/example/demo/productService/controller/updateController.java similarity index 100% rename from demo/src/test/java/com/example/demo/productService/controller/updateController.java rename to demo/src/main/java/com/example/demo/productService/controller/updateController.java diff --git a/demo/src/test/java/com/example/demo/productService/tools/addPro.java b/demo/src/main/java/com/example/demo/productService/tools/addPro.java similarity index 100% rename from demo/src/test/java/com/example/demo/productService/tools/addPro.java rename to demo/src/main/java/com/example/demo/productService/tools/addPro.java diff --git a/demo/src/test/java/com/example/demo/productService/tools/deletePro.java b/demo/src/main/java/com/example/demo/productService/tools/deletePro.java similarity index 95% rename from demo/src/test/java/com/example/demo/productService/tools/deletePro.java rename to demo/src/main/java/com/example/demo/productService/tools/deletePro.java index 886e14c..5489d67 100644 --- a/demo/src/test/java/com/example/demo/productService/tools/deletePro.java +++ b/demo/src/main/java/com/example/demo/productService/tools/deletePro.java @@ -1,7 +1,6 @@ package com.example.demo.productService.tools; import com.example.demo.Dao.productHistroyMapper; -import com.example.demo.bean.Product; import com.example.demo.bean.ProductHistroy; public class deletePro { diff --git a/demo/src/test/java/com/example/demo/productService/tools/nowTime.java b/demo/src/main/java/com/example/demo/productService/tools/nowTime.java similarity index 100% rename from demo/src/test/java/com/example/demo/productService/tools/nowTime.java rename to demo/src/main/java/com/example/demo/productService/tools/nowTime.java index 92065f9..8629762 100644 --- a/demo/src/test/java/com/example/demo/productService/tools/nowTime.java +++ b/demo/src/main/java/com/example/demo/productService/tools/nowTime.java @@ -1,8 +1,8 @@ package com.example.demo.productService.tools; -import java.util.Date; import java.text.SimpleDateFormat; +import java.util.Date; public class nowTime{ diff --git a/demo/src/test/java/com/example/demo/productService/tools/updatePro.java b/demo/src/main/java/com/example/demo/productService/tools/updatePro.java similarity index 100% rename from demo/src/test/java/com/example/demo/productService/tools/updatePro.java rename to demo/src/main/java/com/example/demo/productService/tools/updatePro.java 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 new file mode 100644 index 0000000..a646364 --- /dev/null +++ b/demo/src/main/java/com/example/demo/searchService/controller/SearchServiceController.java @@ -0,0 +1,18 @@ +package com.example.demo.searchService.controller; + +import com.example.demo.bean.Product; +import com.example.demo.searchService.service.impl.ProductSearchServiceImpl; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; + + +public class SearchServiceController { + ProductSearchServiceImpl productSearchService = new ProductSearchServiceImpl(); + //模糊查询 + @GetMapping("/findByNameLike/{productName}") + public List findByNameLike(@PathVariable(value = "productName") String productName){ + return productSearchService.findByNameLike(productName); + } +} diff --git a/demo/src/main/java/com/example/demo/searchService/repository/ProductRepository.java b/demo/src/main/java/com/example/demo/searchService/repository/ProductRepository.java new file mode 100644 index 0000000..933e60a --- /dev/null +++ b/demo/src/main/java/com/example/demo/searchService/repository/ProductRepository.java @@ -0,0 +1,15 @@ +package com.example.demo.searchService.repository; + +import com.example.demo.bean.Product; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +public interface ProductRepository extends JpaRepository, JpaSpecificationExecutor { + @Query("select p.productName from Product p where p.productName like CONCAT('%',:productName,'%')") + List findByNameLike(@Param("productName") String productName); + +} diff --git a/demo/src/test/java/com/example/demo/searchService/service/ProductSearchService.java b/demo/src/main/java/com/example/demo/searchService/service/ProductSearchService.java similarity index 60% rename from demo/src/test/java/com/example/demo/searchService/service/ProductSearchService.java rename to demo/src/main/java/com/example/demo/searchService/service/ProductSearchService.java index c61a057..124d4cc 100644 --- a/demo/src/test/java/com/example/demo/searchService/service/ProductSearchService.java +++ b/demo/src/main/java/com/example/demo/searchService/service/ProductSearchService.java @@ -6,10 +6,4 @@ import java.util.List; public interface ProductSearchService { List findByNameLike(String productName); - - List findByCategory(String category); - - List findByIntrate(float intrate); - - List findByCount(); } 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 new file mode 100644 index 0000000..bd757b4 --- /dev/null +++ b/demo/src/main/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java @@ -0,0 +1,171 @@ +package com.example.demo.searchService.service.impl; + +import com.example.demo.bean.Product; +import com.example.demo.searchService.repository.ProductRepository; +import com.example.demo.searchService.service.ProductSearchService; +import org.springframework.data.domain.Example; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.jpa.domain.Specification; + +import java.util.List; +import java.util.Optional; + +public class ProductSearchServiceImpl implements ProductSearchService { + ProductRepository productRepository = new ProductRepository() { + @Override + public List findByNameLike(String productName) { + return null; + } + + @Override + public List findAll() { + return null; + } + + @Override + public List findAll(Sort sort) { + return null; + } + + @Override + public List findAllById(Iterable iterable) { + return null; + } + + @Override + public List saveAll(Iterable iterable) { + return null; + } + + @Override + public void flush() { + + } + + @Override + public S saveAndFlush(S s) { + return null; + } + + @Override + public void deleteInBatch(Iterable iterable) { + + } + + @Override + public void deleteAllInBatch() { + + } + + @Override + public Product getOne(Integer integer) { + return null; + } + + @Override + public List findAll(Example example) { + return null; + } + + @Override + public List findAll(Example example, Sort sort) { + return null; + } + + @Override + public Optional findOne(Specification specification) { + return Optional.empty(); + } + + @Override + public List findAll(Specification specification) { + return null; + } + + @Override + public Page findAll(Specification specification, Pageable pageable) { + return null; + } + + @Override + public List findAll(Specification specification, Sort sort) { + return null; + } + + @Override + public long count(Specification specification) { + return 0; + } + + @Override + public Page findAll(Pageable pageable) { + return null; + } + + @Override + public S save(S s) { + return null; + } + + @Override + public Optional findById(Integer integer) { + return Optional.empty(); + } + + @Override + public boolean existsById(Integer integer) { + return false; + } + + @Override + public long count() { + return 0; + } + + @Override + public void deleteById(Integer integer) { + + } + + @Override + public void delete(Product product) { + + } + + @Override + public void deleteAll(Iterable iterable) { + + } + + @Override + public void deleteAll() { + + } + + @Override + public Optional findOne(Example example) { + return Optional.empty(); + } + + @Override + public Page findAll(Example example, Pageable pageable) { + return null; + } + + @Override + public long count(Example example) { + return 0; + } + + @Override + public boolean exists(Example example) { + return false; + } + }; + public List findByNameLike(String productName){ + List list = productRepository.findByNameLike(productName); + return list; + } +} diff --git a/demo/src/test/java/com/example/demo/bean/Repayment.java b/demo/src/test/java/com/example/demo/bean/Repayment.java deleted file mode 100644 index 0e9ed17..0000000 --- a/demo/src/test/java/com/example/demo/bean/Repayment.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.demo.bean; - -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Entity; - -@Getter -@Setter -@Entity -public class Repayment { - private long checkNum; - private double repAmount; - private double repSum; - -} diff --git a/demo/src/test/java/com/example/demo/bean/UsageDate.java b/demo/src/test/java/com/example/demo/bean/UsageDate.java deleted file mode 100644 index 3f4744b..0000000 --- a/demo/src/test/java/com/example/demo/bean/UsageDate.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.demo.bean; - -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Entity; - -@Getter -@Setter -@Entity -public class UsageDate { - private long checkNum; - private long productNum; - private long userNum; - private String bankAccount; - private int bankNum; - private int year; - private float amount; - private String startTime; - - public UsageDate(){}; - private int equation; - -} diff --git a/demo/src/test/java/com/example/demo/searchService/controller/SearchServiceController.java b/demo/src/test/java/com/example/demo/searchService/controller/SearchServiceController.java deleted file mode 100644 index dd65378..0000000 --- a/demo/src/test/java/com/example/demo/searchService/controller/SearchServiceController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.example.demo.searchService.controller; - - -import com.example.demo.bean.Product; -import com.example.demo.searchService.service.ProductSearchService; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; - -@Controller -public class SearchServiceController { - private ProductSearchService productSearchService; - @RequestMapping("/search") - public List productSearch(HttpServletRequest request, HttpServletResponse response){ - List list = new ArrayList(); - String productName = request.getParameter("productName"); - String category = request.getParameter("category"); - float intrate = Integer.parseInt(request.getParameter("intrate")); - if(productName!=null){ - list = productSearchService.findByNameLike(productName); - //按关键字搜索 - }else if(category!=null){ - list = productSearchService.findByCategory(category); - //按产品类别搜索 - }else if(intrate!=0){ - list = productSearchService.findByIntrate(intrate); - //按利率排序由低到高 - }else{ - list = productSearchService.findByCount(); - //默认按产品热度由高到低排序 - } - return list; - } -} diff --git a/demo/src/test/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java b/demo/src/test/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java deleted file mode 100644 index 965dcc1..0000000 --- a/demo/src/test/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.example.demo.searchService.service.impl; - -import com.example.demo.Dao.productMapper; -import com.example.demo.Dao.usageDateMapper; -import com.example.demo.bean.Product; -import com.example.demo.searchService.service.ProductSearchService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.ArrayList; -import java.util.List; - -public class ProductSearchServiceImpl implements ProductSearchService { - @Autowired - productMapper productMapper; - usageDateMapper usageDateMapper; - Product product; - @Override - public List findByNameLike(String productName){ - return productMapper.findByNameLike(productName); - } - - @Override - public List findByCategory(String category){ - return productMapper.findByCategory(category); - } - - @Override - public List findByIntrate(float intrate){ - return productMapper.findByIntrate(intrate); - } - - @Override - public List findByCount(){ - List productList = new ArrayList(); - List listusage = usageDateMapper.selectByCount(); - int[] arr = listusage.stream().mapToInt(Integer::valueOf).toArray(); - for(int i=0;i