【fix sonar】SysTenantController.java文件

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java

@@ -12,6 +12,7 @@ import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.SysTenant;
 import com.jero.modules.system.service.ISysTenantService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
@@ -40,12 +41,13 @@ public class SysTenantController {
      * @return
      */
     @PermissionData(pageComponent = "system/TenantList")
-	@RequestMapping(value = "/page", method = RequestMethod.GET)
+//	@RequestMapping(value = "/page", method = RequestMethod.GET)
+    @GetMapping("/page")
 	public Result<IPage<SysTenant>> queryPageList(SysTenant sysTenant,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
-		Result<IPage<SysTenant>> result = new Result<IPage<SysTenant>>();
+		Result<IPage<SysTenant>> result = new Result<>();
 		QueryWrapper<SysTenant> queryWrapper = QueryGenerator.initQueryWrapper(sysTenant, req.getParameterMap());
-		Page<SysTenant> page = new Page<SysTenant>(pageNo, pageSize);
+		Page<SysTenant> page = new Page<>(pageNo, pageSize);
 		IPage<SysTenant> pageList = sysTenantService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
@@ -57,7 +59,8 @@ public class SysTenantController {
      * @param
      * @return
      */
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+//    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @PostMapping("/add")
     public Result<Object> add(@RequestBody SysTenant sysTenant) {
         if(sysTenantService.getById(sysTenant.getId())!=null){
             return Result.error("该编号已存在!");
@@ -77,7 +80,8 @@ public class SysTenantController {
      * @param
      * @return
      */
-    @RequestMapping(value = "/edit", method = RequestMethod.PUT)
+//    @RequestMapping(value = "/edit", method = RequestMethod.PUT)
+    @PutMapping("/edit")
     public Result<Object> edit(@RequestBody SysTenant tenant) {
         SysTenant sysTenant = sysTenantService.getById(tenant.getId());
         if(sysTenant==null) {
@@ -96,8 +100,9 @@ public class SysTenantController {
      * @param id
      * @return
      */
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
+//    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+    @DeleteMapping("/delete")
+    public Result<T> delete(@RequestParam(name="id",required=true) String id) {
         sysTenantService.removeTenantById(id);
         return Result.OK("删除成功");
     }
@@ -107,8 +112,9 @@ public class SysTenantController {
      * @param ids
      * @return
      */
-    @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
+//    @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
-    public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+    @DeleteMapping("/deleteBatch")
+    public Result<T> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
         if(oConvertUtils.isEmpty(ids)) {
             return Result.error("未选中租户！");
         }else {
@@ -122,7 +128,7 @@ public class SysTenantController {
                 }
             }
 
-            if (idList.size() > 0) {
+            if (!idList.isEmpty()) {
                 sysTenantService.removeByIds(idList);
                 if (ls.length == idList.size()) {
                     return Result.OK("删除成功！");
@@ -140,7 +146,8 @@ public class SysTenantController {
      * @param id
      * @return
      */
-    @RequestMapping(value = "/queryById", method = RequestMethod.GET)
+//    @RequestMapping(value = "/queryById", method = RequestMethod.GET)
+    @GetMapping("/queryById")
     public Result<SysTenant> queryById(@RequestParam(name="id",required=true) String id) {
         SysTenant sysTenant = sysTenantService.getById(id);
         if(sysTenant==null) {
@@ -155,7 +162,8 @@ public class SysTenantController {
      * 查询有效的 租户数据
      * @return
      */
-    @RequestMapping(value = "/queryList", method = RequestMethod.GET)
+//    @RequestMapping(value = "/queryList", method = RequestMethod.GET)
+    @GetMapping("/queryList")
     public Result<List<SysTenant>> queryList(@RequestParam(name="ids",required=false) String ids) {
         LambdaQueryWrapper<SysTenant> query = new LambdaQueryWrapper<>();
         query.eq(SysTenant::getStatus, 1);