Commit 854c2ded authored by chenzhao's avatar chenzhao

修改代码

parent e74cf60d
package com.yeejoin.amos.boot.module.jxiop.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public enum KGName {
DLQ("断路器","dlq"),
DAZ("刀闸","daz"),
DCK("低测控","dck"),
GCK("高测控","gck"),
CK("测控","ck"),
MXDZ("母线PT刀闸","mxdc"),
BTCK("本体测控","btck");
private String name;
private String code;
public static String getCode(String name) {
for (KGName electricQuantity : KGName.values())
{
if (electricQuantity.getName().equals(name))
{
return electricQuantity.getCode();
}
}
return null;
}
}
......@@ -452,11 +452,11 @@ public class MonitorFanIdxController extends BaseController {
String gatewayId = stationBasic.getBoosterGatewayId();
Map<String, String> map = monitorFanIndicatorMapper.getMajorBoosterStationInfoBySort(stationId, equipName);
Map<String, String> map = monitorFanIndicatorMapper.getMajorBoosterStationInfoBySort(gatewayId, equipName);
String name = map.get("text").contains("主变")?map.get("text").substring(0,3):map.get("text");
Map<String, Object> switchUrl = monitorFanIndicatorImpl.getSwitchUrl(stationId, name);
Map<String, Object> switchUrl = monitorFanIndicatorImpl.getSwitchUrl(gatewayId, name);
List<Map<String, Object>> statusMonitoring = monitorFanIndicator.getStatusGzp(gatewayId ,"光字牌",name);
IPage<Map<String, Object>> result = new Page<>();
switchUrl.put("records",statusMonitoring);
......
......@@ -28,6 +28,7 @@ public class IndicatorsDto {
private String displayName;
private String pictureName;
private String title;
private String state;
public String getTime() {
......
......@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.jxiop.api.Enum.ElectricQuantity;
import com.yeejoin.amos.boot.module.jxiop.api.Enum.KGName;
import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
import com.yeejoin.amos.boot.module.jxiop.api.dto.TreeDto;
import com.yeejoin.amos.boot.module.jxiop.api.entity.MonitorFanIndicator;
......@@ -1077,8 +1078,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
url =pictureUrl+ urls[1];;
}
photoUrls.put(datass.getDisplayName().split("_")[0]+"jddwz",url);
}
for (IndicatorsDto data : listDatas) {
String url = "";
String[] urls = data.getPictureName().split(",");
......@@ -1087,7 +1088,11 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
}else {
url =pictureUrl+ urls[1];;
}
photoUrls.put(data.getDisplayName().split("_")[0]+"yfjdkgurl",url);
if (data.getDisplayName().split("_").length > 2){
photoUrls.put(KGName.getCode(data.getDisplayName().split("_")[1]),url);
}else {
photoUrls.put(data.getDisplayName().split("_")[0]+"yfjdkgurl",url);
}
}
for (IndicatorsDto listDatum : listData) {
......
......@@ -103,4 +103,4 @@ myqueue=amos.privilege.v1.JXIOP.AQSC_FDGL.userBusiness
# ?????????
fan.statuts.stattuspath=upload/jxiop/device_status
pictureUrl=
pictureUrl=upload/jxiop/syz/
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