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

系统参数配置新增字典类型

Browse Source
This commit is contained in:
gulongcheng
2025-12-08 11:40:23 +08:00
parent 99b18ab28a
commit 76a76d5ef7
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/sdm/common/entity/bo/DataDictionary.java
View File

@@ -11,10 +11,10 @@ public class DataDictionary extends BaseBean {
public String uuid;
public String dictName;
public String dictValue;
public String dictType;
public String valueType;
public String aliasName;
public String dictClass;
public String classType;
public int dictOrder;
public String comment;
public Long creator;

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

@@ -11,7 +11,7 @@ import java.util.List;
public interface SimulationSystemMapper {
@Insert("INSERT INTO simulation_data_dictionary(uuid,dictName,dictValue,dictOrder,valueType,aliasName,dictClass,comment,tenantId,creator) VALUES (#{dict.uuid},#{dict.dictName},#{dict.dictValue},#{dict.dictOrder},#{dict.valueType},#{dict.aliasName},#{dict.dictClass},#{dict.comment},#{dict.tenantId},#{dict.creator})")
@Insert("INSERT INTO simulation_data_dictionary(uuid,dictName,dictValue,dictOrder,valueType,aliasName,dictClass,dictClassType,comment,tenantId,creator) VALUES (#{dict.uuid},#{dict.dictName},#{dict.dictValue},#{dict.dictOrder},#{dict.valueType},#{dict.aliasName},#{dict.dictClass},#{dict.classType},#{dict.comment},#{dict.tenantId},#{dict.creator})")
int addDataDictionary(@Param("dict") DataDictionary dict);
@Select("SELECT * FROM simulation_data_dictionary WHERE dictClass=#{dictClass} AND tenantId=#{tenantId} ORDER BY dictOrder ASC")
@@ -26,8 +26,8 @@ public interface SimulationSystemMapper {
@Select("SELECT * FROM simulation_data_dictionary WHERE dictName=#{dictName} AND dictClass=#{dictClass} AND tenantId=#{tenantId} LIMIT 1")
DataDictionary queryDataDictionary(@Param("dictName")String dictName,@Param("dictClass")String dictClass,@Param("tenantId")long tenantId);
@Select("SELECT * FROM simulation_data_dictionary WHERE dictName=#{dictName} AND dictType=#{dictType} AND tenantId=#{tenantId} LIMIT 1")
DataDictionary queryDataDictionaryByDictTypeAndDictName(@Param("dictType")String dictType,@Param("dictName")String dictName,@Param("tenantId")long tenantId);
@Select("SELECT * FROM simulation_data_dictionary WHERE classType=#{classType} AND dictValue=#{dictValue} AND tenantId=#{tenantId} LIMIT 1")
DataDictionary queryDataDictionaryByDictTypeAndDictName(@Param("classType")String classType,@Param("dictValue")String dictValue,@Param("tenantId")long tenantId);
@Select("SELECT * FROM simulation_data_dictionary WHERE uuid=#{uuid}")
DataDictionary queryDictionaryDataDetail(@Param("uuid")String uuid);
@@ -41,7 +41,7 @@ public interface SimulationSystemMapper {
@Update("UPDATE simulation_data_dictionary SET dictValue=#{dict.dictValue},comment=#{dict.comment},valueType=#{dict.valueType},aliasName=#{dict.aliasName},dictOrder=#{dict.dictOrder} WHERE uuid=#{dict.uuid}")
int updateDictionaryData(@Param("dict")DataDictionary dict);
@Insert("INSERT INTO simulation_dictionary_class(uuid,className,titleName,tenantId,comment,creator) VALUES (#{dictClass.uuid},#{dictClass.className},#{dictClass.titleName},#{dictClass.tenantId},#{dictClass.comment},#{dictClass.creator})")
@Insert("INSERT INTO simulation_dictionary_class(uuid,className,classType,titleName,tenantId,comment,creator) VALUES (#{dictClass.uuid},#{dictClass.className},#{dictClass.classType},#{dictClass.titleName},#{dictClass.tenantId},#{dictClass.comment},#{dictClass.creator})")
int addDictionaryClass(@Param("dictClass") DictionaryClass dictClass);
@Delete("DELETE FROM simulation_dictionary_class WHERE uuid=#{uuid}")
@@ -56,7 +56,7 @@ public interface SimulationSystemMapper {
@Select("SELECT * FROM simulation_dictionary_class WHERE className=#{className} AND tenantId=#{tenantId}")
DictionaryClass queryDictionaryClassByName(@Param("className")String className, @Param("tenantId") long tenantId);
@Update("UPDATE simulation_dictionary_class SET comment=#{dictClass.comment},titleName=#{dictClass.titleName} WHERE uuid=#{dictClass.uuid}")
@Update("UPDATE simulation_dictionary_class SET comment=#{dictClass.comment},titleName=#{dictClass.titleName} ,classType=#{dictClass.classType}WHERE uuid=#{dictClass.uuid}")
int updateDictinaryClass(@Param("dictClass") DictionaryClass dictClass);
@Select("SELECT * FROM simulation_dictionary_class WHERE uuid=#{uuid}")

1
system/src/main/java/com/sdm/system/model/bo/DictionaryClass.java
View File

@@ -11,6 +11,7 @@ public class DictionaryClass extends BaseBean {
public String uuid;
public String className;
public String titleName;
public String classType;
public Long tenantId;
public String comment;
public Long creator;

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

@@ -52,10 +52,10 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
response = SdmResponse.failed("数据字典信息已存在");
}
if (ObjectUtils.isNotEmpty(dict.dictType)) {
DataDictionary dataDictionary = mapper.queryDataDictionaryByDictTypeAndDictName(dict.dictType, dict.dictName, tenantId);
if (ObjectUtils.isNotEmpty(dict.classType)) {
DataDictionary dataDictionary = mapper.queryDataDictionaryByDictTypeAndDictName(dict.classType, dict.dictValue, tenantId);
if (dataDictionary != null) {
response = SdmResponse.failed("数据字典类型" + dataDictionary + "已存在,请重新命名数据字典值");
response = SdmResponse.failed("数据字典:"+dataDictionary.dictClass+"-"+dataDictionary.aliasName+"已存在,请重新命名数据字典值");
}
}
dict.tenantId = ThreadLocalContext.getTenantId();
@@ -145,11 +145,11 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
{
SdmResponse response = SdmResponse.success();
if (ObjectUtils.isNotEmpty(dict.dictType)) {
if (ObjectUtils.isNotEmpty(dict.classType)) {
long tenantId = ThreadLocalContext.getTenantId();
DataDictionary dictionary = mapper.queryDataDictionaryByDictTypeAndDictName(dict.dictType, dict.dictName, tenantId);
DataDictionary dictionary = mapper.queryDataDictionaryByDictTypeAndDictName(dict.classType, dict.dictName, tenantId);
if(dictionary != null){
response = SdmResponse.failed("数据字典类型"+dictionary+"已存在,请重新命名数据字典值");
response = SdmResponse.failed("数据字典:"+dictionary.dictClass+"-"+dictionary.aliasName+"已存在,请重新命名数据字典值");
}
}
if(mapper.updateDictionaryData(dict) <= 0)