lbqms.git - Gitblit

			@@ -10,6 +10,8 @@
			import com.ruoyi.common.mybatis.core.page.TableDataInfo;
			import com.ruoyi.common.log.enums.BusinessType;
			import com.ruoyi.common.excel.utils.ExcelUtil;
			import com.ruoyi.system.domain.bo.SysDictDataBo;
			import com.ruoyi.system.domain.vo.SysDictDataVo;
			import com.ruoyi.system.service.ISysDictDataService;
			import com.ruoyi.system.service.ISysDictTypeService;
			import lombok.RequiredArgsConstructor;
			@@ -39,7 +41,7 @@
			*/
			@SaCheckPermission("system:dict:list")
			@GetMapping("/list")
			public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
			public TableDataInfo<SysDictDataVo> list(SysDictDataBo dictData, PageQuery pageQuery) {
			return dictDataService.selectPageDictDataList(dictData, pageQuery);
			}

			@@ -49,9 +51,9 @@
			@Log(title = "字典数据", businessType = BusinessType.EXPORT)
			@SaCheckPermission("system:dict:export")
			@PostMapping("/export")
			public void export(SysDictData dictData, HttpServletResponse response) {
			List<SysDictData> list = dictDataService.selectDictDataList(dictData);
			ExcelUtil.exportExcel(list, "字典数据", SysDictData.class, response);
			public void export(SysDictDataBo dictData, HttpServletResponse response) {
			List<SysDictDataVo> list = dictDataService.selectDictDataList(dictData);
			ExcelUtil.exportExcel(list, "字典数据", SysDictDataVo.class, response);
			}

			/**
			@@ -61,7 +63,7 @@
			*/
			@SaCheckPermission("system:dict:query")
			@GetMapping(value = "/{dictCode}")
			public R<SysDictData> getInfo(@PathVariable Long dictCode) {
			public R<SysDictDataVo> getInfo(@PathVariable Long dictCode) {
			return R.ok(dictDataService.selectDictDataById(dictCode));
			}

			@@ -71,8 +73,8 @@
			* @param dictType 字典类型
			*/
			@GetMapping(value = "/type/{dictType}")
			public R<List<SysDictData>> dictType(@PathVariable String dictType) {
			List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
			public R<List<SysDictDataVo>> dictType(@PathVariable String dictType) {
			List<SysDictDataVo> data = dictTypeService.selectDictDataByType(dictType);
			if (ObjectUtil.isNull(data)) {
			data = new ArrayList<>();
			}
			@@ -85,7 +87,7 @@
			@SaCheckPermission("system:dict:add")
			@Log(title = "字典数据", businessType = BusinessType.INSERT)
			@PostMapping
			public R<Void> add(@Validated @RequestBody SysDictData dict) {
			public R<Void> add(@Validated @RequestBody SysDictDataBo dict) {
			dictDataService.insertDictData(dict);
			return R.ok();
			}
			@@ -96,7 +98,7 @@
			@SaCheckPermission("system:dict:edit")
			@Log(title = "字典数据", businessType = BusinessType.UPDATE)
			@PutMapping
			public R<Void> edit(@Validated @RequestBody SysDictData dict) {
			public R<Void> edit(@Validated @RequestBody SysDictDataBo dict) {
			dictDataService.updateDictData(dict);
			return R.ok();
			}