From 17afbc2125b4df86f9d7846c02ddc7bc4a8ccc99 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 31 十月 2024 16:48:47 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
index 75535d9..9c70ed1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
@@ -2,19 +2,30 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.domain.TFoundationConfig;
import com.ruoyi.system.domain.TFoundationPerson;
+import com.ruoyi.system.domain.TShop;
+import com.ruoyi.system.dto.TFoundationPersonBatchDTO;
import com.ruoyi.system.dto.TFoundationPersonDTO;
+import com.ruoyi.system.query.TFoundationPersonQuery;
import com.ruoyi.system.service.TFoundationConfigService;
import com.ruoyi.system.service.TFoundationPersonService;
+import com.ruoyi.system.service.TShopService;
import com.ruoyi.system.vo.TFoundationPersonVO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import oshi.driver.unix.aix.Ls;
+import java.time.LocalDateTime;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -24,24 +35,33 @@
* @author xiaochen
* @since 2024-08-15
*/
+@Api(tags = "基础设置")
@RestController
@RequestMapping("/t-foundation-person")
public class TFoundationPersonController {
private final TFoundationPersonService foundationPersonService;
private final TFoundationConfigService foundationConfigService;
+ private final TShopService shopService;
@Autowired
- public TFoundationPersonController(TFoundationPersonService foundationPersonService, TFoundationConfigService foundationConfigService) {
+ public TFoundationPersonController(TFoundationPersonService foundationPersonService, TFoundationConfigService foundationConfigService, TShopService shopService) {
this.foundationPersonService = foundationPersonService;
this.foundationConfigService = foundationConfigService;
+ this.shopService = shopService;
}
/**
* 查询基础设置列表
*/
+// @ApiOperation( value = "查询基础设置列表")
+// @PostMapping(value = "/list")
+// public AjaxResult<PageInfo<TFoundationPersonVO>> list(@RequestBody TFoundationPersonQuery query) {
+// return AjaxResult.success(foundationPersonService.getList(query));
+// }
+
@ApiOperation( value = "查询基础设置列表")
@PostMapping(value = "/list")
- public AjaxResult<List<TFoundationPersonVO>> list() {
- return AjaxResult.success(foundationPersonService.getList());
+ public AjaxResult<List<TFoundationPersonVO>> list(@RequestBody TFoundationPersonQuery query) {
+ return AjaxResult.success(foundationPersonService.getSetList());
}
/**
@@ -49,7 +69,7 @@
*/
@ApiOperation( value = "添加基础设置")
@PostMapping(value = "/add")
- public AjaxResult<Boolean> add(@RequestBody TFoundationPersonDTO dto) {
+ public AjaxResult<Boolean> add(@RequestBody TFoundationPersonBatchDTO dto) {
foundationPersonService.add(dto);
return AjaxResult.success();
}
@@ -59,7 +79,7 @@
*/
@ApiOperation( value = "修改基础设置")
@PostMapping(value = "/update")
- public AjaxResult<Boolean> update(@RequestBody TFoundationPersonDTO dto) {
+ public AjaxResult<Boolean> update(@RequestBody TFoundationPersonBatchDTO dto) {
foundationPersonService.edit(dto);
return AjaxResult.success();
}
@@ -69,15 +89,19 @@
*/
@ApiOperation( value = "查看基础设置详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TFoundationPersonVO> getDetailById(@RequestParam("id") Long id) {
+ public AjaxResult<List<TFoundationPersonVO>> getDetailByMealType(@RequestParam("mealType") Integer mealType) {
// 查询基础设置
- List<TFoundationConfig> list = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class)
- .eq(TFoundationConfig::getPersonId, id));
- TFoundationPerson foundationPerson = foundationPersonService.getById(id);
- TFoundationPersonVO foundationPersonVO = new TFoundationPersonVO();
- BeanUtils.copyProperties(foundationPerson, foundationPersonVO);
- foundationPersonVO.setFoundationConfigs(list);
- return AjaxResult.success(foundationPersonVO);
+ List<TFoundationPersonVO> foundationPersonVOS = foundationPersonService.getPersonList();
+ List<TFoundationPersonVO> collect = foundationPersonVOS.stream().filter(e -> Objects.equals(e.getMealType(), mealType)).collect(Collectors.toList());
+ for (TFoundationPersonVO foundationPersonVO : collect) {
+ List<TFoundationConfig> list = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class)
+ .eq(TFoundationConfig::getPersonId, foundationPersonVO.getId()));
+ foundationPersonVO.setFoundationConfigs(list);
+ // 查询店铺
+ TShop shop = shopService.getById(foundationPersonVO.getShopId());
+ foundationPersonVO.setShop(shop);
+ }
+ return AjaxResult.success(collect);
}
/**
--
Gitblit v1.7.1