Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码调整

Browse Source
This commit is contained in:
hongawen
2022-11-01 20:14:55 +08:00
parent cc0c1becd5
commit 33c9d309c7
738 changed files with 78923 additions and 11607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeptLineFeignClient.java
View File

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
/**
* @author denghuajun
@@ -24,4 +25,13 @@ public interface DeptLineFeignClient {
@PostMapping("removeBind")
HttpResult<Integer> removeBind(@RequestParam("id") String id);
/**
* @Description:获取部门和监测点的关系（分稳态暂态）
* @Param: [devDataType] 0：暂态 1：稳态
* @return: com.njcn.common.pojo.response.HttpResult<java.lang.Integer>
* @Author: clam
* @Date: 2022/10/19
*/
@PostMapping("getLineByDeptRelation")
HttpResult<Map<String,List<String>>> getLineByDeptRelation(@RequestParam("devDataType") Integer devDataType);
}

23
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
View File

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
/**
* @author denghuajun
@@ -255,4 +256,26 @@ public interface LineFeignClient {
*/
@PostMapping("getOnLineDevLine")
HttpResult<List<OnlineLineDTO>> getOnLineDevLine(@RequestBody List<String> lineIds);
/**
* @Description: 获取变电站和监测点的关系（分稳态暂态）
* @Param: [devDataType] 0：暂态 1：稳态
* @return: com.njcn.common.pojo.response.HttpResult<java.util.Map<java.lang.String,java.util.List<java.lang.String>>>
* @Author: clam
* @Date: 2022/10/20
*/
@PostMapping("getLineBySubstationRelation")
HttpResult<Map<String,List<String>>> getLineBySubstationRelation(@RequestParam("devDataType") Integer devDataType);
/**
* 获取监测点基础详情
* @param lineIds 监测点id集合
* @return 监测点详情信息
* @author cdf
* @date 2022/10/26
*/
@PostMapping("getLineDetailList")
HttpResult<List<LineDetailDataVO>> getLineDetailList(@RequestBody List<String> lineIds);
}

7
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/DeptLineFeignClientFallbackFactory.java
View File

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
/**
* @author denghuajun
@@ -48,6 +49,12 @@ public class DeptLineFeignClientFallbackFactory implements FallbackFactory<DeptL
log.error("{}异常，降级处理，异常为：{}", "部门解除绑定", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<Map<String,List<String>>> getLineByDeptRelation(Integer devDataType) {
log.error("{}异常，降级处理，异常为：{}", "获取部门和监测点的关系（分稳态暂态）", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

15
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java
View File

@@ -14,8 +14,11 @@ import com.njcn.device.pq.utils.DeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
/**
* @author denghuajun
@@ -192,6 +195,18 @@ public class LineFeignClientFallbackFactory implements FallbackFactory<LineFeign
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<Map<String,List<String>>> getLineBySubstationRelation(@RequestParam("devDataType") Integer devDataType) {
log.error("{}异常，降级处理，异常为：{}", "获取变电站和监测点的关系（分稳态暂态）: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<LineDetailDataVO>> getLineDetailList(@RequestBody List<String> lineIds) {
log.error("{}异常，降级处理，异常为：{}", "获取监测点基础详情异常: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}

6
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java
View File

@@ -75,4 +75,10 @@ public class LineDetailDataVO {
@ApiModelProperty(name = "dealCapacity",value = "用户协议容量（MVA）")
private Float dealCapacity;
/**
* 测量间隔（1-10分钟）
*/
@ApiModelProperty(name = "timeInterval",value = "测量间隔（1-10分钟）")
private Integer timeInterval;
}