From 41adbc4071c5706bacb11eca39baadf73b5e91bf Mon Sep 17 00:00:00 2001 From: pan <1029559041@qq.com> Date: Wed, 15 Jul 2020 18:08:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=BB=E9=9D=A2=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/db2.sql | 110 ++++++++++++++++++ src/main/java/com/example/demo/Constants.java | 1 + .../demo/controller/WebController.java | 8 ++ .../java/com/example/demo/model/CaiDan.java | 1 + .../java/com/example/demo/model/Diancan.java | 1 + .../com/example/demo/model/DiancanDetail.java | 12 ++ .../repository/DiancanDetailRespository.java | 4 + src/main/resources/application.yaml | 2 +- src/main/resources/templates/order.html | 93 ++++++++++----- .../example/demo/DemoApplicationTests.java | 5 + 10 files changed, 206 insertions(+), 31 deletions(-) create mode 100644 db/db2.sql diff --git a/db/db2.sql b/db/db2.sql new file mode 100644 index 0000000..8b444da --- /dev/null +++ b/db/db2.sql @@ -0,0 +1,110 @@ +-- MySQL dump 10.13 Distrib 8.0.20, for Linux (x86_64) +-- +-- Host: localhost Database: dmmdb +-- ------------------------------------------------------ +-- Server version 8.0.20 + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!50503 SET NAMES utf8mb4 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `diancan_detail` +-- + +DROP TABLE IF EXISTS `diancan_detail`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `diancan_detail` ( + `id` int NOT NULL AUTO_INCREMENT, + `zhuohao` char(11) NOT NULL, + `menu_id` char(3) NOT NULL, + `sum` varchar(10) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `diancan_detail` +-- + +LOCK TABLES `diancan_detail` WRITE; +/*!40000 ALTER TABLE `diancan_detail` DISABLE KEYS */; +INSERT INTO `diancan_detail` VALUES (7,'12','001',''),(8,'12','009','10'); +/*!40000 ALTER TABLE `diancan_detail` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `m_menu` +-- + +DROP TABLE IF EXISTS `m_menu`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `m_menu` ( + `ID` char(3) NOT NULL, + `FENLEI` varchar(20) NOT NULL, + `PINMU` varchar(20) NOT NULL, + `CAILIAO` varchar(20) NOT NULL, + `JIAGE` int NOT NULL, + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `m_menu` +-- + +LOCK TABLES `m_menu` WRITE; +/*!40000 ALTER TABLE `m_menu` DISABLE KEYS */; +INSERT INTO `m_menu` VALUES ('001','正菜','肉类','牛肉',50),('002','正菜','肉类','猪肉',30),('003','正菜','肉类','鸡肉',20),('004','正菜','蔬菜','白菜',10),('005','正菜','蔬菜','黄瓜',10),('006','正菜','海鲜','大虾',40),('007','正菜','海鲜','黄鱼',40),('008','主食','米饭','白饭',3),('009','主食','米饭','炒饭',10),('010','主食','面条','凉拌',12),('011','主食','面条','打卤',15),('012','主食','水饺','素馅',15),('013','主食','水饺','肉馅',20),('014','酒水','白酒','茅台',1000),('015','酒水','白酒','郎酒',500),('016','酒水','啤酒','雪花',5),('017','酒水','啤酒','哈啤',6),('018','酒水','饮料','可乐',3),('019','酒水','饮料','雪碧',3); +/*!40000 ALTER TABLE `m_menu` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `tbl_diancan` +-- + +DROP TABLE IF EXISTS `tbl_diancan`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `tbl_diancan` ( + `ZHUOHAO` char(11) NOT NULL, + `XINGMING` varchar(15) NOT NULL, + `YUDING` tinyint(1) NOT NULL, + `BIRTHDAY` datetime DEFAULT NULL, + `RENSHU` int DEFAULT NULL, + `TEL` varchar(20) DEFAULT NULL, + `JINE` int DEFAULT NULL, + `BEIZHU` varchar(200) DEFAULT NULL, + PRIMARY KEY (`ZHUOHAO`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `tbl_diancan` +-- + +LOCK TABLES `tbl_diancan` WRITE; +/*!40000 ALTER TABLE `tbl_diancan` DISABLE KEYS */; +INSERT INTO `tbl_diancan` VALUES ('12','12',1,NULL,1,'15920722180',150,''); +/*!40000 ALTER TABLE `tbl_diancan` ENABLE KEYS */; +UNLOCK TABLES; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2020-07-15 7:38:54 diff --git a/src/main/java/com/example/demo/Constants.java b/src/main/java/com/example/demo/Constants.java index a018030..347e6f8 100644 --- a/src/main/java/com/example/demo/Constants.java +++ b/src/main/java/com/example/demo/Constants.java @@ -5,4 +5,5 @@ public class Constants { public static final String LIST = "list"; public static final String QUERY = "query"; public static final String FENLEI = "fenlei"; + public static final String QUERYDETAIL = "querydetail"; } diff --git a/src/main/java/com/example/demo/controller/WebController.java b/src/main/java/com/example/demo/controller/WebController.java index fc6e09f..088f501 100644 --- a/src/main/java/com/example/demo/controller/WebController.java +++ b/src/main/java/com/example/demo/controller/WebController.java @@ -72,6 +72,9 @@ public class WebController { public String getOrder(Model model){ model.addAttribute(Constants.SPAN_NAME,"点餐画面"); model.addAttribute(Constants.FENLEI,menuRepository.getFenlei()); + Diancan diancan= new Diancan(); + diancan.setRenshu(1); + model.addAttribute(Constants.QUERY,diancan); return "order"; } @@ -103,6 +106,11 @@ public class WebController { @GetMapping("/order/{id}") public String getEditOrder(Model model,@PathVariable String id){ model.addAttribute(Constants.SPAN_NAME,"修改画面"); + Diancan diancan=diancanRespository.getOne(id); + model.addAttribute(Constants.QUERY,diancan); + List diancanDetails=diancanDetailRespository.findByZhuohao(diancan.getZhuohao()); + model.addAttribute(Constants.QUERYDETAIL,diancanDetails); + model.addAttribute(Constants.FENLEI,menuRepository.getFenlei()); return "order"; } diff --git a/src/main/java/com/example/demo/model/CaiDan.java b/src/main/java/com/example/demo/model/CaiDan.java index 17fe5b1..4f8f372 100644 --- a/src/main/java/com/example/demo/model/CaiDan.java +++ b/src/main/java/com/example/demo/model/CaiDan.java @@ -1,6 +1,7 @@ package com.example.demo.model; public class CaiDan { + private String cailiao; private String sum; diff --git a/src/main/java/com/example/demo/model/Diancan.java b/src/main/java/com/example/demo/model/Diancan.java index 3c6582e..5289960 100644 --- a/src/main/java/com/example/demo/model/Diancan.java +++ b/src/main/java/com/example/demo/model/Diancan.java @@ -9,6 +9,7 @@ import java.util.Date; public class Diancan { @Id + @Column(name = "zhuohao") private String zhuohao; @Column(nullable = false) diff --git a/src/main/java/com/example/demo/model/DiancanDetail.java b/src/main/java/com/example/demo/model/DiancanDetail.java index 0be1c0a..89a6d21 100644 --- a/src/main/java/com/example/demo/model/DiancanDetail.java +++ b/src/main/java/com/example/demo/model/DiancanDetail.java @@ -47,4 +47,16 @@ public class DiancanDetail { public void setZhuohao(String zhuohao) { this.zhuohao = zhuohao; } + + @OneToOne + @JoinColumn(name = "menu_id",referencedColumnName = "id",insertable = false,updatable = false) + private Menu menu; + + public Menu getMenu() { + return menu; + } + + public void setMenu(Menu menu) { + this.menu = menu; + } } diff --git a/src/main/java/com/example/demo/repository/DiancanDetailRespository.java b/src/main/java/com/example/demo/repository/DiancanDetailRespository.java index 8b1f93a..6e472df 100644 --- a/src/main/java/com/example/demo/repository/DiancanDetailRespository.java +++ b/src/main/java/com/example/demo/repository/DiancanDetailRespository.java @@ -3,6 +3,10 @@ package com.example.demo.repository; import com.example.demo.model.DiancanDetail; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface DiancanDetailRespository extends JpaRepository { int deleteByZhuohao(String zhuohao); + + List findByZhuohao(String zhuohao); } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 3321b1f..a9579ae 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -4,7 +4,7 @@ spring: cache: false datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/dmmdb + url: jdbc:mysql://localhost:33060/dmmdb username: sukura password: 123456 jpa: diff --git a/src/main/resources/templates/order.html b/src/main/resources/templates/order.html index e0f28af..30a8613 100644 --- a/src/main/resources/templates/order.html +++ b/src/main/resources/templates/order.html @@ -17,9 +17,33 @@