feats

src/main/java/com/njyunzhi/servsummary/controller/TaEcsController.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,11 +53,16 @@ public class TaEcsController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/taEcs")
     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<TaEcs> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaEcs> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
+         QueryWrapper<TaEcs> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.eq(null != status, "status", status);
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
+        queryWrapper.orderByAsc("expire_date");
         IPage<TaEcs> result = taEcsService.page(pg);
         
         return ResponseBean.success(result);
@@ -68,6 +77,15 @@ public class TaEcsController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/taEcs")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaEcs taEcs) throws Exception {
+        if (StringUtils.isEmpty(taEcs.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        TaEcs exist = taEcsService.getExistBy("name", taEcs.getName(), false, true);
+        if (exist != null) {
+            return ResponseBean.error("名称已存在");
+        }
+
         taEcsService.save(taEcs);
         return ResponseBean.success(taEcs);
     }
@@ -82,6 +100,17 @@ public class TaEcsController extends BaseController {
     @PutMapping("/taEcs/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaEcs taEcs,
                             @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+        taEcs.setEcsId(id);
+
+        if (StringUtils.isEmpty(taEcs.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        TaEcs exist = taEcsService.getExistBy("name", taEcs.getName(), false, true);
+        if (exist != null && !exist.getEcsId().equals(id)) {
+            return ResponseBean.error("名称已存在");
+        }
+
         taEcsService.updateById(taEcs);
         return ResponseBean.success(taEcs);
     }

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

@@ -10,6 +10,7 @@ import com.njyunzhi.servsummary.common.ResponseBean;
 import java.util.List;
 
 import com.njyunzhi.servsummary.common.StringUtils;
+import com.njyunzhi.servsummary.entity.TaEcs;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -57,12 +58,12 @@ public class TaPlatformController extends BaseController {
                              @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
 
         IPage<TaPlatform> pg = new Page<>(pageNum, pageSize);
-//        QueryWrapper<TaPlatform> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        QueryWrapper<TaPlatform> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
 //        queryWrapper.eq(null != status, "status", status);
 //        queryWrapper.like(!StringUtils.isEmpty(url), "url", url);
-//        queryWrapper.orderByAsc("expire_date");
-        IPage<TaPlatform> result = taPlatformService.page(pg);
+        queryWrapper.orderByDesc("create_date");
+        IPage<TaPlatform> result = taPlatformService.page(pg, queryWrapper);
 
         return ResponseBean.success(result);
     }
@@ -76,6 +77,15 @@ public class TaPlatformController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/taPlatform")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaPlatform taPlatform) throws Exception {
+        if (StringUtils.isEmpty(taPlatform.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        TaPlatform exist = taPlatformService.getExistBy("name", taPlatform.getName(), false, true);
+        if (exist != null) {
+            return ResponseBean.error("名称已存在");
+        }
+
         taPlatformService.save(taPlatform);
         return ResponseBean.success(taPlatform);
     }
@@ -90,6 +100,17 @@ public class TaPlatformController extends BaseController {
     @PutMapping("/taPlatform/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaPlatform taPlatform,
                              @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        taPlatform.setCloudId(id);
+
+        if (StringUtils.isEmpty(taPlatform.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        TaPlatform exist = taPlatformService.getExistBy("name", taPlatform.getName(), false, true);
+        if (exist != null && !exist.getCloudId().equals(id)) {
+            return ResponseBean.error("名称已存在");
+        }
+
         taPlatformService.updateById(taPlatform);
         return ResponseBean.success(taPlatform);
     }