فهرست منبع

fix bug:关系总览--设备常规电源---下载数据为空的问题

lijie 3 سال پیش
والد
کامیت
2468a82dac

+ 4 - 4
src/main/java/com/persagy/proxy/adm/constant/AdmRelationType.java

@@ -76,16 +76,16 @@ public interface AdmRelationType {
 	
 	
 	/** EQUIPPOWER_EQBACKUP  设备备用电源-低/高压开关柜→用电设备*/
-	String EQUIPPOWER_EQBACKUP = "EquipPower_EqBackup";
+	String EQUIPPOWER_EQBACKUP = "MechPower_EqBackup";
 	
 	/** EQUIPPOWER_EQNORMAL  设备常规电源-低/高压开关柜→用电设备*/
-	String EQUIPPOWER_EQNORMAL = "EquipPower_EqNormal";
+	String EQUIPPOWER_EQNORMAL = "MechPower_EqNormal";
 	
 	/** EQUIPPOWER_SYBACKUP  系统备用电源-低/高压开关柜→用电设备*/
-	String EQUIPPOWER_SYBACKUP = "EquipPower_SyBackup";
+	String EQUIPPOWER_SYBACKUP = "MechPower_SyBackup";
 	
 	/** EQUIPPOWER_SYNORMAL  系统常规电源-低/高压开关柜→用电设备*/
-	String EQUIPPOWER_SYNORMAL = "EquipPower_SyNormal";
+	String EQUIPPOWER_SYNORMAL = "MechPower_SyNormal";
 	
 	
 	

+ 1 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerEqBackupRelationObject.java

@@ -73,7 +73,7 @@ public class EquipPowerEqBackupRelationObject extends AbstractReportRelationObje
 	
 	@Override
 	protected AdmRelationObject handleObjectDigital(ObjectDigital master, ObjectDigital slave, String groupCode, String projectId) {
-		throw new UnsupportedOperationException("未实现的策略方法");
+		return this.convertObject(master, "设备", slave, "设备");
 	}
 
 	@Override

+ 1 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerEqNormalRelationObject.java

@@ -73,7 +73,7 @@ public class EquipPowerEqNormalRelationObject extends AbstractReportRelationObje
 	
 	@Override
 	protected AdmRelationObject handleObjectDigital(ObjectDigital master, ObjectDigital slave, String groupCode, String projectId) {
-		throw new UnsupportedOperationException("未实现的策略方法");
+		return this.convertObject(master, "设备", slave, "设备");
 	}
 
 	@Override

+ 1 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerSyBackupRelationObject.java

@@ -73,7 +73,7 @@ public class EquipPowerSyBackupRelationObject extends AbstractReportRelationObje
 	
 	@Override
 	protected AdmRelationObject handleObjectDigital(ObjectDigital master, ObjectDigital slave, String groupCode, String projectId) {
-		throw new UnsupportedOperationException("未实现的策略方法");
+		return this.convertObject(master, "设备", slave, "系统");
 	}
 
 	@Override

+ 1 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerSyNormalRelationObject.java

@@ -73,7 +73,7 @@ public class EquipPowerSyNormalRelationObject extends AbstractReportRelationObje
 	
 	@Override
 	protected AdmRelationObject handleObjectDigital(ObjectDigital master, ObjectDigital slave, String groupCode, String projectId) {
-		throw new UnsupportedOperationException("未实现的策略方法");
+		return this.convertObject(master, "设备", slave, "系统");
 	}
 
 	@Override

+ 4 - 0
src/main/java/com/persagy/proxy/report/controller/RelationReportController.java

@@ -453,6 +453,10 @@ public class RelationReportController {
 			}
 			
 			File templateFile = AdmExcelUtil.getTemplateFile("relation-template.xlsx");
+			if (CollUtil.isEmpty(relationObjects)){
+				EasyExcel.write(response.getOutputStream()).withTemplate(templateFile).sheet(EXPORT_SHEET_NAME).needHead(false);
+				return;
+			}
 			EasyExcel.write(response.getOutputStream()).withTemplate(templateFile).sheet(EXPORT_SHEET_NAME).needHead(false).doWrite(relationObjects);
 		} catch (Exception e) {
 			log.error("深化点导入失败", e);