diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java index ca50a60..29afc7a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java @@ -32,6 +32,7 @@ import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.page.TableDataInfo; +import org.springframework.web.multipart.MultipartFile; /** * 菜品计划信息Controller @@ -179,4 +180,14 @@ public class MenuRecipeController extends BaseController { return this.menuRecipeService.intervalConfig(HeaderFetchUtil.getMachineSn(headers)); } + + + @PostMapping({"/import/check"}) + @ApiOperation("导入之前检查数据是否可以导入") + public AjaxResult importDishesCheck(@RequestParam("file") MultipartFile excel) { + return AjaxResult.success(this.menuRecipeService.importDishesCheck(excel)); + } + + + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/DishesImportCheckResult.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/DishesImportCheckResult.java new file mode 100644 index 0000000..1eb19de --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/DishesImportCheckResult.java @@ -0,0 +1,24 @@ +package com.bonus.canteen.core.menu.dto; + +import java.util.List; + +public class DishesImportCheckResult { +// private List successList; +// private List errorList; +// +// public List getSuccessList() { +// return this.successList; +// } +// +// public List getErrorList() { +// return this.errorList; +// } +// +// public void setSuccessList(final List successList) { +// this.successList = successList; +// } +// +// public void setErrorList(final List errorList) { +// this.errorList = errorList; +// } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuRecipeService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuRecipeService.java index cb9f3fa..dec49e0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuRecipeService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuRecipeService.java @@ -16,6 +16,7 @@ import com.bonus.canteen.core.menu.dto.MenuRecipeAddDTO; import com.bonus.canteen.core.menu.dto.MenuRecipeParamDTO; import com.bonus.canteen.core.menu.dto.MenuTypeDishesDTO; import com.bonus.common.core.web.domain.AjaxResult; +import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; @@ -105,4 +106,6 @@ public interface IMenuRecipeService extends IService { DviceTimeIntervalVO intervalConfig(String machineSn); List selectMenuRecipeListV2(AllocRecipeStallDTO dto); + + DishesImportCheckResult importDishesCheck(MultipartFile excel); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java index 8c9dac4..f4219a5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java @@ -68,6 +68,7 @@ import org.springframework.core.task.AsyncTaskExecutor; import org.springframework.stereotype.Service; import com.bonus.canteen.core.menu.mapper.MenuRecipeMapper; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -186,6 +187,11 @@ public class MenuRecipeServiceImpl extends ServiceImpl - + + + + + + +