From facc498b400eb52431452cfac2088e1c78d275ec Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 31 十月 2024 09:52:28 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 ce0710d..bf427a8 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,18 +2,25 @@
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;
@@ -32,19 +39,27 @@
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(query));
}
/**
@@ -52,8 +67,7 @@
*/
@ApiOperation( value = "添加基础设置")
@PostMapping(value = "/add")
- public AjaxResult<Boolean> add(@RequestBody TFoundationPersonDTO dto) {
- dto.setCreateTime(LocalDateTime.now());
+ public AjaxResult<Boolean> add(@RequestBody TFoundationPersonBatchDTO dto) {
foundationPersonService.add(dto);
return AjaxResult.success();
}
@@ -63,7 +77,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();
}
@@ -81,6 +95,9 @@
TFoundationPersonVO foundationPersonVO = new TFoundationPersonVO();
BeanUtils.copyProperties(foundationPerson, foundationPersonVO);
foundationPersonVO.setFoundationConfigs(list);
+ // 查询店铺
+ TShop shop = shopService.getById(foundationPersonVO.getShopId());
+ foundationPersonVO.setShop(shop);
return AjaxResult.success(foundationPersonVO);
}
--
Gitblit v1.7.1