refactor(sms): 重构短信发送功能并优化数据库配置
- 移除旧的短信发送实现和相关依赖 - 引入新的短信发送服务接口和实现 - 添加短信发送记录实体和数据访问层 - 创建短信发送控制器提供REST API - 实现带重试机制的短信发送功能 - 添加系统凭证管理和缓存机制 - 更新数据库连接配置信息 - 修改统计查询接口参数类型 - 清理过时的代码和服务方法
This commit is contained in:
@@ -1,16 +1,20 @@
|
||||
package com.njcn.system.api;
|
||||
|
||||
|
||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||
import com.njcn.common.pojo.constant.ServerInfo;
|
||||
|
||||
import com.njcn.common.pojo.enums.common.LogEnum;
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
|
||||
import com.njcn.common.utils.HttpResultUtil;
|
||||
import com.njcn.system.api.fallback.CsStatistiacalFeignClientFallbackFactory;
|
||||
import com.njcn.system.pojo.po.CsStatisticalSetPO;
|
||||
import com.njcn.system.pojo.po.EleEpdPqd;
|
||||
import com.njcn.system.pojo.vo.CsStatisticalSetVO;
|
||||
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import java.util.List;
|
||||
@@ -35,10 +39,12 @@ public interface CsStatisticalSetFeignClient {
|
||||
HttpResult<CsStatisticalSetVO> queryStatistical(@RequestParam("id")String id);
|
||||
|
||||
@PostMapping("/queryStatisticalSelect")
|
||||
HttpResult<List<EleEpdPqd>> queryStatisticalSelect(@RequestParam("id")String id);
|
||||
|
||||
|
||||
@ApiOperation("根据统计类型id组查询已绑定指标")
|
||||
HttpResult<List<EleEpdPqd>> queryStatisticalSelect(@RequestBody List<String> list);
|
||||
|
||||
@PostMapping("/queryStatisticalById")
|
||||
@ApiOperation("根据id查询数据")
|
||||
HttpResult<List<CsStatisticalSetPO>> queryStatisticalById(@RequestBody List<String> list);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -3,12 +3,8 @@ package com.njcn.system.api.fallback;
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.system.api.AreaFeignClient;
|
||||
import com.njcn.system.api.ConfigFeignClient;
|
||||
import com.njcn.system.api.CsStatisticalSetFeignClient;
|
||||
import com.njcn.system.pojo.dto.AreaTreeDTO;
|
||||
import com.njcn.system.pojo.po.Area;
|
||||
import com.njcn.system.pojo.po.Config;
|
||||
import com.njcn.system.pojo.po.CsStatisticalSetPO;
|
||||
import com.njcn.system.pojo.po.EleEpdPqd;
|
||||
import com.njcn.system.pojo.vo.CsStatisticalSetVO;
|
||||
import com.njcn.system.utils.SystemEnumUtil;
|
||||
@@ -56,9 +52,16 @@ public class CsStatistiacalFeignClientFallbackFactory implements FallbackFactory
|
||||
throw new BusinessException(finalExceptionEnum); }
|
||||
|
||||
@Override
|
||||
public HttpResult<List<EleEpdPqd>> queryStatisticalSelect(String id) {
|
||||
public HttpResult<List<EleEpdPqd>> queryStatisticalSelect(List<String> list) {
|
||||
log.error("{}异常,降级处理,异常为:{}","根据统计类型id查询已绑定指标下拉框",cause.toString());
|
||||
throw new BusinessException(finalExceptionEnum); }
|
||||
throw new BusinessException(finalExceptionEnum);
|
||||
}
|
||||
|
||||
@Override
|
||||
public HttpResult<List<CsStatisticalSetPO>> queryStatisticalById(List<String> list) {
|
||||
log.error("{}异常,降级处理,异常为:{}","根据id查询数据异常",cause.toString());
|
||||
throw new BusinessException(finalExceptionEnum);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,13 +6,11 @@ import com.njcn.common.pojo.enums.common.LogEnum;
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.common.utils.HttpResultUtil;
|
||||
|
||||
import com.njcn.system.pojo.param.CsStatisticalSetAddParam;
|
||||
import com.njcn.system.pojo.po.CsStatisticalSetPO;
|
||||
import com.njcn.system.pojo.po.EleEpdPqd;
|
||||
import com.njcn.system.pojo.vo.CsStatisticalSetVO;
|
||||
|
||||
import com.njcn.system.service.CsStatisticalSetPOService;
|
||||
|
||||
import com.njcn.web.controller.BaseController;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
@@ -64,17 +62,22 @@ public class CsStatisticalSetController extends BaseController {
|
||||
@PostMapping("/queryStatisticalSelect")
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@ApiOperation("根据统计类型id组查询已绑定指标")
|
||||
public HttpResult<List<EleEpdPqd>> queryStatisticalSelect(@RequestParam("id")String id){
|
||||
public HttpResult<List<EleEpdPqd>> queryStatisticalSelect(@RequestBody List<String> list){
|
||||
log.info("根据模板录入字典数据");
|
||||
String methodDescribe = getMethodDescribe("EleEpdPqd");
|
||||
List<EleEpdPqd> result = csStatisticalSetPOService.queryStatisticalSelect(id);
|
||||
String methodDescribe = getMethodDescribe("queryStatisticalSelect");
|
||||
List<EleEpdPqd> result = csStatisticalSetPOService.queryStatisticalSelect(list);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@PostMapping("/queryStatisticalById")
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@ApiOperation("根据id查询数据")
|
||||
public HttpResult<List<CsStatisticalSetPO>> queryStatisticalById(@RequestBody List<String> list){
|
||||
log.info("根据模板录入字典数据");
|
||||
String methodDescribe = getMethodDescribe("queryStatisticalById");
|
||||
List<CsStatisticalSetPO> result = csStatisticalSetPOService.queryStatisticalById(list);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -23,5 +23,7 @@ public interface CsStatisticalSetPOService extends IMppService<CsStatisticalSetP
|
||||
|
||||
CsStatisticalSetVO queryStatistical(String id);
|
||||
|
||||
List<EleEpdPqd> queryStatisticalSelect(String id);
|
||||
List<EleEpdPqd> queryStatisticalSelect(List<String> list);
|
||||
|
||||
List<CsStatisticalSetPO> queryStatisticalById(List<String> list);
|
||||
}
|
||||
|
||||
@@ -18,7 +18,10 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
@@ -108,9 +111,9 @@ public class CsStatisticalSetPOServiceImpl extends MppServiceImpl<CsStatisticalS
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<EleEpdPqd> queryStatisticalSelect(String id) {
|
||||
public List<EleEpdPqd> queryStatisticalSelect(List<String> list) {
|
||||
QueryWrapper<CsStatisticalSetPO> queryWrap = new QueryWrapper<>();
|
||||
queryWrap.lambda().eq(CsStatisticalSetPO::getStatisicalId, id);
|
||||
queryWrap.lambda().in(CsStatisticalSetPO::getStatisicalId, list);
|
||||
List<CsStatisticalSetPO> result = this.baseMapper.selectList(queryWrap);
|
||||
List<String> collect = result.stream().map(CsStatisticalSetPO::getTargetId).collect(Collectors.toList());
|
||||
if (CollectionUtils.isEmpty(collect)) {
|
||||
@@ -118,6 +121,13 @@ public class CsStatisticalSetPOServiceImpl extends MppServiceImpl<CsStatisticalS
|
||||
}
|
||||
return epdPqdService.listByIds(collect);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<CsStatisticalSetPO> queryStatisticalById(List<String> list) {
|
||||
QueryWrapper<CsStatisticalSetPO> queryWrap = new QueryWrapper<>();
|
||||
queryWrap.lambda().in(CsStatisticalSetPO::getStatisicalId, list);
|
||||
return this.baseMapper.selectList(queryWrap);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user