|
@@ -211,15 +211,11 @@ public class ApiController extends BaseController {
|
|
|
@ApiOperation("配方详情")
|
|
|
@GetMapping("/api/formula/detail/{height}")
|
|
|
@CrossOrigin(origins = "*")
|
|
|
- public R formulaDetail(@PathVariable Float height, String month) {
|
|
|
- Map<String, Object> result = new HashMap<>();
|
|
|
+ public R formulaDetail(@PathVariable Float height) {
|
|
|
List<FormulaDetail> list = redisCache.getCacheObject(CacheConstants.INDEX_FORMULA_DETAIL);
|
|
|
if (list != null) {
|
|
|
list = list.stream().filter(detail -> detail.getFormula_data_15().equals(height)).collect(Collectors.toList());
|
|
|
- result.put("curr", list);
|
|
|
- List<SpecVO> specs = specService.selectSpec(month, height);
|
|
|
- result.put("his", specs);
|
|
|
- return R.success(result);
|
|
|
+ return R.success(list);
|
|
|
} else {
|
|
|
return R.fail();
|
|
|
}
|