feats

src/main/java/com/njyunzhi/servsummary/controller/TaOssBucketController.java

@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njyunzhi.servsummary.common.BaseController;
+import com.njyunzhi.servsummary.common.Constants;
 import com.njyunzhi.servsummary.common.ResponseBean;
 import java.util.List;
+
+import com.njyunzhi.servsummary.common.StringUtils;
+import com.njyunzhi.servsummary.entity.TaSsl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -49,12 +53,17 @@ public class TaOssBucketController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/taOssBucket")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                             @ApiParam("名称") @RequestParam(value = "name", required = false) String name,
+                             @ApiParam("状态") @RequestParam(value = "status", required = false) Integer status) throws Exception {
         
         IPage<TaOssBucket> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaOssBucket> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TaOssBucket> result = taOssBucketService.page(pg);
+        QueryWrapper<TaOssBucket> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.eq(null != status, "status", status);
+        queryWrapper.like(!StringUtils.isEmpty(name), "url", name);
+        queryWrapper.orderByDesc("create_date");
+        IPage<TaOssBucket> result = taOssBucketService.page(pg, queryWrapper);
         
         return ResponseBean.success(result);
     }
@@ -68,6 +77,15 @@ public class TaOssBucketController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/taOssBucket")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaOssBucket taOssBucket) throws Exception {
+        if (StringUtils.isEmpty(taOssBucket.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        TaOssBucket exist = taOssBucketService.getExistBy("name", taOssBucket.getName(), false, true);
+        if (exist != null) {
+            return ResponseBean.error("名称已存在");
+        }
+
         taOssBucketService.save(taOssBucket);
         return ResponseBean.success(taOssBucket);
     }
@@ -82,6 +100,17 @@ public class TaOssBucketController extends BaseController {
     @PutMapping("/taOssBucket/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaOssBucket taOssBucket,
                             @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+        taOssBucket.setBucketId(id);
+
+        if (StringUtils.isEmpty(taOssBucket.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        TaOssBucket exist = taOssBucketService.getExistBy("name", taOssBucket.getName(), false, true);
+        if (exist != null && !exist.getBucketId().equals(id)) {
+            return ResponseBean.error("名称已存在");
+        }
+
         taOssBucketService.updateById(taOssBucket);
         return ResponseBean.success(taOssBucket);
     }