微调
This commit is contained in:
@@ -9,6 +9,9 @@ import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
|
||||
/**
|
||||
* @author wr
|
||||
*/
|
||||
@FeignClient(value = ServerInfo.ADVANCE_BOOT,path = "/waveAnalysis",
|
||||
fallbackFactory = EventWaveAnalysisFeignClientFallbackFactory.class,
|
||||
contextId = "waveAnalysis" )
|
||||
@@ -16,9 +19,9 @@ public interface EventWaveAnalysisFeignClient {
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 波形高级分析
|
||||
* @param eventIndex
|
||||
* @return: com.njcn.common.pojo.response.HttpResult<com.njcn.advance.pojo.dto.waveAnalysis.EntityAdvancedData>
|
||||
* 波形高级分析
|
||||
* @param eventIndex 事件索引
|
||||
* @return com.njcn.common.pojo.response.HttpResult<com.njcn.advance.pojo.dto.waveAnalysis.EntityAdvancedData>
|
||||
* @Author: wr
|
||||
* @Date: 2023/11/1 14:23
|
||||
*/
|
||||
|
||||
@@ -11,6 +11,9 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
|
||||
/**
|
||||
* @author wr
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
public class EventWaveAnalysisFeignClientFallbackFactory implements FallbackFactory<EventWaveAnalysisFeignClient> {
|
||||
@@ -24,7 +27,6 @@ public class EventWaveAnalysisFeignClientFallbackFactory implements FallbackFact
|
||||
}
|
||||
Enum<?> finalExceptionEnum = exceptionEnum;
|
||||
return new EventWaveAnalysisFeignClient() {
|
||||
|
||||
@Override
|
||||
public HttpResult<EntityAdvancedData> analysis(String eventIndex) {
|
||||
log.error("{}异常,降级处理,异常为:{}", "波形高级分析", throwable.toString());
|
||||
|
||||
@@ -4,8 +4,6 @@ import lombok.Getter;
|
||||
|
||||
/**
|
||||
* @Description: 承载能力评估相关枚举
|
||||
* @Param:
|
||||
* @return:
|
||||
* @Author: clam
|
||||
* @Date: 2024/1/31
|
||||
*/
|
||||
|
||||
@@ -4,7 +4,6 @@ package com.njcn.advance.enums;
|
||||
* @Author: Sunwei 【sunW2016@163.com】
|
||||
* @Description: 高级分析返回结果
|
||||
* @Date: Create in 9:02 2018/3/6
|
||||
* @Modified By:
|
||||
*/
|
||||
public enum EnumEvt {
|
||||
EVT_NUM("evt_num", "高级算法返回事件个数"), EVT_BUF("evt_buf", "高级算法返回数据"), QVVR_TYPE("qvvr_type", "暂降类型"), POW_A("POW_a",
|
||||
|
||||
@@ -16,7 +16,7 @@ import java.io.Serializable;
|
||||
* @date 2023年07月21日 10:20
|
||||
*/
|
||||
@Data
|
||||
public class ResponsibilityCalculateParam implements Serializable {
|
||||
public class ResponsibilityCalculateParam implements Serializable {
|
||||
|
||||
|
||||
@ApiModelProperty("开始时间")
|
||||
@@ -40,11 +40,11 @@ public class ResponsibilityCalculateParam implements Serializable {
|
||||
@Min(0)
|
||||
@Max(1)
|
||||
@ApiModelProperty("0-电流 1-电压")
|
||||
private int type;
|
||||
private int type;
|
||||
|
||||
@Min(2)
|
||||
@Max(50)
|
||||
@ApiModelProperty("谐波次数")
|
||||
private Integer time;
|
||||
private Integer time;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.njcn.advance.utils;
|
||||
|
||||
import cn.hutool.core.io.IoUtil;
|
||||
import cn.hutool.core.util.CharsetUtil;
|
||||
import com.njcn.oss.utils.FileStorageUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -33,8 +32,7 @@ public class WaveUtils {
|
||||
public String getFile(String filePath){
|
||||
String temJson = null;
|
||||
try(InputStream inputStream = fileStorageUtil.getFileStream(filePath)){
|
||||
temJson = IoUtil.read(inputStream, CharsetUtil.UTF_8);
|
||||
|
||||
temJson = IoUtil.readUtf8(inputStream);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user