Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop

Browse Source
This commit is contained in:
huangdeliang
2021-02-24 08:55:57 +08:00
parent 62e2d22d24 c3910b627f
commit 13727e8d39
20 changed files with 537 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysFoodHeatStatisticsController.java
View File

@ -6,14 +6,7 @@ import com.stdiet.custom.domain.SysCustomerHeatStatistics;
import com.stdiet.custom.service.ISysCustomerHeatStatisticsService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
@ -111,4 +104,14 @@ public class SysFoodHeatStatisticsController extends BaseController
{
return toAjax(sysCustomerHeatStatisticsService.calculateCustomerHeat(sysCustomerHeatStatistics));
}
/**
* 查看外食热量统计详细信息
*/
@PreAuthorize("@ss.hasPermi('custom:foodHeatStatistics:query')")
@GetMapping(value = "/getNutritionalCalories")
public AjaxResult getNutritionalCalories(@RequestParam("id") Long id)
{
return AjaxResult.success(sysCustomerHeatStatisticsService.getNutritionalCaloriesByCustomerHeatId(id));
}
}