|
@@ -54,12 +54,6 @@ public class TwinCalcStopController extends BaseController {
|
|
|
@ApiOperation("停机统计")
|
|
|
@GetMapping("/calc")
|
|
|
public R calc(TwinCalcStop twinCalcStop) {
|
|
|
-// PageDomain pageDomain = TableSupport.buildPageRequest();
|
|
|
-// Integer pageNum = pageDomain.getPageNum();
|
|
|
-// int pageSize = 100000;
|
|
|
-// String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
|
|
|
-// Boolean reasonable = pageDomain.getReasonable();
|
|
|
-// PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
|
|
|
List<TwinCalcStop> list = twinCalcStopService.selectTwinCalcStopList(twinCalcStop);
|
|
|
Map<Integer, List<TwinCalcStop>> stopDeviceGroup = list.stream().collect(Collectors.groupingBy(TwinCalcStop::getStopType, LinkedHashMap::new, Collectors.toList()));
|
|
|
int stopSize = 7;
|
|
@@ -99,7 +93,7 @@ public class TwinCalcStopController extends BaseController {
|
|
|
}
|
|
|
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
- result.put("list", list);
|
|
|
+// result.put("list", list);
|
|
|
result.put("calc", calcList);
|
|
|
|
|
|
return R.success(result);
|