From f84113b4aa191a152050a9c0d62ceaec27eaa4b8 Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Fri, 22 Jan 2021 16:14:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AD=97=E5=85=B8=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=E3=80=91=E4=BC=98=E5=8C=96=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=92=8C=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/dict/DictTypeViewController.java | 25 ++++--- .../guns/modular/dict/DictViewController.java | 67 +++++-------------- 2 files changed, 29 insertions(+), 63 deletions(-) diff --git a/src/main/java/cn/stylefeng/guns/modular/dict/DictTypeViewController.java b/src/main/java/cn/stylefeng/guns/modular/dict/DictTypeViewController.java index a771cad7..f00f5e56 100644 --- a/src/main/java/cn/stylefeng/guns/modular/dict/DictTypeViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/dict/DictTypeViewController.java @@ -15,38 +15,41 @@ import org.springframework.stereotype.Controller; @ApiResource(name = "字典类型管理相关的界面渲染") public class DictTypeViewController { + private String PREFIX = "/modular/system/dict/"; + /** - * 字典类型管理-字典类型-视图 + * 字典管理-视图 * - * @author huangyao - * @date 2021/1/6 21:08 + * @author chenjinlong + * @date 2021/1/22 16:09 */ @GetResource(name = "字典类型管理-列表-视图", path = "/view/dictType") public String indexView() { - //return "/modular/system/dictType/dictType.html"; - return "/modular/system/dict/dictionary.html"; + return PREFIX + "dictType.html"; } /** * 字典类型管理-添加-视图 * - * @author huangyao - * @date 2021/1/6 21:25 + * @author chenjinlong + * @date 2021/1/22 16:09 */ @GetResource(name = "字典类型管理-添加-视图", path = "/view/dictType/addView") public String addView() { - return "/modular/system/dict/dictType_add.html"; + return PREFIX + "dictType_add.html"; } + /** * 字典类型管理-编辑-视图 * - * @author huangyao - * @date 2021/1/6 21:26 + * @author chenjinlong + * @date 2021/1/22 16:09 */ @GetResource(name = "字典类型管理-编辑-视图", path = "/view/dictType/editView") public String editView() { - return "/modular/system/dict/dictType_edit.html"; + return PREFIX + "dictType_edit.html"; } + } diff --git a/src/main/java/cn/stylefeng/guns/modular/dict/DictViewController.java b/src/main/java/cn/stylefeng/guns/modular/dict/DictViewController.java index e681591c..65826e7f 100644 --- a/src/main/java/cn/stylefeng/guns/modular/dict/DictViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/dict/DictViewController.java @@ -1,90 +1,53 @@ package cn.stylefeng.guns.modular.dict; -import cn.stylefeng.roses.kernel.dict.modular.entity.SysDict; -import cn.stylefeng.roses.kernel.dict.modular.entity.SysDictType; -import cn.stylefeng.roses.kernel.dict.modular.service.DictService; -import cn.stylefeng.roses.kernel.dict.modular.service.DictTypeService; import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - -import javax.annotation.Resource; /** * 字典视图控制器 * - * @author huangyao - * @date 2021/1/16 19:07 + * @author chenjinlong + * @date 2021/1/22 16:09 */ @Controller @ApiResource(name = "字典管理相关的界面渲染") public class DictViewController { - @Resource - private DictService dictService; - @Resource - private DictTypeService dictTypeService; + private String PREFIX = "/modular/system/dict/"; /** * 字典管理-列表-视图 * - * @author huangyao - * @date 2021/1/9 22:37 + * @author chenjinlong + * @date 2021/1/22 16:09 */ @GetResource(name = "字典管理-列表-视图", path = "/view/dict") - public ModelAndView indexView(ModelAndView view, @RequestParam Long dictTypeId) { - SysDictType dictType = dictTypeService.getById(dictTypeId); - - view.addObject("dictTypeId", dictType.getDictTypeId()); - view.addObject("dictTypeName", dictType.getDictTypeName()); - view.addObject("dictTypeCode", dictType.getDictTypeCode()); - view.setViewName("/modular/system/dict/dict.html"); - - return view; + public String indexView() { + return PREFIX + "dict.html"; } /** * 字典管理-添加-视图 * - * @author huangyao - * @date 2021/1/9 22:37 + * @author chenjinlong + * @date 2021/1/22 16:09 */ @GetResource(name = "字典管理-添加-视图", path = "/view/dict/addView") - public ModelAndView addView(ModelAndView view, @RequestParam Long dictTypeId) { - SysDictType dictType = dictTypeService.getById(dictTypeId); - - view.addObject("dictTypeName", dictType.getDictTypeName()); - view.addObject("dictTypeId", dictType.getDictTypeId()); - view.addObject("dictTypeCode", dictType.getDictTypeCode()); - view.setViewName("/modular/system/dict/dict_add.html"); - - return view; + public String addView() { + return PREFIX + "dict_add.html"; } /** * 字典管理-编辑-视图 * - * @author huangyao - * @date 2021/1/9 22:38 + * @author chenjinlong + * @date 2021/1/22 16:09 */ @GetResource(name = "字典管理-编辑-视图", path = "/view/dict/editView") - public ModelAndView editView(ModelAndView view, @RequestParam Long dictId) { - SysDict dict = dictService.getById(dictId); - - // 根据字典获取字典类型 - SysDictType dictType = dictTypeService.getOne(new QueryWrapper().lambda().eq(SysDictType::getDelFlag, "N") - .eq(SysDictType::getDictTypeCode, dict.getDictTypeCode())); - - view.addObject("dictTypeName", dictType.getDictTypeName()); - view.addObject("dictId", dictId); - view.addObject("dictTypeCode", dictType.getDictTypeCode()); - view.setViewName("/modular/system/dict/dict_edit.html"); - - return view; + public String editView() { + return PREFIX + "dict_edit.html"; } }