From 77d5d346b1e028e85dc77dac3bee70ad5d4532ad Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Sat, 27 Feb 2021 20:15:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A3=9F=E8=B0=B1=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysRecipesPlanModelController.java | 68 ++++ .../stdiet/custom/domain/SysRecipesPlan.java | 3 + .../custom/domain/SysRecipesPlanModel.java | 28 ++ .../custom/mapper/SysRecipesPlanMapper.java | 2 + .../mapper/SysRecipesPlanModelMapper.java | 24 ++ .../service/ISysRecipesPlanModelService.java | 25 ++ .../impl/SysRecipesPlanModelServiceImpl.java | 67 ++++ .../impl/SysRecipesPlanServiceImpl.java | 4 + .../mapper/custom/SysRecipesPlanMapper.xml | 12 +- .../custom/SysRecipesPlanModelMapper.xml | 75 ++++ stdiet-ui/src/api/custom/recipesPlanModel.js | 33 ++ .../RecipesView/RecipesCom/index.vue | 2 +- .../src/views/custom/recipesModel/index.vue | 331 ++++++++++++++++++ 13 files changed, 667 insertions(+), 7 deletions(-) create mode 100644 stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanModelController.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlanModel.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanModelMapper.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanModelService.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanModelServiceImpl.java create mode 100644 stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanModelMapper.xml create mode 100644 stdiet-ui/src/api/custom/recipesPlanModel.js create mode 100644 stdiet-ui/src/views/custom/recipesModel/index.vue diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanModelController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanModelController.java new file mode 100644 index 000000000..6ade85a44 --- /dev/null +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanModelController.java @@ -0,0 +1,68 @@ +package com.stdiet.web.controller.custom; + +import com.stdiet.common.core.controller.BaseController; +import com.stdiet.common.core.domain.AjaxResult; +import com.stdiet.common.core.page.TableDataInfo; +import com.stdiet.custom.domain.SysRecipesPlanModel; +import com.stdiet.custom.service.ISysRecipesPlanModelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 食谱模板 + * + * @author wonder + * @date 2021-02-27 + */ +@RestController +@RequestMapping("/recipes/model") +public class SysRecipesPlanModelController extends BaseController { + @Autowired + private ISysRecipesPlanModelService iSysRecipesPlanModelService; + + /** + * 查询 + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesModel:list')") + @GetMapping("/list") + public TableDataInfo list(SysRecipesPlanModel sysRecipesPlanModel) { + startPage(); + List list = iSysRecipesPlanModelService.selectRecipesModelListByCondition(sysRecipesPlanModel); + return getDataTable(list); + } + + /** + * 添加 + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesModel:edit')") + @PostMapping("/add") + public AjaxResult add(SysRecipesPlanModel sysRecipesPlanModel) { + return toAjax(iSysRecipesPlanModelService.insertRecipsesModel(sysRecipesPlanModel)); + } + + /** + * 更新 + * + * @param sysRecipesPlanModel + * @return + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesPlan:list')") + @PutMapping(value = "/update") + public AjaxResult update(SysRecipesPlanModel sysRecipesPlanModel) { + return toAjax(iSysRecipesPlanModelService.updateRecipesModel(sysRecipesPlanModel)); + } + + /** + * 删除 + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesPlan:query')") + @DeleteMapping(value = "/delete/{id}") + public AjaxResult delete(@PathVariable("id") Long id) { + return AjaxResult.success(iSysRecipesPlanModelService.removeRecipesModel(id)); + } + + +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java index babdade09..d9e435ead 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java @@ -137,4 +137,7 @@ public class SysRecipesPlan { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; + + // 0-普通 1-模板 + private Integer type; } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlanModel.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlanModel.java new file mode 100644 index 000000000..f491891cd --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlanModel.java @@ -0,0 +1,28 @@ +package com.stdiet.custom.domain; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SysRecipesPlanModel { + Long id; + + Long nutritionistId; + + Long nutriAssisId; + + Long planId; + + String remark; + + Date updateTime; + + Date createTime; + + String updateBy; + + String createBy; + + Long recipesId; +} diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanMapper.java index a4fb2093f..d3cff2b7c 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanMapper.java @@ -93,4 +93,6 @@ public interface SysRecipesPlanMapper List selectRecipesPlanListInfo(String outId); List selectPlanListByCusId(Long cusId); + + List selectRecipesModelList(SysRecipesPlan sysRecipesPlan); } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanModelMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanModelMapper.java new file mode 100644 index 000000000..12909be6c --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanModelMapper.java @@ -0,0 +1,24 @@ +package com.stdiet.custom.mapper; + +import com.stdiet.custom.domain.SysRecipesPlan; +import com.stdiet.custom.domain.SysRecipesPlanListInfo; +import com.stdiet.custom.domain.SysRecipesPlanModel; + +import java.util.List; + +/** + * 食谱计划Mapper接口 + * + * @author wonder + * @date 2021-02-27 + */ +public interface SysRecipesPlanModelMapper +{ + List selectRecipesModelListByCondition(SysRecipesPlanModel sysRecipesPlanModel); + + int insertRecipsesModel(SysRecipesPlanModel sysRecipesPlanModel); + + int updateRecipesModel(SysRecipesPlanModel sysRecipesPlanModel); + + int removeRecipesModel(Long id); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanModelService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanModelService.java new file mode 100644 index 000000000..f227cc3ce --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanModelService.java @@ -0,0 +1,25 @@ +package com.stdiet.custom.service; + +import com.stdiet.custom.domain.SysRecipesPlan; +import com.stdiet.custom.domain.SysRecipesPlanListInfo; +import com.stdiet.custom.domain.SysRecipesPlanModel; + +import java.util.List; + +/** + * 食谱计划Service接口 + * + * @author wonder + * @date 2021-02-27 + */ +public interface ISysRecipesPlanModelService +{ + + List selectRecipesModelListByCondition(SysRecipesPlanModel sysRecipesPlanModel); + + int insertRecipsesModel(SysRecipesPlanModel sysRecipesPlanModel); + + int updateRecipesModel(SysRecipesPlanModel sysRecipesPlanModel); + + int removeRecipesModel(Long id); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanModelServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanModelServiceImpl.java new file mode 100644 index 000000000..f2e5876da --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanModelServiceImpl.java @@ -0,0 +1,67 @@ +package com.stdiet.custom.service.impl; + +import com.stdiet.common.utils.DateUtils; +import com.stdiet.common.utils.SecurityUtils; +import com.stdiet.custom.domain.SysRecipesPlan; +import com.stdiet.custom.domain.SysRecipesPlanModel; +import com.stdiet.custom.mapper.SysRecipesPlanMapper; +import com.stdiet.custom.mapper.SysRecipesPlanModelMapper; +import com.stdiet.custom.service.ISysRecipesPlanModelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +/** + * 食谱计划Service业务层处理 + * + * @author wonder + * @date 2021-02-27 + */ +@Service("sysRecipesPlanModelService") +@Transactional +public class SysRecipesPlanModelServiceImpl implements ISysRecipesPlanModelService { + + @Autowired + SysRecipesPlanModelMapper sysRecipesPlanModelMapper; + + @Autowired + SysRecipesPlanMapper sysRecipesPlanMapper; + + @Override + public List selectRecipesModelListByCondition(SysRecipesPlanModel sysRecipesPlanModel) { + return sysRecipesPlanModelMapper.selectRecipesModelListByCondition(sysRecipesPlanModel); + } + + @Override + public int insertRecipsesModel(SysRecipesPlanModel sysRecipesPlanModel) { + SysRecipesPlan sysRecipesPlan = new SysRecipesPlan(); + sysRecipesPlan.setStartNumDay(1); + sysRecipesPlan.setEndNumDay(7); + sysRecipesPlan.setType(1); + int rows = sysRecipesPlanMapper.insertSysRecipesPlan(sysRecipesPlan); + if (rows > 0) { + sysRecipesPlanModel.setCreateBy(SecurityUtils.getUsername()); + sysRecipesPlanModel.setCreateTime(DateUtils.getNowDate()); + sysRecipesPlanModel.setPlanId(sysRecipesPlan.getId()); + return sysRecipesPlanModelMapper.insertRecipsesModel(sysRecipesPlanModel); + } + return 0; + } + + @Override + public int updateRecipesModel(SysRecipesPlanModel sysRecipesPlanModel) { + sysRecipesPlanModel.setUpdateBy(SecurityUtils.getUsername()); + sysRecipesPlanModel.setUpdateTime(DateUtils.getNowDate()); + return sysRecipesPlanModelMapper.updateRecipesModel(sysRecipesPlanModel); + } + + @Override + public int removeRecipesModel(Long id) { + return sysRecipesPlanModelMapper.removeRecipesModel(id); + } + + +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java index db6fb1ec8..40f9e6e77 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java @@ -308,4 +308,8 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { return sysRecipesPlanMapper.selectPlanListByCusId(cusId); } + public List selectRecipesModelList(SysRecipesPlan sysRecipesPlan) { + return sysRecipesPlanMapper.selectRecipesModelList(sysRecipesPlan); + } + } \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml index 3a114d26f..2b98a4ca1 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml @@ -157,11 +157,9 @@ FROM sys_recipes_plan srp LEFT JOIN sys_order sr ON sr.order_id = srp.order_id LEFT JOIN sys_customer sc ON sc.id = srp.cus_id - LEFT JOIN sys_user su_nutritionist ON su_nutritionist.user_id = sr.nutritionist_id AND su_nutritionist.del_flag - = 0 - LEFT JOIN sys_user su_nutritionist_assis ON su_nutritionist_assis.user_id = sr.nutri_assis_id AND - su_nutritionist_assis.del_flag = 0 - WHERE srp.del_flag = 0 and sr.del_flag = 0 + LEFT JOIN sys_user su_nutritionist ON su_nutritionist.user_id = sr.nutritionist_id AND su_nutritionist.del_flag = 0 + LEFT JOIN sys_user su_nutritionist_assis ON su_nutritionist_assis.user_id = sr.nutri_assis_id AND su_nutritionist_assis.del_flag = 0 + WHERE srp.del_flag = 0 AND sr.del_flag = 0 AND srp.type = 0 AND srp.order_id = #{orderId} AND srp.send_flag = #{sendFlag} AND (sc.name like concat('%',#{customer},'%') OR sc.phone like @@ -205,7 +203,8 @@ select id, num_day from sys_customer_daily_menu where recipes_id=#{recipes_id} order by num_day asc + \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanModelMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanModelMapper.xml new file mode 100644 index 000000000..33f906e92 --- /dev/null +++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanModelMapper.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + insert into sys_recipes_plan_model + + nutri_assis_id, + nutritionist_id, + create_time, + create_by, + update_time, + update_by, + remark, + review_status, + + + #{nutriAssisId}, + #{nutritionistId}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{remark}, + #{reviewStatus}, + + + + + update sys_recipes_plan_model + + nutri_assis_id = #{nutriAssisId}, + nutritionist_id = #{nutritionistId}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + remark = #{remark}, + review_status = #{reviewStatus}, + + where id = #{id} + + + + update sys_recipes_plan_model set del_flag=1 where id = #{id} + + + \ No newline at end of file diff --git a/stdiet-ui/src/api/custom/recipesPlanModel.js b/stdiet-ui/src/api/custom/recipesPlanModel.js new file mode 100644 index 000000000..dac431cb8 --- /dev/null +++ b/stdiet-ui/src/api/custom/recipesPlanModel.js @@ -0,0 +1,33 @@ +import request from "@/utils/request"; + +export function listRecipesModel(query) { + return request({ + url: "/recipes/model/list", + method: "get", + params: query + }); +} + +export function addRecipesModel(data){ + return request({ + url: "/recipes/model/add", + method: "post", + data: data + }); +} + +export function updateRecipesModel(data) { + return request({ + url: "/recipes/model/update", + method: "put", + data: data + }); +} + + +export function deleteRecipesModel(id) { + return request({ + url: "/recipes/model/delete/" + id, + method: "get" + }); +} diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue index 79e5821ad..8c9c0264c 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue @@ -12,7 +12,7 @@ diff --git a/stdiet-ui/src/views/custom/recipesModel/index.vue b/stdiet-ui/src/views/custom/recipesModel/index.vue new file mode 100644 index 000000000..1a1b71554 --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesModel/index.vue @@ -0,0 +1,331 @@ + + + + + +