feats

src/main/java/com/njyunzhi/servsummary/controller/TaPlatformController.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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +18,9 @@ import org.springframework.web.bind.annotation.*;
 import com.njyunzhi.servsummary.entity.TaPlatform;
 import com.njyunzhi.servsummary.service.TaPlatformService;
 
- /**
+/**
  * 云平台;(ta_platform)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-11-22
  */
@@ -23,12 +28,12 @@ import com.njyunzhi.servsummary.service.TaPlatformService;
 @RestController
 @RequestMapping("/")
 public class TaPlatformController extends BaseController {
-    
+
     @Autowired
     private TaPlatformService taPlatformService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param cloudId 主键
      * @return 实例对象
@@ -38,28 +43,31 @@ public class TaPlatformController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(taPlatformService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/taPlatform")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
+
         IPage<TaPlatform> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaPlatform> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
+//        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);
-        
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taPlatform 实例对象
@@ -71,8 +79,8 @@ public class TaPlatformController extends BaseController {
         taPlatformService.save(taPlatform);
         return ResponseBean.success(taPlatform);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taPlatform 实例对象
@@ -81,12 +89,12 @@ public class TaPlatformController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taPlatform/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaPlatform taPlatform,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
         taPlatformService.updateById(taPlatform);
         return ResponseBean.success(taPlatform);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param cloudId 主键
@@ -94,7 +102,7 @@ public class TaPlatformController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taPlatform/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taPlatformService.removeLogicById(id);
         return ResponseBean.success("success");
     }

src/main/java/com/njyunzhi/servsummary/controller/TaSslController.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.TaPlatform;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -49,12 +53,17 @@ public class TaSslController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/taSsl")
     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("URL") @RequestParam(value = "url", required = false) String url,
+                             @ApiParam("状态") @RequestParam(value = "status", required = false) Integer status) throws Exception {
         
         IPage<TaSsl> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaSsl> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TaSsl> result = taSslService.page(pg);
+        QueryWrapper<TaSsl> 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<TaSsl> result = taSslService.page(pg, queryWrapper);
         
         return ResponseBean.success(result);
     }
@@ -68,6 +77,15 @@ public class TaSslController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/taSsl")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaSsl taSsl) throws Exception {
+        if (StringUtils.isEmpty(taSsl.getUrl())) {
+            return ResponseBean.error("域名不能为空");
+        }
+
+        TaSsl exist = taSslService.getExistBy("url", taSsl.getUrl(), false, true);
+        if (exist != null) {
+            return ResponseBean.error("域名已存在");
+        }
+
         taSslService.save(taSsl);
         return ResponseBean.success(taSsl);
     }
@@ -82,6 +100,17 @@ public class TaSslController extends BaseController {
     @PutMapping("/taSsl/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaSsl taSsl,
                             @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+        taSsl.setSslId(id);
+
+        if (StringUtils.isEmpty(taSsl.getUrl())) {
+            return ResponseBean.error("域名不能为空");
+        }
+
+        TaSsl exist = taSslService.getExistBy("url", taSsl.getUrl(), false, true);
+        if (exist != null && !exist.getSslId().equals(id)) {
+            return ResponseBean.error("域名已存在");
+        }
+
         taSslService.updateById(taSsl);
         return ResponseBean.success(taSsl);
     }