|
@@ -2,7 +2,9 @@ package com.jjt.biz.service.impl;
|
|
|
|
|
|
import com.jjt.biz.service.IApiYrService;
|
|
|
import com.jjt.biz.vo.*;
|
|
|
+import com.jjt.calc.domain.TwinCalcDayYhj;
|
|
|
import com.jjt.calc.domain.TwinCalcHourYhj;
|
|
|
+import com.jjt.calc.service.ITwinCalcDayYhjService;
|
|
|
import com.jjt.common.constant.CacheConstants;
|
|
|
import com.jjt.common.core.redis.RedisCache;
|
|
|
import com.jjt.common.utils.DateUtils;
|
|
@@ -32,6 +34,8 @@ public class ApiYrServiceImpl implements IApiYrService {
|
|
|
private RedisCache redisCache;
|
|
|
@Resource
|
|
|
private ITwinRzCalcMonthService rzCalcMonthService;
|
|
|
+ @Resource
|
|
|
+ private ITwinCalcDayYhjService calcDayYhjService;
|
|
|
|
|
|
/**
|
|
|
* 获取产线状态
|
|
@@ -179,14 +183,16 @@ public class ApiYrServiceImpl implements IApiYrService {
|
|
|
*
|
|
|
* @return 结果
|
|
|
*/
|
|
|
- public List<YrProdTradeVO> prodTrade(List<TwinRzCalcMonth> list) {
|
|
|
+ public List<YrProdTradeVO> prodTrade(List<TwinRzCalcMonth> list, List<TwinCalcDayYhj> yhjList) {
|
|
|
+ Map<Date, List<TwinCalcDayYhj>> yhjMap = yhjList.stream().collect(Collectors.groupingBy(TwinCalcDayYhj::getTime));
|
|
|
List<YrProdTradeVO> result = new ArrayList<>();
|
|
|
for (TwinRzCalcMonth cm : list) {
|
|
|
YrProdTradeVO vo = new YrProdTradeVO();
|
|
|
LocalDate ldt = DateUtils.toLocalDate(cm.getDataDate());
|
|
|
+ List<TwinCalcDayYhj> yhjs = yhjMap.get(cm.getDataDate());
|
|
|
vo.setDate(ldt.getDayOfMonth() + "");
|
|
|
vo.setTips(ldt.toString());
|
|
|
- vo.split(cm.getLength(), cm.getWeight());
|
|
|
+ vo.split(yhjs, cm.getLength(), cm.getWeight());
|
|
|
result.add(vo);
|
|
|
}
|
|
|
return result;
|
|
@@ -219,10 +225,14 @@ public class ApiYrServiceImpl implements IApiYrService {
|
|
|
vo.setEff(effList);
|
|
|
TwinRzCalcMonth calcMonth = new TwinRzCalcMonth();
|
|
|
Map<String, Object> params = new HashMap<>(16);
|
|
|
- params.put("start", LocalDate.now().minusDays(30));
|
|
|
+ params.put("start", LocalDate.now().minusDays(30).toString());
|
|
|
+ calcMonth.setParams(params);
|
|
|
List<TwinRzCalcMonth> list = rzCalcMonthService.selectTwinRzCalcMonthList(calcMonth);
|
|
|
+ TwinCalcDayYhj yhj = new TwinCalcDayYhj();
|
|
|
+ yhj.setParams(params);
|
|
|
+ List<TwinCalcDayYhj> yhjList = calcDayYhjService.selectTwinCalcDayYhjList(yhj);
|
|
|
calcMonth.setParams(params);
|
|
|
- vo.setProdTrade(prodTrade(list));
|
|
|
+ vo.setProdTrade(prodTrade(list, yhjList));
|
|
|
vo.setEnergyTrade(energyTrade(list));
|
|
|
redisCache.setCacheObject(CacheConstants.RZ_MOCK, vo);
|
|
|
}
|