LIVE_YE 1 anno fa
parent
commit
47c3efcaf8

+ 105 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/recipe/SchoolRecipeController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.recipe;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.domain.vo.SchoolRecipeVo;
+import org.dromara.system.domain.bo.SchoolRecipeBo;
+import org.dromara.system.service.ISchoolRecipeService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 学校食谱
+ *
+ * @author boman
+ * @date 2023-09-22
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/recipe")
+public class SchoolRecipeController extends BaseController {
+
+    private final ISchoolRecipeService schoolRecipeService;
+
+    /**
+     * 查询学校食谱列表
+     */
+    @SaCheckPermission("system:recipe:list")
+    @GetMapping("/list")
+    public TableDataInfo<SchoolRecipeVo> list(SchoolRecipeBo bo, PageQuery pageQuery) {
+        return schoolRecipeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出学校食谱列表
+     */
+    @SaCheckPermission("system:recipe:export")
+    @Log(title = "学校食谱", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SchoolRecipeBo bo, HttpServletResponse response) {
+        List<SchoolRecipeVo> list = schoolRecipeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "学校食谱", SchoolRecipeVo.class, response);
+    }
+
+    /**
+     * 获取学校食谱详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:recipe:query")
+    @GetMapping("/{id}")
+    public R<SchoolRecipeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(schoolRecipeService.queryById(id));
+    }
+
+    /**
+     * 新增学校食谱
+     */
+    @SaCheckPermission("system:recipe:add")
+    @Log(title = "学校食谱", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SchoolRecipeBo bo) {
+        return toAjax(schoolRecipeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改学校食谱
+     */
+    @SaCheckPermission("system:recipe:edit")
+    @Log(title = "学校食谱", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SchoolRecipeBo bo) {
+        return toAjax(schoolRecipeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除学校食谱
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:recipe:remove")
+    @Log(title = "学校食谱", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(schoolRecipeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

+ 62 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SchoolRecipe.java

@@ -0,0 +1,62 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 学校食谱对象 school_recipe
+ *
+ * @author boman
+ * @date 2023-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("school_recipe")
+public class SchoolRecipe extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 学校ID
+     */
+    private Long schoolId;
+
+    /**
+     * 附件名称
+     */
+    private String name;
+
+    /**
+     * 附件地址
+     */
+    private String url;
+
+    /**
+     * 就餐类型(1:早餐,2:午餐,3:晚餐,4:宵夜)
+     */
+    private String type;
+
+    /**
+     * 上传日期
+     */
+    private String createDate;
+
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

+ 65 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SchoolRecipeBo.java

@@ -0,0 +1,65 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.SchoolRecipe;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 学校食谱业务对象 school_recipe
+ *
+ * @author boman
+ * @date 2023-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SchoolRecipe.class, reverseConvertGenerate = false)
+public class SchoolRecipeBo extends BaseEntity {
+
+    /**
+     *
+     */
+    //@NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 学校ID
+     */
+    //@NotNull(message = "学校ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long schoolId;
+
+    /**
+     * 附件名称
+     */
+    //@NotBlank(message = "附件名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 附件地址
+     */
+    //@NotBlank(message = "附件地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String url;
+
+    /**
+     * 就餐类型(1:早餐,2:午餐,3:晚餐,4:宵夜)
+     */
+    private String type;
+
+    /**
+     * 上传日期
+     */
+    //@NotBlank(message = "上传日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String createDate;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

+ 73 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SchoolRecipeVo.java

@@ -0,0 +1,73 @@
+package org.dromara.system.domain.vo;
+
+import org.dromara.system.domain.SchoolRecipe;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 学校食谱视图对象 school_recipe
+ *
+ * @author boman
+ * @date 2023-09-22
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SchoolRecipe.class)
+public class SchoolRecipeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 学校ID
+     */
+    @ExcelProperty(value = "学校ID")
+    private Long schoolId;
+
+    /**
+     * 附件名称
+     */
+    @ExcelProperty(value = "附件名称")
+    private String name;
+
+    /**
+     * 附件地址
+     */
+    @ExcelProperty(value = "附件地址")
+    private String url;
+
+    /**
+     * 上传日期
+     */
+    @ExcelProperty(value = "上传日期")
+    private String createDate;
+
+    /**
+     * 就餐类型(1:早餐,2:午餐,3:晚餐,4:宵夜)
+     */
+    private String type;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

+ 15 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SchoolRecipeMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.SchoolRecipe;
+import org.dromara.system.domain.vo.SchoolRecipeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 学校食谱Mapper接口
+ *
+ * @author boman
+ * @date 2023-09-22
+ */
+public interface SchoolRecipeMapper extends BaseMapperPlus<SchoolRecipe, SchoolRecipeVo> {
+
+}

+ 49 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISchoolRecipeService.java

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.SchoolRecipe;
+import org.dromara.system.domain.vo.SchoolRecipeVo;
+import org.dromara.system.domain.bo.SchoolRecipeBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 学校食谱Service接口
+ *
+ * @author boman
+ * @date 2023-09-22
+ */
+public interface ISchoolRecipeService {
+
+    /**
+     * 查询学校食谱
+     */
+    SchoolRecipeVo queryById(Long id);
+
+    /**
+     * 查询学校食谱列表
+     */
+    TableDataInfo<SchoolRecipeVo> queryPageList(SchoolRecipeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询学校食谱列表
+     */
+    List<SchoolRecipeVo> queryList(SchoolRecipeBo bo);
+
+    /**
+     * 新增学校食谱
+     */
+    Boolean insertByBo(SchoolRecipeBo bo);
+
+    /**
+     * 修改学校食谱
+     */
+    Boolean updateByBo(SchoolRecipeBo bo);
+
+    /**
+     * 校验并批量删除学校食谱信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 122 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SchoolRecipeServiceImpl.java

@@ -0,0 +1,122 @@
+package org.dromara.system.service.impl;
+
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.SchoolRecipeBo;
+import org.dromara.system.domain.vo.SchoolRecipeVo;
+import org.dromara.system.domain.SchoolRecipe;
+import org.dromara.system.mapper.SchoolRecipeMapper;
+import org.dromara.system.service.ISchoolRecipeService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 学校食谱Service业务层处理
+ *
+ * @author boman
+ * @date 2023-09-22
+ */
+@RequiredArgsConstructor
+@Service
+public class SchoolRecipeServiceImpl implements ISchoolRecipeService {
+
+    private final SchoolRecipeMapper baseMapper;
+
+    /**
+     * 查询学校食谱
+     */
+    @Override
+    public SchoolRecipeVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询学校食谱列表
+     */
+    @Override
+    public TableDataInfo<SchoolRecipeVo> queryPageList(SchoolRecipeBo bo, PageQuery pageQuery) {
+        if(StringUtils.isEmpty(bo.getCreateDate())){
+            bo.setCreateDate(DateUtils.getDate());
+        }
+        LambdaQueryWrapper<SchoolRecipe> lqw = buildQueryWrapper(bo);
+        Page<SchoolRecipeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询学校食谱列表
+     */
+    @Override
+    public List<SchoolRecipeVo> queryList(SchoolRecipeBo bo) {
+        LambdaQueryWrapper<SchoolRecipe> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SchoolRecipe> buildQueryWrapper(SchoolRecipeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SchoolRecipe> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSchoolId() != null, SchoolRecipe::getSchoolId, bo.getSchoolId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), SchoolRecipe::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SchoolRecipe::getUrl, bo.getUrl());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), SchoolRecipe::getType, bo.getType());
+        lqw.eq(StringUtils.isNotBlank(bo.getCreateDate()), SchoolRecipe::getCreateDate, bo.getCreateDate());
+        lqw.orderByDesc(SchoolRecipe::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增学校食谱
+     */
+    @Override
+    public Boolean insertByBo(SchoolRecipeBo bo) {
+        bo.setCreateDate(DateUtils.getDate());
+        bo.setSchoolId(LoginHelper.getDeptId());
+        SchoolRecipe add = MapstructUtils.convert(bo, SchoolRecipe.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改学校食谱
+     */
+    @Override
+    public Boolean updateByBo(SchoolRecipeBo bo) {
+        SchoolRecipe update = MapstructUtils.convert(bo, SchoolRecipe.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SchoolRecipe entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除学校食谱
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

+ 7 - 0
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SchoolRecipeMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SchoolRecipeMapper">
+
+</mapper>