From 9413a78cc1b2692e3369fcffda08c9e2addf6ab2 Mon Sep 17 00:00:00 2001 From: vastlan Date: Thu, 22 Aug 2024 10:50:15 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=B0=86=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=82=9F=E7=A9=BA=E7=B3=BB=E7=BB=9F=E7=9A=84?= =?UTF-8?q?nacos=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ++++ .../weight/controller/OrderController.java | 28 ++++++++++++++ .../binary/weight/service/OrderService.java | 38 ++++++++++++++++--- 3 files changed, 68 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 56399c3..318b835 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,13 @@ spring-boot-starter-test test + + + org.antlr + antlr4-runtime + 4.9.2 + + diff --git a/src/main/java/com/binary/weight/controller/OrderController.java b/src/main/java/com/binary/weight/controller/OrderController.java index 01323f9..edd7df4 100644 --- a/src/main/java/com/binary/weight/controller/OrderController.java +++ b/src/main/java/com/binary/weight/controller/OrderController.java @@ -19,6 +19,29 @@ public class OrderController { @PostMapping public Response addOrder(@RequestBody Order order) { int result = orderService.addOrder(order); + + if (result > 0) { + return new Response("ok", true, null); + } else { + return new Response("error", false, null); + } + } + + @PutMapping + public Response updateOrder(@RequestBody Order order) { + int result = orderService.updateOrder(order); + + if (result > 0) { + return new Response("ok", true, null); + } else { + return new Response("error", false, null); + } + } + + @DeleteMapping("/no/{orderNo}") + public Response deleteOrderByNo(@PathVariable String orderNo) { + int result = orderService.deleteByNo(orderNo); + if (result > 0) { return new Response("ok", true, null); } else { @@ -37,7 +60,12 @@ public class OrderController { @GetMapping("/{id}") public Response getOrderById(@PathVariable int id) { Order order = orderService.getOrderById(id); + return Response.success(order); + } + @GetMapping("/no/{orderNo}") + public Response getOrderByNo(@PathVariable String orderNo) { + Order order = orderService.getOrderByNo(orderNo); return Response.success(order); } } diff --git a/src/main/java/com/binary/weight/service/OrderService.java b/src/main/java/com/binary/weight/service/OrderService.java index fef2239..3585ef7 100644 --- a/src/main/java/com/binary/weight/service/OrderService.java +++ b/src/main/java/com/binary/weight/service/OrderService.java @@ -3,6 +3,7 @@ package com.binary.weight.service; import com.binary.weight.entity.Order; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; @@ -20,17 +21,44 @@ public class OrderService { } public int addOrder(Order order) { - String sql = "INSERT INTO tbl_order (orderno, receiver, salesty, goods1, tonnage1, goods2, tonnage2, goods3, tonnage3, goods4, tonnage4, shipno, transportinfo, wharf, car_team1, cars1, car_team2, cars2, car_team3, cars3, car_team4, cars4, order_time, remark) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + String sql = "INSERT INTO tbl_order (orderno, receiver, salesty, goods1, tonnage1, goods2, tonnage2, goods3, tonnage3, goods4, tonnage4, shipno, transportinfo, wharf, car_team1, cars1, car_team2, cars2, car_team3, cars3, car_team4, cars4, order_time, remark) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; return jdbcTemplate.update(sql, order.getOrderNo(), order.getReceiver(), order.getSalesTy(), order.getGoods1(), order.getTonnage1(), order.getGoods2(), order.getTonnage2(), order.getGoods3(), order.getTonnage3(), order.getGoods4(), order.getTonnage4(), order.getShipNo(), order.getTransportInfo(), order.getWharf(), order.getCarTeam1(), order.getCars1(), order.getCarTeam2(), order.getCars2(), order.getCarTeam3(), order.getCars3(), order.getCarTeam4(), order.getCars4(), order.getOrderTime(), order.getRemark()); } + public int updateOrder(Order order) { + String sql = "UPDATE tbl_order set orderno = ?, receiver = ?, salesty = ?, goods1 = ?, tonnage1 = ?, goods2 = ?, tonnage2 = ?, goods3 = ?, tonnage3 = ?, goods4 = ?, tonnage4 = ?, shipno = ?, transportinfo = ?, wharf = ?, car_team1 = ?, cars1 = ?, car_team2 = ?, cars2 = ?, car_team3 = ?, cars3 = ?, car_team4 = ?, cars4 = ?, order_time = ?, remark = ? where id = ?"; + return jdbcTemplate.update(sql, order.getOrderNo(), order.getReceiver(), order.getSalesTy(), order.getGoods1(), order.getTonnage1(), order.getGoods2(), order.getTonnage2(), order.getGoods3(), order.getTonnage3(), order.getGoods4(), order.getTonnage4(), order.getShipNo(), order.getTransportInfo(), order.getWharf(), order.getCarTeam1(), order.getCars1(), order.getCarTeam2(), order.getCars2(), order.getCarTeam3(), order.getCars3(), order.getCarTeam4(), order.getCars4(), order.getOrderTime(), order.getRemark(), order.getId()); + } + + public int deleteByNo(String orderNo) { + String sql = "delete from tbl_order where orderno = ?"; + return jdbcTemplate.update(sql, orderNo); + } + public List getOrders() { - String sql = "SELECT * FROM tbl_order"; - return jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(Order.class)); + try { + String sql = "SELECT * FROM tbl_order"; + return jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(Order.class)); + } catch (EmptyResultDataAccessException e) { + return null; + } } public Order getOrderById(int id) { - String sql = "SELECT * FROM tbl_order WHERE id = ?"; - return jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(Order.class), id); + try { + String sql = "SELECT * FROM tbl_order WHERE id = ?"; + return jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(Order.class), id); + } catch (EmptyResultDataAccessException e) { + return null; + } + } + + public Order getOrderByNo(String orderNo) { + try { + String sql = "SELECT * FROM tbl_order WHERE orderno = ?"; + return jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(Order.class), orderNo); + } catch (EmptyResultDataAccessException e) { + return null; + } } }