toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:字典名称查询

Browse Source
This commit is contained in:
zhuxinru
2025-12-10 09:50:27 +08:00
parent 2a49a1e1a5
commit 2886ae7e0b
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/src/main/java/com/sdm/system/controller/SimulationSystemConfigController.java
View File

@@ -93,9 +93,9 @@ public class SimulationSystemConfigController implements ISysConfigFeignClient {
@GetMapping(value = "/getDictionaryClass") @GetMapping(value = "/getDictionaryClass")
@ResponseBody @ResponseBody
SdmResponse getDictionaryDefineClass(@RequestParam(required = false) String titleName,@RequestParam(required = false) String className,int current,int size) SdmResponse getDictionaryDefineClass(@RequestParam(required = false) String titleName,@RequestParam(required = false) String className,@RequestParam(required = false) String dictName,int current,int size)
{ {
return service.queryDictionaryDefineClass(titleName,className,current,size); return service.queryDictionaryDefineClass(titleName,className,dictName,current,size);
} }
@GetMapping(value = "/getDictionaryClassDetail") @GetMapping(value = "/getDictionaryClassDetail")

3
system/src/main/java/com/sdm/system/dao/SimulationSystemMapper.java
View File

@@ -20,6 +20,9 @@ public interface SimulationSystemMapper {
@Select("SELECT * FROM simulation_data_dictionary WHERE tenantId=#{tenantId}") @Select("SELECT * FROM simulation_data_dictionary WHERE tenantId=#{tenantId}")
List<DataDictionary> getAllDictionaryData(@Param("tenantId") long tenantId); List<DataDictionary> getAllDictionaryData(@Param("tenantId") long tenantId);
@Select("SELECT * FROM simulation_data_dictionary WHERE tenantId = #{tenantId} AND dictName like CONCAT('%',#{dictName},'%')")
List<DataDictionary> queryDictionaryClassByDictName(@Param("dictName") String dictName, @Param("tenantId") long tenantId);
@Delete("DELETE FROM simulation_data_dictionary WHERE dictClass=#{dictClass} AND tenantId=#{tenantId}") @Delete("DELETE FROM simulation_data_dictionary WHERE dictClass=#{dictClass} AND tenantId=#{tenantId}")
int deleteDictionaryClassItems(@Param("dictClass")String dictClass,@Param("tenantId") long tenantId); int deleteDictionaryClassItems(@Param("dictClass")String dictClass,@Param("tenantId") long tenantId);

2
system/src/main/java/com/sdm/system/service/ISimulationSystemConfigService.java
View File

@@ -31,7 +31,7 @@ public interface ISimulationSystemConfigService {
SdmResponse deleteDictionaryDefineClass(String uuid); SdmResponse deleteDictionaryDefineClass(String uuid);
SdmResponse queryDictionaryDefineClass(String titleName, String className, int current, int size); SdmResponse queryDictionaryDefineClass(String titleName, String className, String dictName, int current, int size);
SdmResponse queryDictinaryClassDetail(String uuid); SdmResponse queryDictinaryClassDetail(String uuid);

12
system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java
View File

@@ -187,8 +187,9 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
* 查询所有定义的字典分类 * 查询所有定义的字典分类
* @return * @return
*/ */
public SdmResponse queryDictionaryDefineClass(String titleName,String className,int pageNo,int size) public SdmResponse queryDictionaryDefineClass(String titleName,String className,String dictName,int pageNo,int size)
{ {
long tenantId = ThreadLocalContext.getTenantId();
SdmResponse response = SdmResponse.success(); SdmResponse response = SdmResponse.success();
String condition = " 1"; String condition = " 1";
if(bStringNotBlank(titleName)) if(bStringNotBlank(titleName))
@@ -199,7 +200,14 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
{ {
condition += " AND className LIKE '%"+className+"%'"; condition += " AND className LIKE '%"+className+"%'";
} }
long tenantId = ThreadLocalContext.getTenantId(); if(bStringNotBlank(dictName))
{
List<DataDictionary> dictionaries = mapper.queryDictionaryClassByDictName(dictName, tenantId);
if (CollectionUtils.isNotEmpty(dictionaries)) {
String dictClass = dictionaries.stream().map(DataDictionary::getDictClass).collect(Collectors.joining("','"));
condition += " AND className IN ('" + dictClass + "')";
}
}
int count = mapper.queryDictionaryClassTotal(condition,tenantId); int count = mapper.queryDictionaryClassTotal(condition,tenantId);
int pos = (pageNo-1)*size; int pos = (pageNo-1)*size;
List<DictionaryClass> classes = mapper.queryAllDictionaryClass(condition,pos,size,tenantId); List<DictionaryClass> classes = mapper.queryAllDictionaryClass(condition,pos,size,tenantId);