From a179d0396bf065cb58e0095a10bc06a546d79742 Mon Sep 17 00:00:00 2001 From: LeJingS <157603342+LeJingS@users.noreply.github.com> Date: Wed, 1 Jan 2025 12:56:16 +0800 Subject: [PATCH] =?UTF-8?q?2025=E5=B9=B41=E6=9C=881=E6=97=A512:56:13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../font/nginx-1.20.2/logs/access.log | 27 ++++++++++++++++ .../java/com/sky/mapper/DishFlavorMapper.java | 4 +++ .../main/java/com/sky/mapper/DishMapper.java | 8 +++++ .../com/sky/mapper/SetmealDishMapper.java | 13 ++++++++ .../com/sky/service/impl/DishServiceImpl.java | 31 +++++++++++++++++-- .../resources/mapper/SetmealDishMapper.xml | 14 +++++++++ 6 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/SetmealDishMapper.java create mode 100644 Sky_Delivery/server/sky-take-out/sky-server/src/main/resources/mapper/SetmealDishMapper.xml diff --git a/Sky_Delivery/font/nginx-1.20.2/logs/access.log b/Sky_Delivery/font/nginx-1.20.2/logs/access.log index b0e3b0a..89f3057 100644 --- a/Sky_Delivery/font/nginx-1.20.2/logs/access.log +++ b/Sky_Delivery/font/nginx-1.20.2/logs/access.log @@ -743,3 +743,30 @@ 127.0.0.1 - - [30/Dec/2024:16:10:10 +0800] "POST /api/dish HTTP/1.1" 200 44 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" 127.0.0.1 - - [30/Dec/2024:16:10:11 +0800] "GET /api/category/list?type=1 HTTP/1.1" 200 1275 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" 127.0.0.1 - - [30/Dec/2024:16:10:11 +0800] "GET /api/dish/page?page=1&pageSize=10&status= HTTP/1.1" 200 2689 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:11:29:26 +0800] "POST /api/employee/login HTTP/1.1" 200 200 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:11:29:27 +0800] "GET /api/workspace/overviewSetmeals HTTP/1.1" 404 114 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:11:29:27 +0800] "GET /api/order/conditionSearch?page=1&pageSize=10&status=2 HTTP/1.1" 404 109 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:11:29:27 +0800] "GET /api/shop/status HTTP/1.1" 404 99 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:11:29:27 +0800] "GET /api/workspace/overviewDishes HTTP/1.1" 404 112 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:11:29:27 +0800] "GET /api/workspace/overviewOrders HTTP/1.1" 404 112 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:11:29:27 +0800] "GET /api/workspace/businessData HTTP/1.1" 404 110 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:11:29:27 +0800] "GET /ws/ju9bthnpk0o HTTP/1.1" 404 96 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:11:29:31 +0800] "GET /api/category/list?type=1 HTTP/1.1" 200 1275 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:11:29:31 +0800] "GET /api/dish/page?page=1&pageSize=10&status= HTTP/1.1" 200 2689 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:11:29:38 +0800] "POST /api/dish/status/1?id=72 HTTP/1.1" 404 101 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:12:16:33 +0800] "DELETE /api/dish?ids=69 HTTP/1.1" 200 72 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:09:57 +0800] "DELETE /api/dish?ids=69 HTTP/1.1" 200 72 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:10:01 +0800] "GET /api/dish/page?page=2&pageSize=10&status= HTTP/1.1" 200 2613 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:10:04 +0800] "GET /api/dish/page?page=1&pageSize=10&status= HTTP/1.1" 200 2689 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:10:07 +0800] "GET /api/category/list?type=2 HTTP/1.1" 200 354 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:10:07 +0800] "GET /api/setmeal/page?page=1&pageSize=10&status= HTTP/1.1" 404 100 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:10:10 +0800] "GET /api/category/list?type=2&page=1&pageSize=1000 HTTP/1.1" 200 354 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:10:13 +0800] "GET /api/category/list?type=1 HTTP/1.1" 200 1275 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:10:13 +0800] "GET /api/dish/list?categoryId=17 HTTP/1.1" 404 97 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:10:14 +0800] "GET /api/dish/list?categoryId=16 HTTP/1.1" 404 97 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:10:14 +0800] "GET /api/dish/list?categoryId=18 HTTP/1.1" 404 97 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:10:18 +0800] "GET /api/category/list?type=1 HTTP/1.1" 200 1275 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:10:18 +0800] "GET /api/dish/page?page=1&pageSize=10&status= HTTP/1.1" 200 2689 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:10:27 +0800] "DELETE /api/dish?ids=72 HTTP/1.1" 500 104 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:11:29 +0800] "DELETE /api/dish?ids=72 HTTP/1.1" 200 44 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [31/Dec/2024:13:11:30 +0800] "GET /api/dish/page?page=1&pageSize=10&status= HTTP/1.1" 200 2683 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/DishFlavorMapper.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/DishFlavorMapper.java index ffb4c9c..e06d775 100644 --- a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/DishFlavorMapper.java +++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/DishFlavorMapper.java @@ -1,6 +1,7 @@ package com.sky.mapper; import com.sky.entity.DishFlavor; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,4 +11,7 @@ public interface DishFlavorMapper { // 批量插入 void insertBatch(List flavors); + + @Delete("delete from dish_flavor where dish_id = #{dishId}") + void deleteByDishId(Long dishId); } diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/DishMapper.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/DishMapper.java index 04a7393..a9b8e4e 100644 --- a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/DishMapper.java +++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/DishMapper.java @@ -6,6 +6,7 @@ import com.sky.dto.DishPageQueryDTO; import com.sky.entity.Dish; import com.sky.enumeration.OperationType; import com.sky.vo.DishVO; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -25,4 +26,11 @@ public interface DishMapper { void insert(Dish dish); //菜品分页查询 Page pageQuery(DishPageQueryDTO dishPageQueryDTO); + + @Select("select * from dish where id = #{id}") + Dish getById(Long id); + +// 根据主键删除菜品数据 + @Delete("delete from dish where id = #{id}") + void delectById(Long id); } diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/SetmealDishMapper.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/SetmealDishMapper.java new file mode 100644 index 0000000..c7ed4c3 --- /dev/null +++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/SetmealDishMapper.java @@ -0,0 +1,13 @@ +package com.sky.mapper; + + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SetmealDishMapper { +// 根据菜品id列查询对应的套餐id列 + + List getSetmealIdsByDishIds(List dishIds); +} diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java index 899135b..793e5af 100644 --- a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java +++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java @@ -2,12 +2,16 @@ package com.sky.service.impl; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import com.sky.constant.MessageConstant; +import com.sky.constant.StatusConstant; import com.sky.dto.DishDTO; import com.sky.dto.DishPageQueryDTO; import com.sky.entity.Dish; import com.sky.entity.DishFlavor; +import com.sky.exception.DeletionNotAllowedException; import com.sky.mapper.DishFlavorMapper; import com.sky.mapper.DishMapper; +import com.sky.mapper.SetmealDishMapper; import com.sky.result.PageResult; import com.sky.service.DishService; import com.sky.vo.DishVO; @@ -28,6 +32,9 @@ public class DishServiceImpl implements DishService { @Autowired private DishFlavorMapper dishFlavorMapper; + @Autowired + private SetmealDishMapper setmealDishMapper; + //新增菜品和口味数据，加上事务管理，原子性。成功全成功，失败全失败 @Transactional @Override @@ -64,14 +71,32 @@ public class DishServiceImpl implements DishService { // 菜品批量删除 @Override + @Transactional public void deleteBatch(List ids) { // 判断是否是起售中的菜品 - + for (Long id : ids) { + Dish dish = dishMapper.getById(id); + if(dish.getStatus() == StatusConstant.ENABLE){ +// 处于起售中，不能删除，抛出异常 + throw new DeletionNotAllowedException(MessageConstant.DISH_ON_SALE); + } + } // 判断是否与套餐有关联 - + List setmealIds = setmealDishMapper.getSetmealIdsByDishIds(ids); + if(setmealIds != null && setmealIds.size() >0){ +// 不许删除 + throw new DeletionNotAllowedException(MessageConstant.DISH_BE_RELATED_BY_SETMEAL); + } +/* // 执行删除菜品数据 - + for (Long id : ids) { + dishMapper.delectById(id); // 删除关联的口味数据 + dishFlavorMapper.deleteByDishId(id); + } +*/ + +// 根据菜品id集合批量删除菜品数据 } diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/resources/mapper/SetmealDishMapper.xml b/Sky_Delivery/server/sky-take-out/sky-server/src/main/resources/mapper/SetmealDishMapper.xml new file mode 100644 index 0000000..a71b42d --- /dev/null +++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/resources/mapper/SetmealDishMapper.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file