feats

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

@@ -4,8 +4,13 @@ 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.TaOssBucket;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +19,9 @@ import org.springframework.web.bind.annotation.*;
 import com.njyunzhi.servsummary.entity.TaContcat;
 import com.njyunzhi.servsummary.service.TaContcatService;
 
- /**
+/**
  * 联系人;(ta_contcat)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-11-22
  */
@@ -23,12 +29,12 @@ import com.njyunzhi.servsummary.service.TaContcatService;
 @RestController
 @RequestMapping("/")
 public class TaContcatController extends BaseController {
-    
+
     @Autowired
     private TaContcatService taContcatService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param userId 主键
      * @return 实例对象
@@ -38,28 +44,35 @@ public class TaContcatController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(taContcatService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/taContcat")
-    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,
+                             @ApiParam("名称") @RequestParam(value = "name", required = false) String name,
+                             @ApiParam("手机号") @RequestParam(value = "phone", required = false) String phone,
+                             @ApiParam("状态") @RequestParam(value = "status", required = false) Integer status) throws Exception {
+
         IPage<TaContcat> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaContcat> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
+        QueryWrapper<TaContcat> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.eq(null != status, "status", status);
+        queryWrapper.like(!StringUtils.isEmpty(name), "name)", name);
+        queryWrapper.like(!StringUtils.isEmpty(name), "phone", phone);
+        queryWrapper.orderByDesc("create_date");
         IPage<TaContcat> result = taContcatService.page(pg);
-        
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taContcat 实例对象
@@ -68,11 +81,20 @@ public class TaContcatController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/taContcat")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaContcat taContcat) throws Exception {
+        if (StringUtils.isEmpty(taContcat.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        TaContcat exist = taContcatService.getExistBy("name", taContcat.getName(), false, true);
+        if (exist != null) {
+            return ResponseBean.error("名称已存在");
+        }
+
         taContcatService.save(taContcat);
         return ResponseBean.success(taContcat);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taContcat 实例对象
@@ -81,12 +103,23 @@ public class TaContcatController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taContcat/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaContcat taContcat,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        taContcat.setUserId(id);
+
+        if (StringUtils.isEmpty(taContcat.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        TaContcat exist = taContcatService.getExistBy("name", taContcat.getName(), false, true);
+        if (exist != null && !exist.getUserId().equals(id)) {
+            return ResponseBean.error("名称已存在");
+        }
+
         taContcatService.updateById(taContcat);
         return ResponseBean.success(taContcat);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param userId 主键
@@ -94,7 +127,7 @@ public class TaContcatController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taContcat/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taContcatService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -61,7 +61,7 @@ public class TaOssBucketController extends BaseController {
         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.like(!StringUtils.isEmpty(name), "name", name);
         queryWrapper.orderByDesc("create_date");
         IPage<TaOssBucket> result = taOssBucketService.page(pg, queryWrapper);
         

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