1.单位回显,时间范围查询等功能添加

2.干扰源和敏感供用户模板下载和批量导入
3.增加根据code进行树形字典筛选
3.全景展示技术监督接口新增
This commit is contained in:
wr
2024-06-19 15:31:17 +08:00
parent b0fb724880
commit e54638425e
24 changed files with 1110 additions and 173 deletions

View File

@@ -23,16 +23,19 @@ public interface DictTreeFeignClient {
HttpResult<SysDicTreePO> queryById(@RequestParam("id") String id);
@PostMapping("/queryByCode")
HttpResult<DictTreeVO> queryByCode(@RequestParam("code") String code) ;
HttpResult<DictTreeVO> queryByCode(@RequestParam("code") String code);
@PostMapping("/query")
HttpResult<List<DictTreeVO>> query(@RequestParam("pid") String pid) ;
HttpResult<List<DictTreeVO>> query(@RequestParam("pid") String pid);
@PostMapping("/queryByCodeList")
HttpResult<List<SysDicTreePO>> queryByCodeList(@RequestParam("code") String code);
@GetMapping("/queryAll")
HttpResult<List<SysDicTreePO>> queryAll() ;
HttpResult<List<SysDicTreePO>> queryAll();
@GetMapping("/queryAllByType")
HttpResult<List<SysDicTreePO>> queryAllByType(@RequestParam("type")Integer type) ;
HttpResult<List<SysDicTreePO>> queryAllByType(@RequestParam("type")Integer type);

View File

@@ -28,7 +28,7 @@ public class DictTreeFeignClientFallbackFactory implements FallbackFactory<DictT
public DictTreeFeignClient create(Throwable cause) {
//判断抛出异常是否为解码器抛出的业务异常
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){
if (cause.getCause() instanceof BusinessException) {
BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult());
}
@@ -36,36 +36,43 @@ public class DictTreeFeignClientFallbackFactory implements FallbackFactory<DictT
return new DictTreeFeignClient() {
@Override
public HttpResult<SysDicTreePO> queryById(String id) {
log.error("{}异常,降级处理,异常为:{}","根据字典id获取字典数据",cause.toString());
log.error("{}异常,降级处理,异常为:{}", "根据字典id获取字典数据", cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<DictTreeVO> queryByCode(String code) {
log.error("{}异常,降级处理,异常为:{}","根据字典code获取字典树数据",cause.toString());
log.error("{}异常,降级处理,异常为:{}", "根据字典code获取字典树数据", cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<DictTreeVO>> query(String pid) {
log.error("{}异常,降级处理,异常为:{}","根据字典pid获取字典树数据",cause.toString());
log.error("{}异常,降级处理,异常为:{}", "根据字典pid获取字典树数据", cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<SysDicTreePO>> queryByCodeList(String code) {
log.error("{}异常,降级处理,异常为:{}", "根据字典code获取字典树数据", cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<SysDicTreePO>> queryAll() {
log.error("{}异常,降级处理,异常为:{}","获取所有字典树数据",cause.toString());
log.error("{}异常,降级处理,异常为:{}", "获取所有字典树数据", cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<SysDicTreePO>> queryAllByType(Integer type) {
log.error("{}异常,降级处理,异常为:{}","分类获取所有字典树数据",cause.toString());
throw new BusinessException(finalExceptionEnum); }
log.error("{}异常,降级处理,异常为:{}", "分类获取所有字典树数据", cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<SysDicTreePO>> queryTree() {
log.error("{}异常,降级处理,异常为:{}","获取树形数据",cause.toString());
log.error("{}异常,降级处理,异常为:{}", "获取树形数据", cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};

View File

@@ -136,6 +136,10 @@ public enum DicDataTypeEnum {
LOAD_LEVEL("负荷级别","load_level"),
SUPPLY_CONDITION("供电电源情况","supply_condition"),
JIBEI_AREA("供电电源情况","jibei_area"),
Major_Nonlinear_Device("主要非线性设备类型","Major_Nonlinear_Device"),
EVALUATION_DEPT("主要非线性设备类型","evaluation_dept"),
EVALUATION_TYPE("评估类型","Evaluation_Type"),
;