From dd028e18a12ad9ae7c43ed09b15ddd6bde1a43e9 Mon Sep 17 00:00:00 2001 From: guyue <1721849008@qq.com> Date: 星期三, 03 九月 2025 11:27:50 +0800 Subject: [PATCH] 采集中状态修改提前,统计数据合并 --- src/main/java/com/linghu/controller/SectionalizationController.java | 28 ++++++++++------------------ 1 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/linghu/controller/SectionalizationController.java b/src/main/java/com/linghu/controller/SectionalizationController.java index 223add5..307e599 100644 --- a/src/main/java/com/linghu/controller/SectionalizationController.java +++ b/src/main/java/com/linghu/controller/SectionalizationController.java @@ -3,14 +3,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.linghu.model.common.ResponseResult; import com.linghu.model.entity.Sectionalization; +import com.linghu.model.validator.UpdateGroup; import com.linghu.model.vo.SectionalizationUserVO; import com.linghu.service.SectionalizationService; import com.linghu.service.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; @RestController @@ -27,33 +30,22 @@ @PostMapping @ApiOperation(value = "添加") - public ResponseResult add(@RequestBody Sectionalization sectionalization) { - List<Sectionalization> list = sectionalizationService.list(new LambdaQueryWrapper<Sectionalization>().eq(Sectionalization::getSectionalization_name, sectionalization.getSectionalization_name())); - if (list != null && list.size() > 0) { - return ResponseResult.error("该分组已存在"); - } - sectionalizationService.save(sectionalization); - return ResponseResult.success(); - + public ResponseResult add(@Valid @RequestBody Sectionalization sectionalization) { + return sectionalizationService.addSectionalization(sectionalization); } + /** * 修改分组 */ - @PutMapping @ApiOperation(value = "修改") - public ResponseResult edit(@RequestBody Sectionalization sectionalization) { - List<Sectionalization> list = sectionalizationService.list(new LambdaQueryWrapper<Sectionalization>() - .ne(Sectionalization::getSectionalization_id, sectionalization.getSectionalization_id()) - .eq(Sectionalization::getSectionalization_name, sectionalization.getSectionalization_name())); - if (list != null && list.size() > 0) { - return ResponseResult.error("该分组已存在"); - } - sectionalizationService.updateById(sectionalization); - return ResponseResult.success(); + public ResponseResult edit(@Validated(UpdateGroup.class) @RequestBody Sectionalization sectionalization) { + return sectionalizationService.edit(sectionalization); } + + /** * 删除分组 */ -- Gitblit v1.7.1