|
@@ -532,27 +532,15 @@ public class EconomicService {
|
|
|
MaxVo maxVo = new MaxVo();
|
|
|
temp2 = maxs.get(0).getPointValueInDouble();
|
|
|
maxVo.setMaxs(StringUtils.round(temp2, 2));
|
|
|
- maxVo.setName(wt2.getName());
|
|
|
- maxVo.setId(wt2.getId());
|
|
|
- maxVo.setTime(maxs.get(0).getPointTime());
|
|
|
|
|
|
- MinVo minVo = new MinVo();
|
|
|
temp3 = mins.get(0).getPointValueInDouble();
|
|
|
- minVo.setMins(StringUtils.round(temp3, 2));
|
|
|
- minVo.setName(wt2.getName());
|
|
|
- minVo.setId(wt2.getId());
|
|
|
- minVo.setTime(mins.get(0).getPointTime());
|
|
|
+ maxVo.setMins(StringUtils.round(temp3, 2));
|
|
|
|
|
|
- AveVo aveVo = new AveVo();
|
|
|
temp4 = ave.get(0).getPointValueInDouble();
|
|
|
- aveVo.setAves(StringUtils.round(temp4, 2));
|
|
|
- aveVo.setName(wt2.getName());
|
|
|
- aveVo.setId(wt2.getId());
|
|
|
- aveVo.setTime(ave.get(0).getPointTime());
|
|
|
+ maxVo.setAves(StringUtils.round(temp4, 2));
|
|
|
+
|
|
|
|
|
|
maxvalue.add(maxVo);
|
|
|
- minvalue.add(minVo);
|
|
|
- avevalue.add(aveVo);
|
|
|
|
|
|
}
|
|
|
|
|
@@ -568,10 +556,8 @@ public class EconomicService {
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new LinkedHashMap<>();
|
|
|
-// map.put("result", result);
|
|
|
- map.put("maxs", maxvalue);
|
|
|
- map.put("mins", minvalue);
|
|
|
- map.put("aves", avevalue);
|
|
|
+
|
|
|
+ map.put("value", maxvalue);
|
|
|
map.put("list", vo);
|
|
|
|
|
|
|