暂存

stdiet-admin/src/main/filters/dev/application.yml

@@ -83,7 +83,7 @@ spring:
       # 主库数据源
       master:
         url: jdbc:mysql://localhost:3306/stdiet_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        password: Ttj4fAHU
+        password: S6QAUjVMFwWe
         username: root
       slave:
         # 从数据源开关/默认关闭

stdiet-admin/src/main/filters/local/application.yml

@@ -83,7 +83,7 @@ spring:
       # 主库数据源
       master:
         url: jdbc:mysql://47.115.23.82:3306/stdiet_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        password: Ttj4fAHU
+        password: S6QAUjVMFwWe
         username: root
       slave:
         # 从数据源开关/默认关闭

stdiet-admin/src/main/filters/prod/application.yml

@@ -83,7 +83,7 @@ spring:
       # 主库数据源
       master:
         url: jdbc:mysql://localhost:3306/stdiet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        password: Ttj4fAHU
+        password: S6QAUjVMFwWe
         username: root
       slave:
         # 从数据源开关/默认关闭

stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysDishesController.java

@@ -0,0 +1,103 @@
+package com.stdiet.web.controller.custom;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.stdiet.common.annotation.Log;
+import com.stdiet.common.core.controller.BaseController;
+import com.stdiet.common.core.domain.AjaxResult;
+import com.stdiet.common.enums.BusinessType;
+import com.stdiet.custom.domain.SysDishes;
+import com.stdiet.custom.service.ISysDishesService;
+import com.stdiet.common.utils.poi.ExcelUtil;
+import com.stdiet.common.core.page.TableDataInfo;
+
+/**
+ * 菜品Controller
+ * 
+ * @author wonder
+ * @date 2020-12-28
+ */
+@RestController
+@RequestMapping("/custom/dishes")
+public class SysDishesController extends BaseController
+{
+    @Autowired
+    private ISysDishesService sysDishesService;
+
+    /**
+     * 查询菜品列表
+     */
+    @PreAuthorize("@ss.hasPermi('custom:dishes:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDishes sysDishes)
+    {
+        startPage();
+        List<SysDishes> list = sysDishesService.selectSysDishesList(sysDishes);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出菜品列表
+     */
+    @PreAuthorize("@ss.hasPermi('custom:dishes:export')")
+    @Log(title = "菜品", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SysDishes sysDishes)
+    {
+        List<SysDishes> list = sysDishesService.selectSysDishesList(sysDishes);
+        ExcelUtil<SysDishes> util = new ExcelUtil<SysDishes>(SysDishes.class);
+        return util.exportExcel(list, "dishes");
+    }
+
+    /**
+     * 获取菜品详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('custom:dishes:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(sysDishesService.selectSysDishesById(id));
+    }
+
+    /**
+     * 新增菜品
+     */
+    @PreAuthorize("@ss.hasPermi('custom:dishes:add')")
+    @Log(title = "菜品", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysDishes sysDishes)
+    {
+        return toAjax(sysDishesService.insertSysDishes(sysDishes));
+    }
+
+    /**
+     * 修改菜品
+     */
+    @PreAuthorize("@ss.hasPermi('custom:dishes:edit')")
+    @Log(title = "菜品", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysDishes sysDishes)
+    {
+        return toAjax(sysDishesService.updateSysDishes(sysDishes));
+    }
+
+    /**
+     * 删除菜品
+     */
+    @PreAuthorize("@ss.hasPermi('custom:dishes:remove')")
+    @Log(title = "菜品", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sysDishesService.deleteSysDishesByIds(ids));
+    }
+}

stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysIngredientController.java

@@ -37,8 +37,8 @@ public class SysIngredientController extends BaseController
      * 查询食材列表
      */
     @PreAuthorize("@ss.hasPermi('custom:ingredient:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysIngredient sysIngredient)
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody SysIngredient sysIngredient)
     {
         startPage();
         List<SysIngredient> list = sysIngredientService.selectSysIngredientList(sysIngredient);