Commit c1f3a9f3 authored by duanruiming's avatar duanruiming

[add] 策略列表添加返显名称

parent 508fe8ea
...@@ -211,7 +211,7 @@ public class StrategyControlServiceImpl implements StrategyControlService { ...@@ -211,7 +211,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
log.error("优化策略查询失败:", e); log.error("优化策略查询失败:", e);
JsonViewObject.newInstance().fail("优化策略查询失败"); JsonViewObject.newInstance().fail("优化策略查询失败");
} }
List<StrategyControlHistVO> sorted = results.stream().sorted(Comparator.comparing(StrategyControlHistVO::getOptTime).reversed()).collect(Collectors.toList()); List<StrategyControlHistVO> sorted = results.stream().limit(3000).sorted(Comparator.comparing(StrategyControlHistVO::getOptTime).reversed()).collect(Collectors.toList());
return JsonViewObject.newInstance().success(sorted); return JsonViewObject.newInstance().success(sorted);
} }
...@@ -247,7 +247,7 @@ public class StrategyControlServiceImpl implements StrategyControlService { ...@@ -247,7 +247,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
} }
} }
queryWrapper.orderByDesc(StrategyCrossResultEntity::getIssueTime); queryWrapper.orderByDesc(StrategyCrossResultEntity::getIssueTime);
queryWrapper.last("limit 3000"); queryWrapper.last("limit 4000");
List<StrategyCrossResultEntity> resultEntities = strategyCrossResultMapper.selectList(queryWrapper); List<StrategyCrossResultEntity> resultEntities = strategyCrossResultMapper.selectList(queryWrapper);
if (!CollectionUtils.isEmpty(resultEntities)) { if (!CollectionUtils.isEmpty(resultEntities)) {
for (StrategyCrossResultEntity resultEntity : resultEntities) { for (StrategyCrossResultEntity resultEntity : resultEntities) {
...@@ -723,6 +723,7 @@ public class StrategyControlServiceImpl implements StrategyControlService { ...@@ -723,6 +723,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
executePlan.setEndTime(planInfoEntity.getEndTime()); executePlan.setEndTime(planInfoEntity.getEndTime());
executePlan.setStatus(planInfoEntity.getStatus()); executePlan.setStatus(planInfoEntity.getStatus());
executePlan.setType(planInfoEntity.getType()); executePlan.setType(planInfoEntity.getType());
executePlan.setName(planInfoEntity.getName());
String planDetailsStr = planInfoEntity.getPlanDetails(); String planDetailsStr = planInfoEntity.getPlanDetails();
List<StrategyControlDetailList.ExecutePlan.PlanDetail> planDetails = instance.readValue(planDetailsStr, new TypeReference<List<StrategyControlDetailList.ExecutePlan.PlanDetail>>() { List<StrategyControlDetailList.ExecutePlan.PlanDetail> planDetails = instance.readValue(planDetailsStr, new TypeReference<List<StrategyControlDetailList.ExecutePlan.PlanDetail>>() {
}); });
...@@ -739,6 +740,7 @@ public class StrategyControlServiceImpl implements StrategyControlService { ...@@ -739,6 +740,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
StrategyControlDetailList.DailyPlan dailyPlan = new StrategyControlDetailList.DailyPlan(); StrategyControlDetailList.DailyPlan dailyPlan = new StrategyControlDetailList.DailyPlan();
dailyPlan.setCrossId(dailyPlanInfoEntity.getCrossId()); dailyPlan.setCrossId(dailyPlanInfoEntity.getCrossId());
dailyPlan.setDailyPlanId(dailyPlanInfoEntity.getDailyPlanId()); dailyPlan.setDailyPlanId(dailyPlanInfoEntity.getDailyPlanId());
dailyPlan.setName(dailyPlanInfoEntity.getName());
String dailyPlanDetailsStr = dailyPlanInfoEntity.getDailyPlanDetails(); String dailyPlanDetailsStr = dailyPlanInfoEntity.getDailyPlanDetails();
List<StrategyControlDetailList.DailyPlan.DailyPlanDetail> dailyPlanDetails = instance.readValue(dailyPlanDetailsStr, new TypeReference<List<StrategyControlDetailList.DailyPlan.DailyPlanDetail>>() { List<StrategyControlDetailList.DailyPlan.DailyPlanDetail> dailyPlanDetails = instance.readValue(dailyPlanDetailsStr, new TypeReference<List<StrategyControlDetailList.DailyPlan.DailyPlanDetail>>() {
}); });
......
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