diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuappController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuappController.java index 99b8ab6..a5dddee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuappController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuappController.java @@ -95,6 +95,15 @@ public class SysMenuappController extends BaseController { @PreAuthorize("@ss.hasPermi('system:menuapp:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { + SysMenuapp detail = sysMenuappService.selectSysMenuappById(id); + return success(detail); + } + + /** + * 获取手机菜单详细信息 + */ + @GetMapping(value = "/detail/{id}") + public AjaxResult detail(@PathVariable("id") Long id) { SysMenuapp detail = sysMenuappService.selectSysMenuappById(id); TranslateUtils.translate(detail, false); return success(detail); @@ -105,7 +114,7 @@ public class SysMenuappController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:menuapp:add')") @Log(title = "手机菜单", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/add") public AjaxResult add(@RequestBody SysMenuapp sysMenuapp) { return toAjax(sysMenuappService.insertSysMenuapp(sysMenuapp)); } @@ -115,7 +124,7 @@ public class SysMenuappController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:menuapp:edit')") @Log(title = "手机菜单", businessType = BusinessType.UPDATE) - @PutMapping + @PostMapping("/update") public AjaxResult edit(@RequestBody SysMenuapp sysMenuapp) { return toAjax(sysMenuappService.updateSysMenuapp(sysMenuapp)); } @@ -125,7 +134,7 @@ public class SysMenuappController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:menuapp:remove')") @Log(title = "手机菜单", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @GetMapping("/delete/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(sysMenuappService.deleteSysMenuappByIds(ids)); } @@ -147,7 +156,7 @@ public class SysMenuappController extends BaseController { private AjaxResult respMenus(List list) { int size = list.size(); - List modle_name = DictUtils.getDictCache("modle_type"); + List modle_name = DictUtils.getDictCache("model_type"); Map modleNameOrderMap = modle_name.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictSort)); Map> groups = list.stream() .sorted(Comparator.comparing((x) -> modleNameOrderMap.get(((SysMenuapp) x).getModelType())) diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index a04aff3..983a397 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -274,7 +274,7 @@ #elseif($column.htmlType == "radio" && "" != $dictType) - + {{dict.label}} #elseif($column.htmlType == "radio" && $dictType) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuappMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuappMapper.xml index 2be7acf..b3f5b35 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuappMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuappMapper.xml @@ -167,18 +167,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"