diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java index af318f2..18c8bde 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java @@ -3,19 +3,25 @@ package org.jeecg.modules.system.controller; import java.util.Arrays; import java.util.Date; +import java.util.List; import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.system.entity.SysDict; import org.jeecg.modules.system.entity.SysDictItem; import org.jeecg.modules.system.service.ISysDictItemService; +import org.jeecg.modules.system.service.ISysDictService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.RequestBody; @@ -38,6 +44,7 @@ import lombok.extern.slf4j.Slf4j; * @Author zhangweijian * @since 2018-12-28 */ +@Api(tags="字典明细表") @RestController @RequestMapping("/sys/dictItem") @Slf4j @@ -46,6 +53,9 @@ public class SysDictItemController { @Autowired private ISysDictItemService sysDictItemService; + @Autowired + private ISysDictService sysDictService; + /** * @功能:查询字典数据 * @param sysDictItem @@ -67,6 +77,18 @@ public class SysDictItemController { return result; } + @AutoLog(value = "字典表明细-查询") + @ApiOperation(value="字典表明细-查询", notes="根据字典名称查所有明细") + @RequestMapping(value = "/listByDictCode", method = RequestMethod.GET) + public Result<List<SysDictItem>> listByDictCode(String dictCode, HttpServletRequest req) { + LambdaQueryWrapper<SysDict> query = Wrappers.lambdaQuery(); + query.eq(SysDict::getDictCode, dictCode); + SysDict dict = sysDictService.getOne(query); + LambdaQueryWrapper<SysDictItem> itemQuery = Wrappers.lambdaQuery(); + itemQuery.eq(SysDictItem::getDictId, dict.getId()).orderByAsc(SysDictItem::getSortOrder); + return Result.ok(sysDictItemService.list(itemQuery)); + } + /** * @功能:新增 * @return