root/material-manage-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

~

Browse Source
This commit is contained in:
淋雨一直走YH
2023-10-06 20:46:28 +08:00
parent 7bc57c75dc
commit c45d3ed75d
10 changed files with 126 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mjkf-xinke-plugin/mjkf-xinke-plugin-dev/src/main/java/mjkf/xinke/dev/modular/dict/service/impl/DevDictServiceImpl.java
View File

@@ -52,8 +52,8 @@ public class DevDictServiceImpl extends ServiceImpl<DevDictMapper, DevDict> impl
queryWrapper.lambda().select(DevDict::getId, DevDict::getParentId, DevDict::getCategory, DevDict::getDictLabel,
DevDict::getDictValue, DevDict::getSortCode);
if (ObjectUtil.isNotEmpty(devDictPageParam.getParentId())) {
queryWrapper.lambda().eq(DevDict::getParentId, devDictPageParam.getParentId())
.or().eq(DevDict::getId, devDictPageParam.getParentId());
queryWrapper.lambda().and(q -> q.eq(DevDict::getParentId, devDictPageParam.getParentId())
.or().eq(DevDict::getId, devDictPageParam.getParentId()));
}
if (ObjectUtil.isNotEmpty(devDictPageParam.getCategory())) {
queryWrapper.lambda().eq(DevDict::getCategory, devDictPageParam.getCategory());

10
mjkf-xinke-plugin/mjkf-xinke-plugin-dev/src/main/java/mjkf/xinke/dev/modular/sms/util/DevSmsTencentUtil.java
View File

@@ -35,7 +35,7 @@ public class DevSmsTencentUtil {
/**
* 初始化操作的客户端
*
*
* @author xuyuxiang
* @date 2022/1/5 23:24
*/
private static void initClient() {
@@ -77,7 +77,7 @@ public class DevSmsTencentUtil {
* @param templateCode 短信服务控制台配置且审核通过的模板编码
* @param templateParam 短信模板变量对应的顺序。支持传入多个参数，逗号拼接，示例："张三,15038****76,进行中"
* @return 发送的结果信息集合 com.tencentcloudapi.sms.v20210111.models.SendStatus
*
* @author xuyuxiang
* @date 2022/2/24 13:42
**/
public static String sendSms(String sdkAppId, String phoneNumbers, String signName, String templateCode, String templateParam) {
@@ -86,8 +86,8 @@ public class DevSmsTencentUtil {
if(ObjectUtil.isEmpty(sdkAppId)) {
// sdkAppId为空，则获取默认sdkAppId
DevConfigApi devConfigApi = SpringUtil.getBean(DevConfigApi.class);
signName = devConfigApi.getValueByKey(SNOWY_SMS_TENCENT_DEFAULT_SDK_APP_ID_KEY);
if(ObjectUtil.isEmpty(signName)) {
sdkAppId = devConfigApi.getValueByKey(SNOWY_SMS_TENCENT_DEFAULT_SDK_APP_ID_KEY);
if(ObjectUtil.isEmpty(sdkAppId)) {
throw new CommonException("腾讯云短信操作客户端未正确配置：sdkAppId为空");
}
}
@@ -117,4 +117,4 @@ public class DevSmsTencentUtil {
throw new CommonException(e.getMessage());
}
}
}
}