Skip to content

A
amos-boot-zx-biz
Commit bbdbbf35 authored by 朱晨阳's avatar 朱晨阳
Browse files
Options

Merge remote-tracking branch 'origin/developer' into developer

parents 1bd766b2 b666c0df
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 43 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/BigScreenAnalyseController.java
View file @ bbdbbf35
......@@ -724,7 +724,7 @@ private FanHealthIndexDayMapper fanHealthIndexDayMapper;
@RequestParam(value = "stationId", required = true) String stationId,
@RequestParam(value = "tableName2", required = false) String tableName2) {
StationBasic stationBasic = stationBasicMapper.selectById(stationId);
String nameByIndexAddress = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(indexAddress, tableName, stationBasic.getFanGatewayId(),stationBasic.getBoosterGatewayId());
String nameByIndexAddress = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(indexAddress, tableName, stationBasic.getFanGatewayId());
int num = idxBizFanHealthIndexMapper.getIsWarningByPointId(indexAddress, stationBasic.getFanGatewayId(), tableName2,stationBasic.getBoosterGatewayId());
......@@ -742,7 +742,7 @@ private FanHealthIndexDayMapper fanHealthIndexDayMapper;
@RequestParam(value = "stationId") String stationId) {
StationBasic stationBasic = stationBasicMapper.selectById(stationId);
varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName, stationBasic.getFanGatewayId(),stationBasic.getBoosterGatewayId());
varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName, stationBasic.getFanGatewayId());
FeignClientResult<List<String>> sevenEntityMcb = null;
try {
sevenEntityMcb = riskWarningFeign.getRiskHandleByVarDesc(varDesc);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java
View file @ bbdbbf35
......@@ -771,8 +771,25 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
@ApiOperation(value = "风站 左侧风机信息列表")
@GetMapping("/getFanInfoByPage")
public ResponseModel<Page<Map<String, Object>>> getFanInfoByPage(
@RequestParam(value = "stationId", required = false) String stationId) {
return ResponseHelper.buildResponse(fanInfoByPage(stationId));
@RequestParam(value = "stationId", required = false) String stationId,
@RequestParam(value = "equipmentName", required = false) String equipmentName) {
Page<Map<String, Object>> mapPage = fanInfoByPage(stationId);
if(StrUtil.isNotEmpty(equipmentName)){
List<Map<String, Object>> records = mapPage.getRecords();
if(CollectionUtil.isNotEmpty(records)){
for (Map<String, Object> record : records) {
String equipmentNameSimple =(String) record.get("equipmentNameSimple");
Map<String, Object> subSystemInfo = subSystemInfo(equipmentNameSimple, String.valueOf(stationId));
List axisData = (List)subSystemInfo.get("axisData");
if(CollectionUtil.isNotEmpty(axisData)){
String subSystemDefault = (String) axisData.get(0);
record.put("subSystemDefault",subSystemDefault);
}
}
}
}
return ResponseHelper.buildResponse(mapPage);
}
private Page<Map<String, Object>> fanInfoByPage(String stationId) {
......@@ -914,6 +931,10 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
item.put("healthIndex", equipmentHealthScore);
});
pointNameList.sort(Comparator.comparing(o -> o.get("sort").toString()));
for (int i = 0; i < pointNameList.size(); i++) {
Map<String, Object> stringObjectMap = pointNameList.get(i);
stringObjectMap.put("index",i);
}
Page<Map<String, Object>> mapPage = new Page<>();
mapPage.setSize(pointNameList.size());
mapPage.setTotal(pointNameList.size());
......@@ -926,8 +947,22 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
@ApiOperation(value = "光伏 左侧风机信息列表")
@GetMapping("/getPvInfoByPage")
public ResponseModel<Page<Map<String, Object>>> getPvInfoByPage(
@RequestParam(value = "stationId", required = false) String stationId) {
return ResponseHelper.buildResponse(pvInfoByPage(stationId));
@RequestParam(value = "stationId", required = false) String stationId,
@RequestParam(value = "subarray", required = false) String subarray) {
Page<Map<String, Object>> mapPage = pvInfoByPage(stationId);
if(StrUtil.isNotEmpty(subarray)){
List<Map<String, Object>> records = mapPage.getRecords();
if(CollectionUtil.isNotEmpty(records)){
for (Map<String, Object> record : records) {
Map<String, Object> subSystemInfo = pvSubSystemInfo((String)record.get("subarray"), String.valueOf(stationId));
List axisData = (List)subSystemInfo.get("axisData");
if(CollectionUtil.isNotEmpty(axisData)) {
record.put("subarrayDefault",axisData.get(0));
}
}
}
}
return ResponseHelper.buildResponse(mapPage);
}
private Page<Map<String, Object>> pvInfoByPage(String stationId) {
......@@ -1052,6 +1087,10 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
item.put("healthIndex", equipmentHealthScore);
});
pointNameList.sort(Comparator.comparing(o -> o.get("sort").toString()));
for (int i = 0; i < pointNameList.size(); i++) {
Map<String, Object> stringObjectMap = pointNameList.get(i);
stringObjectMap.put("index",i);
}
Page<Map<String, Object>> mapPage = new Page<>();
mapPage.setSize(pointNameList.size());
mapPage.setTotal(pointNameList.size());
......@@ -1112,10 +1151,31 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
@RequestParam(value = "indexAddress", required = false) String indexAddress,
@RequestParam(value = "tableName", required = true) String tableName,
@RequestParam(value = "stationId", required = true) String stationId,
@RequestParam(value = "tableName2", required = false) String tableName2) {
@RequestParam(value = "tableName2", required = false) String tableName2,
@RequestParam(value = "equipmentName", required = false) String equipmentName,
@RequestParam(value = "subSystem", required = false) String subSystem,
@RequestParam(value = "index", required = false) String index,
@RequestParam(value = "flag",required = false)String flag) {
String nameByIndexAddress="";
Page<Map<String, Object>> mapPage= null;
if("PV".equals(flag)){
//为了页面联动效果
mapPage = pvSubSystemPointInfo(equipmentName, stationId);
}else if("FAN".equals(flag)){
mapPage = subSystemPointInfo(subSystem, stationId, equipmentName);
}
List<Map<String, Object>> records = mapPage.getRecords();
if(CollectionUtil.isNotEmpty(records) && StrUtil.isNotEmpty(index)){
for (Map<String, Object> record : records) {
if(index.equals(String.valueOf(record.get("index")))){
indexAddress=(String) record.get("indexAddress");
nameByIndexAddress = (String) record.get("pointName");
}
}
}
StationBasic stationBasic = stationBasicMapper.selectById(stationId);
String nameByIndexAddress = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(indexAddress, tableName,
stationBasic.getFanGatewayId(),stationBasic.getBoosterGatewayId());
// String nameByIndexAddress = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(indexAddress, tableName,
// stationBasic.getFanGatewayId(),stationBasic.getBoosterGatewayId());
int num = 0;
if (StringUtils.isNotEmpty(tableName2)) {
num = idxBizFanHealthIndexMapper.getIsWarningByPointId(indexAddress, stationBasic.getFanGatewayId(),
......@@ -1134,11 +1194,17 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
public ResponseModel<Map<String, String>> getRiskHandleByVarDesc(
@RequestParam(value = "varDesc", required = false) String varDesc,
@RequestParam(value = "tableName", required = true) String tableName,
@RequestParam(value = "stationId") String stationId) {
@RequestParam(value = "stationId") String stationId,
@RequestParam(value = "equipmentName", required = false) String equipmentName) {
StationBasic stationBasic = stationBasicMapper.selectById(stationId);
varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName,
stationBasic.getFanGatewayId(),stationBasic.getBoosterGatewayId());
if(equipmentName.contains("升压站")){
varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName,
stationBasic.getBoosterGatewayId());
}else {
varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName,
stationBasic.getFanGatewayId());
}
FeignClientResult<List<String>> sevenEntityMcb = null;
try {
sevenEntityMcb = riskWarningFeign.getRiskHandleByVarDesc(varDesc);
......@@ -1643,20 +1709,68 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
return ResponseHelper.buildResponse(map);
}
/**
* 获取风电IndexAddress
* @param subSystem
* @param stationId
* @param equipmentName
* @return
*/
private String getFanIndexAddress(String subSystem,String stationId,String equipmentName,String index, String indexAddress){
//为了页面联动效果
Page<Map<String, Object>> mapPage = subSystemPointInfo(subSystem, stationId, equipmentName);
List<Map<String, Object>> records = mapPage.getRecords();
if(CollectionUtil.isNotEmpty(records) && StrUtil.isNotEmpty(index)){
for (Map<String, Object> record : records) {
if(index.equals(String.valueOf(record.get("index")))){
indexAddress = (String) record.get("indexAddress");
}
}
}
return indexAddress;
}
/**
* 获取光伏IndexAddress
* @param stationId
* @param equipmentName
* @return
*/
private String getPvIndexAddress(String stationId,String equipmentName,String index, String indexAddress){
//为了页面联动效果
Page<Map<String, Object>> mapPage = pvSubSystemPointInfo(equipmentName, stationId);
List<Map<String, Object>> records = mapPage.getRecords();
if(CollectionUtil.isNotEmpty(records) && StrUtil.isNotEmpty(index)){
for (Map<String, Object> record : records) {
if(index.equals(String.valueOf(record.get("index")))){
indexAddress = (String) record.get("indexAddress");
}
}
}
return indexAddress;
}
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "风站/光伏 右下实时趋势")
@GetMapping("/getTrendInfoByAddressBy1118")
public ResponseModel<Map<String, Object>> getTrendInfoByAddressBy1118(
@RequestParam(value = "indexAddress", required = false) String indexAddress,
@RequestParam(value = "stationId", required = false) String stationId) {
@RequestParam(value = "stationId", required = false) String stationId,
@RequestParam(value = "equipmentName", required = false) String equipmentName,
@RequestParam(value = "subSystem", required = false) String subSystem,
@RequestParam(value = "index", required = false) String index) {
indexAddress= getFanIndexAddress(subSystem,stationId,equipmentName,index,indexAddress);
StationBasic stationBasic = stationBasicMapper.selectById(stationId);
LambdaQueryWrapper<FanHealthIndex> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(FanHealthIndex::getIndexAddress, indexAddress).and(
qw->qw.eq(FanHealthIndex::getGatewayId, stationBasic.getFanGatewayId()).or().eq(FanHealthIndex::getGatewayId, stationBasic.getBoosterGatewayId()));
lambdaQueryWrapper.eq(FanHealthIndex::getAnalysisObjType, "测点");
lambdaQueryWrapper.eq(FanHealthIndex::getIndexAddress, indexAddress);
if(equipmentName.contains("升压站")){
lambdaQueryWrapper.eq(FanHealthIndex::getGatewayId, stationBasic.getBoosterGatewayId());
}else {
lambdaQueryWrapper.eq(FanHealthIndex::getGatewayId, stationBasic.getFanGatewayId());
}
lambdaQueryWrapper.eq(FanHealthIndex::getAnalysisObjType, "测点");
lambdaQueryWrapper.orderByDesc(FanHealthIndex::getTs);
lambdaQueryWrapper.eq(FanHealthIndex::getAnalysisType, "按10分钟");
lambdaQueryWrapper.last("limit 15");
......@@ -1692,13 +1806,20 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
@GetMapping("/getTrendInfoByAddressBy1118Pv")
public ResponseModel<Map<String, Object>> getTrendInfoByAddressBy1118Pv(
@RequestParam(value = "indexAddress", required = false) String indexAddress,
@RequestParam(value = "stationId", required = false) String stationId) {
@RequestParam(value = "stationId", required = false) String stationId,
@RequestParam(value = "equipmentName", required = false) String equipmentName,
@RequestParam(value = "index", required = false) String index) {
indexAddress = getPvIndexAddress(stationId,equipmentName,index,indexAddress);
StationBasic stationBasic = stationBasicMapper.selectById(stationId);
LambdaQueryWrapper<PvHealthIndex> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PvHealthIndex::getIndexAddress, indexAddress).and(
qw->qw.eq(PvHealthIndex::getGatewayId, stationBasic.getFanGatewayId()).or().eq(PvHealthIndex::getGatewayId, stationBasic.getBoosterGatewayId()));
lambdaQueryWrapper.eq(PvHealthIndex::getIndexAddress, indexAddress);
if(equipmentName.contains("升压站")){
lambdaQueryWrapper.eq(PvHealthIndex::getGatewayId, stationBasic.getBoosterGatewayId());
}else {
lambdaQueryWrapper.eq(PvHealthIndex::getGatewayId, stationBasic.getFanGatewayId());
}
lambdaQueryWrapper.eq(PvHealthIndex::getAnalysisObjType, "测点");
lambdaQueryWrapper.orderByDesc(PvHealthIndex::getTs);
lambdaQueryWrapper.eq(PvHealthIndex::getAnalysisType, "按10分钟");
......@@ -1736,11 +1857,24 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
public ResponseModel<Map<String, String>> getRiskHandleByVarDescBy1118(
@RequestParam(value = "varDesc", required = false) String varDesc,
@RequestParam(value = "tableName", required = true) String tableName,
@RequestParam(value = "stationId") String stationId) {
@RequestParam(value = "stationId") String stationId,
@RequestParam(value = "equipmentName", required = false) String equipmentName,
@RequestParam(value = "subSystem", required = false) String subSystem,
@RequestParam(value = "index", required = false) String index) {
varDesc= getFanIndexAddress(subSystem,stationId,equipmentName,index,varDesc);
StationBasic stationBasic = stationBasicMapper.selectById(stationId);
Map<String, Object> healthIndexMap = idxBizFanHealthIndexMapper
.getHealthIndexByIndexAddress(stationBasic.getFanGatewayId(), varDesc,stationBasic.getBoosterGatewayId());
Map<String, Object> healthIndexMap = null;
if(equipmentName.contains("升压站")){
healthIndexMap = idxBizFanHealthIndexMapper
.getHealthIndexByIndexAddress(stationBasic.getBoosterGatewayId(), varDesc);
varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName,
stationBasic.getBoosterGatewayId());
}else {
healthIndexMap = idxBizFanHealthIndexMapper
.getHealthIndexByIndexAddress(stationBasic.getFanGatewayId(), varDesc);
varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName,
stationBasic.getFanGatewayId());
}
if (ObjectUtils.isEmpty(healthIndexMap)) {
HashMap<String, String> stringStringHashMap = new HashMap<>();
stringStringHashMap.put("content", "正常运行");
......@@ -1757,9 +1891,6 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
stringStringHashMap.put("content", "正常运行");
return ResponseHelper.buildResponse(stringStringHashMap);
}
varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName,
stationBasic.getFanGatewayId(),stationBasic.getBoosterGatewayId());
FeignClientResult<List<String>> sevenEntityMcb = null;
try {
sevenEntityMcb = riskWarningFeign.getRiskHandleByVarDesc(varDesc);
......@@ -1787,11 +1918,23 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
public ResponseModel<Map<String, String>> getRiskHandleByVarDescBy1118Pv(
@RequestParam(value = "varDesc", required = false) String varDesc,
@RequestParam(value = "tableName", required = true) String tableName,
@RequestParam(value = "stationId") String stationId) {
@RequestParam(value = "stationId") String stationId,
@RequestParam(value = "equipmentName", required = false) String equipmentName,
@RequestParam(value = "index", required = false) String index) {
varDesc= getPvIndexAddress(stationId,equipmentName,index,varDesc);
StationBasic stationBasic = stationBasicMapper.selectById(stationId);
Map<String, Object> healthIndexMap = idxBizFanHealthIndexMapper
.getHealthIndexByIndexAddressPv(stationBasic.getFanGatewayId(), varDesc,stationBasic.getBoosterGatewayId());
Map<String, Object> healthIndexMap = null;
if(equipmentName.contains("升压站")){
healthIndexMap = idxBizFanHealthIndexMapper
.getHealthIndexByIndexAddressPv(stationBasic.getBoosterGatewayId(), varDesc);
varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName,
stationBasic.getBoosterGatewayId());
}else {
healthIndexMap = idxBizFanHealthIndexMapper
.getHealthIndexByIndexAddressPv(stationBasic.getFanGatewayId(), varDesc);
varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName,
stationBasic.getFanGatewayId());
}
if (ObjectUtils.isEmpty(healthIndexMap)) {
HashMap<String, String> stringStringHashMap = new HashMap<>();
stringStringHashMap.put("content", "正常运行");
......@@ -1808,9 +1951,6 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
stringStringHashMap.put("content", "正常运行");
return ResponseHelper.buildResponse(stringStringHashMap);
}
varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName,
stationBasic.getFanGatewayId(),stationBasic.getBoosterGatewayId());
FeignClientResult<List<String>> sevenEntityMcb = null;
try {
sevenEntityMcb = riskWarningFeign.getRiskHandleByVarDesc(varDesc);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanHealthIndexMapper.java
View file @ bbdbbf35
......@@ -101,7 +101,7 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
@Param("equipmentName") String equipmentName,@Param("syzGatewayId") String syzGatewayId);
String getPointNameByIndexAddress(@Param("varDesc") String varDesc, @Param("tableName") String tableName,
@Param("gatewayId") String gatewayId,@Param("syzGatewayId") String syzGatewayId);
@Param("gatewayId") String gatewayId);
List<FullViewRecallDataDTO> getFullViewRecall(@Param("gatewayIds") List<String> gatewayIds);
......@@ -152,7 +152,7 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
Map<String, Object> getPvEquipStatusByStation(String station);
String getRecDateByIndexAddress(@Param("fanGatewayId") String fanGatewayId,
@Param("indexAddress") String indexAddress, @Param("tableName") String tableName,@Param("syzGatewayId") String syzGatewayId);
@Param("indexAddress") String indexAddress, @Param("tableName") String tableName);
List<Map<String, Object>> getInfoListByTableName(@Param("fanGatewayId") String fanGatewayId,
@Param("indexAddress") String indexAddress, @Param("tableName") String tableName,
......@@ -164,7 +164,7 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
List<Map<String, Object>> queryIndexByArae(String ARAE, String ANALYSISTYPE, String startTimeTop,
String endTimeTop);
Map<String, Object> getHealthIndexByIndexAddress(@Param("gatewayId") String gatewayId, @Param("indexAddress") String indexAddress,@Param("syzGatewayId") String syzGatewayId);
Map<String, Object> getHealthIndexByIndexAddress(@Param("gatewayId") String gatewayId, @Param("indexAddress") String indexAddress);
Map<String, Object> getHealthIndexByIndexAddressPv(@Param("gatewayId") String gatewayId, @Param("indexAddress") String indexAddress,@Param("syzGatewayId") String syzGatewayId);
Map<String, Object> getHealthIndexByIndexAddressPv(@Param("gatewayId") String gatewayId, @Param("indexAddress") String indexAddress);
}
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml
View file @ bbdbbf35
......@@ -757,7 +757,7 @@ FROM (
select POINT_NAME
from ${tableName}
where INDEX_ADDRESS = #{varDesc}
AND (GATEWAY_ID = #{gatewayId} or GATEWAY_ID = #{syzGatewayId})
AND GATEWAY_ID = #{gatewayId}
limit 1
......@@ -1354,7 +1354,7 @@ FROM (
WHERE
INDEX_ADDRESS = #{indexAddress}
AND DISPOSOTION_STATE = '待确认'
AND (GATEWAY_ID = #{fanGatewayId} or GATEWAY_ID = #{syzGatewayId})
AND GATEWAY_ID = #{fanGatewayId}
ORDER BY
sort DESC,
REC_DATE DESC
......@@ -1770,7 +1770,7 @@ TIMESTAMPDIFF( MINUTE, #{startTime} , #{endTime})/10 >= @s-1
from fan_health_index_latest_data
where
INDEX_ADDRESS = #{indexAddress}
AND (GATEWAY_ID = #{gatewayId} or GATEWAY_ID = #{syzGatewayId})
AND GATEWAY_ID = #{gatewayId}
and ANALYSIS_OBJ_TYPE = '测点'
and ANALYSIS_TYPE = '按天'
limit 1
......@@ -1782,7 +1782,7 @@ TIMESTAMPDIFF( MINUTE, #{startTime} , #{endTime})/10 >= @s-1
from pv_health_index_latest_data
where
INDEX_ADDRESS = #{indexAddress}
AND (GATEWAY_ID = #{gatewayId} or GATEWAY_ID = #{syzGatewayId})
AND GATEWAY_ID = #{gatewayId}
and ANALYSIS_OBJ_TYPE = '测点'
and ANALYSIS_TYPE = '按天'
limit 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment