From 924242a73d62d247f7055ffd0dd86a2700757f5b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 12 六月 2023 18:06:51 +0800
Subject: [PATCH] 基础配置 管理台联调bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java | 82 +++++++++++++++++++++--------------------
1 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
index 48209b2..21e970f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
@@ -73,10 +73,10 @@
customConfig.setCreateTime(new Date());
}
// 设置配置的类型、键、名称、值和更新时间
- customConfig.setType(ConfigEnum.PLATFORM_SERVICE_PHONE.getKeyType());
- customConfig.setKey(ConfigEnum.PLATFORM_SERVICE_PHONE.getKey());
- customConfig.setName(ConfigEnum.PLATFORM_SERVICE_PHONE.getKeyName());
- customConfig.setValue(mgtServiceMobileEditDto.getServiceMobile());
+ customConfig.setConfigType(ConfigEnum.PLATFORM_SERVICE_PHONE.getKeyType());
+ customConfig.setConfigKey(ConfigEnum.PLATFORM_SERVICE_PHONE.getKey());
+ customConfig.setConfigName(ConfigEnum.PLATFORM_SERVICE_PHONE.getKeyName());
+ customConfig.setConfigValue(mgtServiceMobileEditDto.getServiceMobile());
customConfig.setUpdateTime(new Date());
// 保存或更新配置
this.saveOrUpdate(customConfig);
@@ -95,57 +95,57 @@
//获取自定义配置
List<CustomConfig> customConfigList = customConfigMapper.selectList(new LambdaQueryWrapper<CustomConfig>().eq(CustomConfig::getDelFlag, 0));
Optional.ofNullable(customConfigList).ifPresent(list -> {
- Map<String, CustomConfig> configMap = list.stream().collect(Collectors.toMap(CustomConfig::getKey, Function.identity()));
+ Map<String, CustomConfig> configMap = list.stream().collect(Collectors.toMap(CustomConfig::getConfigKey, Function.identity()));
// 遍历配置映射，设置相应的属性值
configMap.forEach((key, value) -> {
switch (key) {
case "SHARE_INTEGRAL":
- mgtAllCustomConfigVo.setShareIntegral(Integer.valueOf(value.getValue()));
+ mgtAllCustomConfigVo.setShareIntegral(Integer.valueOf(value.getConfigValue()));
break;
case "SUGGEST_PLATFORM_INTEGRAL":
- mgtAllCustomConfigVo.setSuggestPlatformIntegral(Integer.valueOf(value.getValue()));
+ mgtAllCustomConfigVo.setSuggestPlatformIntegral(Integer.valueOf(value.getConfigValue()));
break;
case "SIGN_IN_INTEGRAL":
- mgtAllCustomConfigVo.setSignInIntegral(Integer.valueOf(value.getValue()));
+ mgtAllCustomConfigVo.setSignInIntegral(Integer.valueOf(value.getConfigValue()));
break;
case "SUGGEST_SHOP_INTEGRAL":
- mgtAllCustomConfigVo.setSuggestShopIntegral(Integer.valueOf(value.getValue()));
+ mgtAllCustomConfigVo.setSuggestShopIntegral(Integer.valueOf(value.getConfigValue()));
break;
case "PAY_MONEY_INTEGRAL":
- mgtAllCustomConfigVo.setPayMoneyIntegral(Integer.valueOf(value.getValue()));
+ mgtAllCustomConfigVo.setPayMoneyIntegral(Integer.valueOf(value.getConfigValue()));
break;
case "ORDER_AUTO_CANCEL_TIME":
- mgtAllCustomConfigVo.setOrderAutoCancelTime(Integer.valueOf(value.getValue()));
+ mgtAllCustomConfigVo.setOrderAutoCancelTime(Integer.valueOf(value.getConfigValue()));
break;
case "HOME_STYLE":
- mgtAllCustomConfigVo.setHomeStyle(Integer.valueOf(value.getValue()));
+ mgtAllCustomConfigVo.setHomeStyle(Integer.valueOf(value.getConfigValue()));
break;
case "SHOP_EMERGENCY_DEGREE":
- mgtAllCustomConfigVo.setShopEmergencyDegree(value.getValue());
+ mgtAllCustomConfigVo.setShopEmergencyDegree(value.getConfigValue());
break;
case "SHOP_FOLLOW_TYPE":
- mgtAllCustomConfigVo.setShopFollowType(value.getValue());
+ mgtAllCustomConfigVo.setShopFollowType(value.getConfigValue());
break;
case "SHOP_CUSTOM_STATUS":
- mgtAllCustomConfigVo.setShopCustomStatus(value.getValue());
+ mgtAllCustomConfigVo.setShopCustomStatus(value.getConfigValue());
break;
case "SHOP_SOURCE_CHANNEL":
- mgtAllCustomConfigVo.setShopSourceChannel(value.getValue());
+ mgtAllCustomConfigVo.setShopSourceChannel(value.getConfigValue());
break;
case "MEMBER_SOURCE_CHANNEL":
- mgtAllCustomConfigVo.setMemberSourceChannel(value.getValue());
+ mgtAllCustomConfigVo.setMemberSourceChannel(value.getConfigValue());
break;
case "MEMBER_CHARACTER":
- mgtAllCustomConfigVo.setMemberCharacter(value.getValue());
+ mgtAllCustomConfigVo.setMemberCharacter(value.getConfigValue());
break;
case "MEMBER_LEVEL":
- mgtAllCustomConfigVo.setMemberLevel(value.getValue());
+ mgtAllCustomConfigVo.setMemberLevel(value.getConfigValue());
break;
case "MEMBER_TYPE":
- mgtAllCustomConfigVo.setMemberType(value.getValue());
+ mgtAllCustomConfigVo.setMemberType(value.getConfigValue());
break;
case "NURSE_PROBLEM":
- mgtAllCustomConfigVo.setNurseProblem(value.getValue());
+ mgtAllCustomConfigVo.setNurseProblem(value.getConfigValue());
break;
default:
break;
@@ -209,7 +209,7 @@
private void deletePastConfig(Date updateTime) {
List<CustomConfig> customConfigList = customConfigMapper.selectList(new LambdaQueryWrapper<CustomConfig>()
.eq(CustomConfig::getDelFlag, 0)
- .eq(CustomConfig::getType, 2));
+ .eq(CustomConfig::getConfigType, 2));
for (CustomConfig customConfig : customConfigList) {
customConfig.setDelFlag(1);
customConfig.setUpdateTime(updateTime);
@@ -229,10 +229,10 @@
for (ConfigEnum configEnum : ConfigEnum.values()) {
CustomConfig customConfig = new CustomConfig();
customConfig.setDelFlag(0);
- customConfig.setType(configEnum.getKeyType());
- customConfig.setKey(configEnum.getKey());
- customConfig.setName(configEnum.getKeyName());
- customConfig.setValue(getConfigValue(configEnum, mgtOtherConfigEditDto));
+ customConfig.setConfigType(configEnum.getKeyType());
+ customConfig.setConfigKey(configEnum.getKey());
+ customConfig.setConfigName(configEnum.getKeyName());
+ customConfig.setConfigValue(getConfigValue(configEnum, mgtOtherConfigEditDto));
customConfig.setCreateTime(updateTime);
customConfig.setUpdateTime(updateTime);
this.saveOrUpdate(customConfig);
@@ -283,7 +283,7 @@
List<CustomConfig> customConfigList = customConfigMapper.selectList(
new LambdaQueryWrapper<CustomConfig>()
.eq(CustomConfig::getDelFlag, 0)
- .eq(CustomConfig::getType, 3)
+ .eq(CustomConfig::getConfigType, 3)
);
if (customConfigList != null && !customConfigList.isEmpty()) {
String key;
@@ -292,8 +292,8 @@
List<CustomConfig> updatedCustomConfigs = new ArrayList<>();
// 遍历配置列表，根据 key 更新配置值
for (CustomConfig customConfig : customConfigList) {
- key = customConfig.getKey();
- oldValue = customConfig.getValue();
+ key = customConfig.getConfigKey();
+ oldValue = customConfig.getConfigValue();
switch (key) {
case "SHOP_EMERGENCY_DEGREE":
newValue = mgtShopConfigEditDto.getShopEmergencyDegree();
@@ -310,7 +310,7 @@
default:
break;
}
- customConfig.setValue(newValue);
+ customConfig.setConfigValue(newValue);
customConfig.setUpdateTime(updateTime);
handleChangeConfig(oldValue, newValue, key);
updatedCustomConfigs.add(customConfig);
@@ -340,7 +340,7 @@
List<CustomConfig> customConfigList = customConfigMapper.selectList(
new LambdaQueryWrapper<CustomConfig>()
.eq(CustomConfig::getDelFlag, 0)
- .eq(CustomConfig::getType, 4)
+ .eq(CustomConfig::getConfigType, 4)
);
if (customConfigList != null && !customConfigList.isEmpty()) {
String key;
@@ -349,8 +349,8 @@
List<CustomConfig> updatedCustomConfigs = new ArrayList<>();
// 遍历配置列表，根据 key 更新配置值
for (CustomConfig customConfig : customConfigList) {
- key = customConfig.getKey();
- oldValue = customConfig.getValue();
+ key = customConfig.getConfigKey();
+ oldValue = customConfig.getConfigValue();
switch (key) {
case "MEMBER_SOURCE_CHANNEL":
newValue = mgtMemberConfigEditDto.getMemberSourceChannel();
@@ -370,7 +370,7 @@
default:
break;
}
- customConfig.setValue(newValue);
+ customConfig.setConfigValue(newValue);
customConfig.setUpdateTime(updateTime);
handleChangeConfig(oldValue, newValue, key);
updatedCustomConfigs.add(customConfig);
@@ -398,10 +398,10 @@
private void createNewConfig(ConfigEnum configEnum, String value, Date updateTime) {
CustomConfig customConfig = new CustomConfig();
customConfig.setDelFlag(0);
- customConfig.setType(configEnum.getKeyType());
- customConfig.setKey(configEnum.getKey());
- customConfig.setName(configEnum.getKeyName());
- customConfig.setValue(value);
+ customConfig.setConfigType(configEnum.getKeyType());
+ customConfig.setConfigKey(configEnum.getKey());
+ customConfig.setConfigName(configEnum.getKeyName());
+ customConfig.setConfigValue(value);
customConfig.setCreateTime(updateTime);
customConfig.setUpdateTime(updateTime);
this.saveOrUpdate(customConfig);
@@ -472,8 +472,10 @@
public MgtCustomConfigVo getCustomConfig(MgtCustomConfigDto mgtCustomConfigDto){
CustomConfig customConfig = this.getByKey(mgtCustomConfigDto.getConfigType());
MgtCustomConfigVo mgtCustomConfigVo = new MgtCustomConfigVo();
- mgtCustomConfigVo.setCustomConfig(customConfig.getValue());
- mgtCustomConfigVo.setConfigType(mgtCustomConfigDto.getConfigType());
+ if(customConfig!=null){
+ mgtCustomConfigVo.setCustomConfig(customConfig.getConfigValue());
+ mgtCustomConfigVo.setConfigType(mgtCustomConfigDto.getConfigType());
+ }
return mgtCustomConfigVo;
}
}
--
Gitblit v1.7.1