From 9d006c9c8355370a7500e01e00ea133c99bf8c4b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 29 十月 2024 18:26:25 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/TFoundationPersonBatchDTO.java | 18 ++++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java | 7 +++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java | 5 +++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java | 9 +++++----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java | 5 +++--
5 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
index 45be106..74584cc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
@@ -95,6 +95,13 @@
return AjaxResult.success(dataGeneratorService.pageList(query));
}
+ @ApiOperation( value = "数据生成删除")
+ @DeleteMapping(value = "/deleteById")
+ public AjaxResult<String> deleteById(@RequestParam("id") Long id) {
+ dataGeneratorService.removeById(id);
+ return AjaxResult.success();
+ }
+
@ApiOperation( value = "数据覆盖")
@GetMapping(value = "/dataCoverage")
public AjaxResult<String> dataCoverage(@RequestParam(value = "id") Long id) {
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 d529933..cf652a1 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
@@ -7,6 +7,7 @@
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;
@@ -59,7 +60,7 @@
*/
@ApiOperation( value = "添加基础设置")
@PostMapping(value = "/add")
- public AjaxResult<Boolean> add(@RequestBody List<TFoundationPersonDTO> dto) {
+ public AjaxResult<Boolean> add(@RequestBody TFoundationPersonBatchDTO dto) {
foundationPersonService.add(dto);
return AjaxResult.success();
}
@@ -69,7 +70,7 @@
*/
@ApiOperation( value = "修改基础设置")
@PostMapping(value = "/update")
- public AjaxResult<Boolean> update(@RequestBody List<TFoundationPersonDTO> dto) {
+ public AjaxResult<Boolean> update(@RequestBody TFoundationPersonBatchDTO dto) {
foundationPersonService.edit(dto);
return AjaxResult.success();
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TFoundationPersonBatchDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TFoundationPersonBatchDTO.java
new file mode 100644
index 0000000..0d57aad
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TFoundationPersonBatchDTO.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.dto;
+
+import com.ruoyi.system.domain.TFoundationConfig;
+import com.ruoyi.system.domain.TFoundationPerson;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "基础设置批量DTO")
+public class TFoundationPersonBatchDTO extends TFoundationPerson {
+
+ @ApiModelProperty(value = "菜品设置")
+ private List<TFoundationPersonDTO> foundationPersonDTOS;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java
index 1530193..8fa63d9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.domain.TFoundationConfig;
import com.ruoyi.system.domain.TFoundationPerson;
+import com.ruoyi.system.dto.TFoundationPersonBatchDTO;
import com.ruoyi.system.dto.TFoundationPersonDTO;
import com.ruoyi.system.query.TFoundationPersonQuery;
import com.ruoyi.system.vo.TFoundationPersonVO;
@@ -25,13 +26,13 @@
* @param dto
* @return
*/
- void add(List<TFoundationPersonDTO> dto);
+ void add(TFoundationPersonBatchDTO dto);
/**
* 修改基础设置
* @param dto
*/
- void edit(List<TFoundationPersonDTO> dto);
+ void edit(TFoundationPersonBatchDTO dto);
/**
* 查询基础设置列表
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
index cc1982f..70e8cfb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.domain.TFoundationConfig;
import com.ruoyi.system.domain.TFoundationPerson;
+import com.ruoyi.system.dto.TFoundationPersonBatchDTO;
import com.ruoyi.system.dto.TFoundationPersonDTO;
import com.ruoyi.system.mapper.TFoundationPersonMapper;
import com.ruoyi.system.query.TFoundationPersonQuery;
@@ -39,8 +40,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void add(List<TFoundationPersonDTO> dto) {
- for (TFoundationPersonDTO tFoundationPersonDTO : dto) {
+ public void add(TFoundationPersonBatchDTO dto) {
+ for (TFoundationPersonDTO tFoundationPersonDTO : dto.getFoundationPersonDTOS()) {
List<TFoundationConfig> foundationConfigs = tFoundationPersonDTO.getFoundationConfigs();
long count = foundationConfigs.stream().map(TFoundationConfig::getTypeId).distinct().count();
if(foundationConfigs.size()!=count){
@@ -57,9 +58,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void edit(List<TFoundationPersonDTO> dto) {
+ public void edit(TFoundationPersonBatchDTO dto) {
- for (TFoundationPersonDTO tFoundationPersonDTO : dto) {
+ for (TFoundationPersonDTO tFoundationPersonDTO : dto.getFoundationPersonDTOS()) {
List<TFoundationConfig> foundationConfigs = tFoundationPersonDTO.getFoundationConfigs();
long count = foundationConfigs.stream().map(TFoundationConfig::getTypeId).distinct().count();
if(foundationConfigs.size()!=count){
--
Gitblit v1.7.1