From 7c1335ff559c08bbcef479bd2b01a08a1f4e55f2 Mon Sep 17 00:00:00 2001 From: guyue <1721849008@qq.com> Date: 星期五, 15 八月 2025 10:59:18 +0800 Subject: [PATCH] 增加json时区,修付开始采集状态,修改导出校验 --- src/main/java/com/linghu/controller/SectionalizationController.java | 61 ++++++++++++++++++++++++------ 1 files changed, 48 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/linghu/controller/SectionalizationController.java b/src/main/java/com/linghu/controller/SectionalizationController.java index 96398dc..307e599 100644 --- a/src/main/java/com/linghu/controller/SectionalizationController.java +++ b/src/main/java/com/linghu/controller/SectionalizationController.java @@ -1,11 +1,20 @@ package com.linghu.controller; +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.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; @RestController @RequestMapping("/sectionalization") @@ -14,33 +23,59 @@ @Autowired private SectionalizationService sectionalizationService; -/* - @PostMapping - @ApiOperation(value = "添加类型") - public ResponseResult<User> add(@RequestBody User user) { - boolean success = typeService.save(type); - if (success) { - return ResponseResult.success(type); - } - return ResponseResult.error("添加类型失败"); - } -*/ /** * 新增分组 */ + @PostMapping + @ApiOperation(value = "添加") + public ResponseResult add(@Valid @RequestBody Sectionalization sectionalization) { + return sectionalizationService.addSectionalization(sectionalization); + } + /** * 修改分组 */ + @PutMapping + @ApiOperation(value = "修改") + public ResponseResult edit(@Validated(UpdateGroup.class) @RequestBody Sectionalization sectionalization) { + return sectionalizationService.edit(sectionalization); + + } + /** * 删除分组 */ + @DeleteMapping("/{sectionalization_id}") + @ApiOperation(value = "删除") + public ResponseResult delete(@PathVariable("sectionalization_id") Integer sectionalization_id) { + sectionalizationService.removeById(sectionalization_id); + return ResponseResult.success(); + + } /** * 分组列表 */ + @GetMapping() + @ApiOperation(value = "获取分组列表") + public ResponseResult<List<Sectionalization>> list() { + List<Sectionalization> list = sectionalizationService.list(); + return ResponseResult.success(list); + } + + /** + * 列表和底下用户数据 + */ + @GetMapping("/sectionalizationUser") + @ApiOperation(value = "获取分组列表和底下用户数据") + public ResponseResult<List<SectionalizationUserVO>> sectionalizationUser() { + List<SectionalizationUserVO> list = sectionalizationService.SectionalizationUser(); + return ResponseResult.success(list); + + } } -- Gitblit v1.7.1