From 16aa6099ea4b4296f401522df6c38fb0193c0ebf Mon Sep 17 00:00:00 2001 From: root Date: Tue, 15 Jul 2025 09:43:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ho/user/controller/DictController.java | 11 ++++++++--- .../java/com/ho/user/mapper/SysDictMapper.java | 2 +- .../main/java/com/ho/user/service/DictService.java | 4 ++-- .../com/ho/user/service/impl/DictServiceImpl.java | 14 +++++++------- .../com/ho/user/service/impl/UserServiceImpl.java | 4 ++-- .../com/ho/user/vo/req/DictTypeAndLabelReqVO.java | 3 +++ .../src/main/resources/mapper/SysDictMapper.xml | 12 +++++++++++- 7 files changed, 34 insertions(+), 16 deletions(-) diff --git a/user-service/src/main/java/com/ho/user/controller/DictController.java b/user-service/src/main/java/com/ho/user/controller/DictController.java index 90e2feb..e760700 100644 --- a/user-service/src/main/java/com/ho/user/controller/DictController.java +++ b/user-service/src/main/java/com/ho/user/controller/DictController.java @@ -2,6 +2,7 @@ package com.ho.user.controller; import com.ho.common.tools.annotation.LogAnnotation; import com.ho.common.tools.constant.ContextConstant; +import com.ho.common.tools.constant.RedisKeyConstant; import com.ho.common.tools.entity.PageVO; import com.ho.common.tools.exception.BaseResponseCode; import com.ho.common.tools.exception.BusinessException; @@ -16,6 +17,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.List; @@ -47,10 +49,12 @@ public class DictController { @PostMapping("typeList") @ApiOperation(value = "查询字典列表接口(根据类型)") // @LogAnnotation(title = "字典管理",action = "根据类型查询字典") - public DataResult dictList(@RequestBody @Valid DictSearchReqVO vo) { + public DataResult dictList(@RequestBody @Valid DictSearchReqVO vo,HttpServletRequest request) { + String lang =request.getHeader(RedisKeyConstant.User.LANG); DataResult result = DataResult.success(); DictTypeAndLabelReqVO typeAndLabelReqVO = new DictTypeAndLabelReqVO(); typeAndLabelReqVO.setType(vo.getType()); + typeAndLabelReqVO.setLang(lang); result.setData(dictService.selectDict(typeAndLabelReqVO)); return result; } @@ -75,9 +79,10 @@ public class DictController { @PostMapping("typeAll") @ApiOperation(value = "查询所有字典列表接口") - public DataResult> typeList() { + public DataResult> typeList(HttpServletRequest request) { + String lang =request.getHeader(RedisKeyConstant.User.LANG); DataResult> result = DataResult.success(); - result.setData(dictService.selectDictType()); + result.setData(dictService.selectDictType(lang)); return result; } diff --git a/user-service/src/main/java/com/ho/user/mapper/SysDictMapper.java b/user-service/src/main/java/com/ho/user/mapper/SysDictMapper.java index c859cd5..a2dc999 100644 --- a/user-service/src/main/java/com/ho/user/mapper/SysDictMapper.java +++ b/user-service/src/main/java/com/ho/user/mapper/SysDictMapper.java @@ -39,7 +39,7 @@ public interface SysDictMapper { SysSubDict selectBySubId(Integer id); - List selectSubDictByType(String type); + List selectSubDictByType(@Param("type") String type,@Param("lang") String lang); List selectSubDictByTypeList(@Param("typeList") List typeList); diff --git a/user-service/src/main/java/com/ho/user/service/DictService.java b/user-service/src/main/java/com/ho/user/service/DictService.java index 0d8ff76..83d1999 100644 --- a/user-service/src/main/java/com/ho/user/service/DictService.java +++ b/user-service/src/main/java/com/ho/user/service/DictService.java @@ -34,11 +34,11 @@ public interface DictService { // void deletedByType(String type); - List selectDictType(); + List selectDictType(String lang); SysSubDict selectSubDictByValue(DictAddReqVO vo); - List selectSubDictByType(String type); + List selectSubDictByType(String type,String lang); List selectSubDictByTypeList(List typeList); diff --git a/user-service/src/main/java/com/ho/user/service/impl/DictServiceImpl.java b/user-service/src/main/java/com/ho/user/service/impl/DictServiceImpl.java index e809bb3..2a97130 100644 --- a/user-service/src/main/java/com/ho/user/service/impl/DictServiceImpl.java +++ b/user-service/src/main/java/com/ho/user/service/impl/DictServiceImpl.java @@ -65,7 +65,7 @@ public class DictServiceImpl implements DictService { } int upDictRet = dictMapper.updateDict(dict); log.info("修改sys_dict记录数:" + upDictRet); - List sysSubDicts = selectSubDictByType(sysDict.getType()); + List sysSubDicts = selectSubDictByType(sysDict.getType(),null); int upSubDictRet = 0; for (SysSubDict sysSubDict : sysSubDicts) { sysSubDict.setType(vo.getType()); @@ -96,7 +96,7 @@ public class DictServiceImpl implements DictService { SysSubDict subDict = new SysSubDict(); BeanUtils.copyProperties(vo,subDict); - List sysSubDicts = selectSubDictByType(vo.getType()); + List sysSubDicts = selectSubDictByType(vo.getType(),null); if (sysSubDicts.size() == 0){ throw new BusinessException(BaseResponseCode.DICT_DELETED_EXISTS); } @@ -150,8 +150,8 @@ public class DictServiceImpl implements DictService { } @Override - public List selectSubDictByType(String type) { - List sysSubDicts = dictMapper.selectSubDictByType(type); + public List selectSubDictByType(String type,String lang) { + List sysSubDicts = dictMapper.selectSubDictByType(type,lang); return sysSubDicts; } @@ -166,7 +166,7 @@ public class DictServiceImpl implements DictService { SysDict sysDict = dictMapper.selectByType(vo.getType()); DictRespVo dictRespVo = new DictRespVo(); BeanUtils.copyProperties(sysDict,dictRespVo); - List sysSubDicts = selectSubDictByType(vo.getType()); + List sysSubDicts = selectSubDictByType(vo.getType(),vo.getLang()); dictRespVo.setList(sysSubDicts); return dictRespVo; } @@ -190,13 +190,13 @@ public class DictServiceImpl implements DictService { }*/ @Override - public List selectDictType() { + public List selectDictType(String lang) { List sysDicts = dictMapper.selectTypeAll(); List respVos = new ArrayList<>(); for (SysDict sysDict : sysDicts) { DictRespVo vo = new DictRespVo(); BeanUtils.copyProperties(sysDict,vo); - List sysSubDicts = selectSubDictByType(sysDict.getType()); + List sysSubDicts = selectSubDictByType(sysDict.getType(),lang); vo.setList(sysSubDicts); respVos.add(vo); } diff --git a/user-service/src/main/java/com/ho/user/service/impl/UserServiceImpl.java b/user-service/src/main/java/com/ho/user/service/impl/UserServiceImpl.java index 3793e45..e26e167 100644 --- a/user-service/src/main/java/com/ho/user/service/impl/UserServiceImpl.java +++ b/user-service/src/main/java/com/ho/user/service/impl/UserServiceImpl.java @@ -1115,7 +1115,7 @@ public class UserServiceImpl implements UserService { @Override public Map checkSpecialUser() { Map userMap = new HashMap<>(); - List sysSubDictList = dictService.selectSubDictByType(CommonConstant.SPECIAL_USER); + List sysSubDictList = dictService.selectSubDictByType(CommonConstant.SPECIAL_USER,null); for (SysSubDict sysSub:sysSubDictList) { userMap.put(sysSub.getValue(),sysSub.getValue()); } @@ -1125,7 +1125,7 @@ public class UserServiceImpl implements UserService { @Override public Map getSysSubDict(SysSubDictVO vo) { Map userMap = new HashMap<>(); - List sysSubDictList = dictService.selectSubDictByType(vo.getType()); + List sysSubDictList = dictService.selectSubDictByType(vo.getType(),null); for (SysSubDict sysSub:sysSubDictList) { if(CommonConstant.ONE.equals(vo.getKeyVal())){ userMap.put(sysSub.getLabel(),sysSub.getValue()); diff --git a/user-service/src/main/java/com/ho/user/vo/req/DictTypeAndLabelReqVO.java b/user-service/src/main/java/com/ho/user/vo/req/DictTypeAndLabelReqVO.java index 8a9c527..1325920 100644 --- a/user-service/src/main/java/com/ho/user/vo/req/DictTypeAndLabelReqVO.java +++ b/user-service/src/main/java/com/ho/user/vo/req/DictTypeAndLabelReqVO.java @@ -20,4 +20,7 @@ public class DictTypeAndLabelReqVO { @ApiModelProperty(value = "字典value类型") @NotBlank(message = "字典value类型不能为空") private String value; + + @ApiModelProperty(value = "中英切换") + private String lang; } diff --git a/user-service/src/main/resources/mapper/SysDictMapper.xml b/user-service/src/main/resources/mapper/SysDictMapper.xml index f33d2e4..2c99a04 100644 --- a/user-service/src/main/resources/mapper/SysDictMapper.xml +++ b/user-service/src/main/resources/mapper/SysDictMapper.xml @@ -9,6 +9,9 @@ id,label, type,`value`, sort, `desc`,create_time, update_time, deleted + + id,label_en label, type,`value`, sort, `desc`,create_time, update_time, deleted + select - + + + + + + + + from sys_sub_dict where type = #{type}