Merge remote-tracking branch 'origin/master'

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/TableJsonUtils.java

@@ -136,6 +136,9 @@ public class TableJsonUtils {
                 needField = needField.substring(0, characterIndex);
             }
         }
+        if(needField.contains("DEFAULT B")) {
+            needField = needField.replace("DEFAULT B","DEFAULT ");
+        }
         return needField;
     }
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/util/TableJsonUtils.java

@@ -89,6 +89,7 @@ public class TableJsonUtils {
                 }
             }
 			sb.append(" OFFLINE_FLAG VARCHAR(2) DEFAULT '0')");
+
             // 拼接完整的建表语句
             createTableSql = createTableSql.substring(0, firstParenthesesIndex+1) + sb.toString();
             // 转成成大写
@@ -130,6 +131,9 @@ public class TableJsonUtils {
                 needField = needField.substring(0, characterIndex);
             }
         }
+        if(needField.contains("DEFAULT B")) {
+            needField = needField.replace("DEFAULT B","DEFAULT ");
+        }
         return needField;
     }
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AnalyseDataServiceImpl.java

@@ -73,10 +73,12 @@ public class AnalyseDataServiceImpl implements IAnalyseDataService {
 		analyzeDataConditionPO.setEndTime(LocalDateTime.parse(DateUtil.format(new Date(), endTime), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATETIME)));
 		signboardConditions.add(analyzeDataConditionPO);
 		po.setSignboardConditions(signboardConditions);
+		log.error("period_target_data_request {}",po);
 		R<List<AnalyzeDataConditionVO>> result = analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(po);
 		if (!result.isSuccess() || CollectionUtil.isEmpty(result.getData())) {
 			return new ArrayList<>();
 		}
+		log.error("period_target_data_resp {}",result);
 		return result.getData().get(0).getList();
 	}
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java

@@ -749,7 +749,12 @@ public class HydropowerServiceImpl implements HydropowerService {
 		if(CollectionUtil.isEmpty(realList)){
 			return 0.0;
 		}
-		return realList.stream().filter(o->deptId.equals(o.getDeptId())).mapToDouble(HydropowerUnitRealVo::getActivePower).sum();
+		return realList.stream().filter(o->deptId.equals(o.getDeptId())).mapToDouble(o->{
+			if("MW".equalsIgnoreCase(o.getPowerUnit())){
+				return o.getActivePower() * 1000;
+			}
+			return o.getActivePower();
+		}).sum();
 	}
 
 	/**
@@ -1006,7 +1011,12 @@ public class HydropowerServiceImpl implements HydropowerService {
 				// 容量
 				kpi.setInstalledCapacity(reals.stream().mapToDouble(HydropowerUnitRealVo::getInstalledCapacity).sum());
 				// 负荷
-				kpi.setLoad(reals.stream().mapToDouble(HydropowerUnitRealVo::getActivePower).sum());
+				kpi.setLoad(reals.stream().mapToDouble(o->{
+					if("MW".equalsIgnoreCase(o.getPowerUnit())){
+						return o.getActivePower() * 1000;
+					}
+					return o.getActivePower();
+				}).sum());
 				// 容量利用率
 				if (Math.abs(kpi.getInstalledCapacity()) <= 0) {
 					kpi.setCapacityRate(0.0);
@@ -1105,7 +1115,12 @@ public class HydropowerServiceImpl implements HydropowerService {
 			// 实时数据: 容量利用率、电站利用率
 			if(CollectionUtil.isNotEmpty(reals)){
 				// 实时功率
-				double use = reals.stream().filter(real->entry.getValue().stream().map(StationEntity::getRefDept).collect(Collectors.toList()).contains(real.getDeptId())).mapToDouble(HydropowerUnitRealVo::getActivePower).sum();
+				double use = reals.stream().filter(real->entry.getValue().stream().map(StationEntity::getRefDept).collect(Collectors.toList()).contains(real.getDeptId())).mapToDouble(o->{
+					if("MW".equalsIgnoreCase(o.getPowerUnit())){
+						return o.getActivePower() * 1000;
+					}
+					return o.getActivePower();
+				}).sum();
 				if(CollectionUtil.isNotEmpty(plans)){
 					// 装机容量
 					double capacity = reals.stream().filter(real-> entry.getValue().stream().map(StationEntity::getRefDept).collect(Collectors.toList()).contains(real.getDeptId())).mapToDouble(HydropowerUnitRealVo::getInstalledCapacity).sum();
@@ -1651,7 +1666,7 @@ public class HydropowerServiceImpl implements HydropowerService {
 			return;
 		}
 		item.setNextShift(nextDuty.getClassName());
-		item.setNextTeam(Optional.ofNullable(nextDuty.getGroupName()).orElse("灵活排版"));
+		item.setNextTeam(Optional.ofNullable(nextDuty.getGroupName()).orElse("灵活排班"));
 		// 下一班组负责人
 		String managerName = this.getManagerName(nextDuty.getManagerId());
 		item.setNextTeamLeader(managerName);