From 35a36f60cdbd9ef3bf2ab7be9f418f988c93c5eb Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期五, 21 四月 2023 17:05:02 +0800 Subject: [PATCH] 1、主题库定义相关代码。 2、枚举定义相关代码移植修改。 --- Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/DictController.java | 77 +++++++++++++++++++++++--------------- 1 files changed, 46 insertions(+), 31 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/DictBizOmdController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/DictController.java similarity index 65% rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/DictBizOmdController.java rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/DictController.java index 228126b..7b65fa2 100644 --- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/DictBizOmdController.java +++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/DictController.java @@ -17,11 +17,13 @@ package com.vci.ubcs.omd.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.vci.ubcs.omd.entity.DictBizM; -import com.vci.ubcs.omd.service.IDictBizService; -import com.vci.ubcs.omd.vo.DictBizMVO; -import com.vci.ubcs.omd.wrapper.DictBizWrapper; +import com.vci.ubcs.common.constant.CommonConstant; +import com.vci.ubcs.omd.entity.Dict; +import com.vci.ubcs.omd.service.IDictService; +import com.vci.ubcs.omd.vo.DictVO; +import com.vci.ubcs.omd.wrapper.DictWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; @@ -30,6 +32,7 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.StringPool; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -47,11 +50,11 @@ @NonDS @RestController @AllArgsConstructor -@RequestMapping("/dict-biz") -@Api(value = "涓氬姟瀛楀吀", tags = "涓氬姟瀛楀吀") -public class DictBizOmdController extends BladeController { +@RequestMapping("/dict") +@Api(value = "鏋氫妇瀹氫箟", tags = "鏋氫妇瀹氫箟") +public class DictController extends BladeController { - private final IDictBizService dictService; + private final IDictService dictService; /** * 璇︽儏 @@ -59,9 +62,9 @@ @GetMapping("/detail") @ApiOperationSupport(order = 1) @ApiOperation(value = "璇︽儏", notes = "浼犲叆dict") - public R<DictBizMVO> detail(DictBizM dict) { - DictBizM detail = dictService.getOne(Condition.getQueryWrapper(dict)); - return R.data(DictBizWrapper.build().entityVO(detail)); + public R<DictVO> detail(Dict dict) { + Dict detail = dictService.getOne(Condition.getQueryWrapper(dict)); + return R.data(DictWrapper.build().entityVO(detail)); } /** @@ -69,14 +72,14 @@ */ @GetMapping("/list") @ApiImplicitParams({ - @ApiImplicitParam(name = "code", value = "瀛楀吀缂栧彿", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "dictValue", value = "瀛楀吀鍚嶇О", paramType = "query", dataType = "string") + @ApiImplicitParam(name = "code", value = "鏋氫妇缂栧彿", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "dictValue", value = "鏋氫妇鍚嶇О", paramType = "query", dataType = "string") }) @ApiOperationSupport(order = 2) @ApiOperation(value = "鍒楄〃", notes = "浼犲叆dict") - public R<List<DictBizMVO>> list(@ApiIgnore @RequestParam Map<String, Object> dict) { - List<DictBizM> list = dictService.list(Condition.getQueryWrapper(dict, DictBizM.class).lambda().orderByAsc(DictBizM::getSort)); - return R.data(DictBizWrapper.build().listNodeVO(list)); + public R<List<DictVO>> list(@ApiIgnore @RequestParam Map<String, Object> dict) { + List<Dict> list = dictService.list(Condition.getQueryWrapper(dict, Dict.class).lambda().orderByAsc(Dict::getSort)); + return R.data(DictWrapper.build().listNodeVO(list)); } /** @@ -84,12 +87,12 @@ */ @GetMapping("/parent-list") @ApiImplicitParams({ - @ApiImplicitParam(name = "code", value = "瀛楀吀缂栧彿", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "dictValue", value = "瀛楀吀鍚嶇О", paramType = "query", dataType = "string") + @ApiImplicitParam(name = "code", value = "鏋氫妇缂栧彿", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "dictValue", value = "鏋氫妇鍚嶇О", paramType = "query", dataType = "string") }) @ApiOperationSupport(order = 3) @ApiOperation(value = "鍒楄〃", notes = "浼犲叆dict") - public R<IPage<DictBizMVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> dict, Query query) { + public R<IPage<DictVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> dict, Query query) { return R.data(dictService.parentList(dict, query)); } @@ -104,7 +107,7 @@ }) @ApiOperationSupport(order = 4) @ApiOperation(value = "鍒楄〃", notes = "浼犲叆dict") - public R<List<DictBizMVO>> childList(@ApiIgnore @RequestParam Map<String, Object> dict, @RequestParam(required = false, defaultValue = "-1") Long parentId) { + public R<List<DictVO>> childList(@ApiIgnore @RequestParam Map<String, Object> dict, @RequestParam(required = false, defaultValue = "-1") Long parentId) { return R.data(dictService.childList(dict, parentId)); } @@ -114,8 +117,8 @@ @GetMapping("/tree") @ApiOperationSupport(order = 5) @ApiOperation(value = "鏍戝舰缁撴瀯", notes = "鏍戝舰缁撴瀯") - public R<List<DictBizMVO>> tree() { - List<DictBizMVO> tree = dictService.tree(); + public R<List<DictVO>> tree() { + List<DictVO> tree = dictService.tree(); return R.data(tree); } @@ -125,8 +128,8 @@ @GetMapping("/parent-tree") @ApiOperationSupport(order = 5) @ApiOperation(value = "鏍戝舰缁撴瀯", notes = "鏍戝舰缁撴瀯") - public R<List<DictBizMVO>> parentTree() { - List<DictBizMVO> tree = dictService.parentTree(); + public R<List<DictVO>> parentTree() { + List<DictVO> tree = dictService.parentTree(); return R.data(tree); } @@ -136,7 +139,7 @@ @PostMapping("/submit") @ApiOperationSupport(order = 6) @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆dict") - public R submit(@Valid @RequestBody DictBizM dict) { + public R submit(@Valid @RequestBody Dict dict) { CacheUtil.clear(DICT_CACHE); return R.status(dictService.submit(dict)); } @@ -159,8 +162,8 @@ @GetMapping("/dictionary") @ApiOperationSupport(order = 8) @ApiOperation(value = "鑾峰彇瀛楀吀", notes = "鑾峰彇瀛楀吀") - public R<List<DictBizM>> dictionary(String code) { - List<DictBizM> tree = dictService.getList(code); + public R<List<Dict>> dictionary(String code) { + List<Dict> tree = dictService.getList(code); return R.data(tree); } @@ -170,9 +173,9 @@ @GetMapping("/dictionary-tree") @ApiOperationSupport(order = 9) @ApiOperation(value = "鑾峰彇瀛楀吀鏍�", notes = "鑾峰彇瀛楀吀鏍�") - public R<List<DictBizMVO>> dictionaryTree(String code) { - List<DictBizM> tree = dictService.getList(code); - return R.data(DictBizWrapper.build().listNodeVO(tree)); + public R<List<DictVO>> dictionaryTree(String code) { + List<Dict> tree = dictService.getList(code); + return R.data(DictWrapper.build().listNodeVO(tree)); } /** @@ -181,9 +184,21 @@ @PostMapping("/check") @ApiOperationSupport(order = 6) @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆dict") - public R checkOrInsert(@Valid @RequestBody DictBizM dict) { + public R checkOrInsert(@Valid @RequestBody Dict dict) { CacheUtil.clear(DICT_CACHE); return dictService.checkOrInsert(dict); } + /** + * 瀛楀吀閿�煎垪琛� + */ + @GetMapping("/select") + @ApiOperationSupport(order = 10) + @ApiOperation(value = "瀛楀吀閿�煎垪琛�", notes = "瀛楀吀閿�煎垪琛�") + public R<List<Dict>> select() { + List<Dict> list = dictService.list(Wrappers.<Dict>query().lambda().eq(Dict::getParentId, CommonConstant.TOP_PARENT_ID)); + list.forEach(dict -> dict.setDictValue(dict.getCode() + StringPool.COLON + StringPool.SPACE + dict.getDictValue())); + return R.data(list); + } + } -- Gitblit v1.9.3