删除农事中的基地管理和地块管理相关接口

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsBlockController.java

@@ -188,87 +188,6 @@ public class FmsBlockController extends BaseController
         return success(fmsBlockResVo);
     }
 
-    /**
-     * 新增地块
-     */
-    @PreAuthorize("@ss.hasPermi('fms:block:add')")
-    @Log(title = "地块", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    public AjaxResult add(@RequestBody @Valid FmsBlock fmsBlock) {
-        FmsLand fmsLand = fmsLandService.selectFmsLandByLandId(fmsBlock.getLandId(), SecurityUtils.getTid());
-        if (fmsLand == null) {
-            return AjaxResult.error(ErrorCode.INVALID_PARAMETER.getCode());
-        }
-        /* 判断同一基地下地块名称是否重复 */
-        FmsBlock reqVo = new FmsBlock();
-        reqVo.setLandId(fmsBlock.getLandId());
-        reqVo.setBlockNameEq(fmsBlock.getBlockName());
-        List<FmsBlock> list = fmsBlockService.selectFmsBlockList(reqVo);
-        if (!list.isEmpty()) {
-            return AjaxResult.error(ErrorCode.FMS_BLOCK_EXIST.getCode(), ErrorCode.FMS_BLOCK_EXIST.getMessage());
-        }
-
-        return fmsBlockService.insertFmsBlock(fmsBlock, fmsLand);
-    }
-
-    /**
-     * 修改地块
-     */
-    @PreAuthorize("@ss.hasPermi('fms:block:edit')")
-    @Log(title = "地块", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit")
-    public AjaxResult edit(@RequestBody @Valid FmsBlock fmsBlock) {
-        FmsLand fmsLand = fmsLandService.selectFmsLandByLandId(fmsBlock.getLandId(), SecurityUtils.getTid());
-        if (fmsLand == null) {
-            return AjaxResult.error(ErrorCode.INVALID_PARAMETER.getCode());
-        }
-
-        /* 判断同一基地下地块名称是否重复 */
-        FmsBlock fmsBlock1 = fmsBlockService.selectFmsBlockByBlockId(fmsBlock.getBlockId(), SecurityUtils.getTid());
-        if (!fmsBlock1.getBlockName().equals(fmsBlock.getBlockName())) {
-            FmsBlock reqVo = new FmsBlock();
-            reqVo.setLandId(fmsBlock.getLandId());
-            reqVo.setBlockNameEq(fmsBlock.getBlockName());
-            List<FmsBlock> list = fmsBlockService.selectFmsBlockList(reqVo);
-            if (!list.isEmpty()) {
-                return AjaxResult.error(ErrorCode.FMS_BLOCK_EXIST.getCode(), ErrorCode.FMS_BLOCK_EXIST.getMessage());
-            }
-        }
-
-        return fmsBlockService.updateFmsBlock(fmsBlock, fmsLand);
-    }
-
-    /**
-     * 删除地块
-     */
-    @PreAuthorize("@ss.hasPermi('fms:block:delete')")
-    @Log(title = "地块", businessType = BusinessType.DELETE)
-	@DeleteMapping("/delete")
-    public AjaxResult remove(@RequestParam("blockIds") String[] blockIds) {
-        for (int i = 0; i < blockIds.length; i++) {
-            int count = fmsBlockMapper.selectValidDataNumber(blockIds[i], SecurityUtils.getTid());
-            if (count > 0) {
-                return AjaxResult.error(ErrorCode.DEL_CURNODE_ERROR.getCode(), ErrorCode.DEL_CURNODE_ERROR.getMessage());
-            }
-        }
-        return fmsBlockService.deleteFmsBlockByBlockIds(blockIds, SecurityUtils.getTid());
-    }
-
-    /**
-     * 地块图片上传
-     */
-    @PreAuthorize("@ss.hasPermi('fms:block:preview:upload')")
-    @Log(title = "地块图片上传", businessType = BusinessType.UPDATE)
-    @PostMapping("/preview/upload")
-    public AjaxResult uploadBlockPreview(MultipartFile file) throws Exception
-    {
-        if (!file.isEmpty())
-        {
-            SysRes sysRes  = resManager.uploadRes( ResConstants.BizType.BLOCK, ResConstants.mediaType.IMG,"", file,getLoginUser());
-            return success(sysRes);
-        }
-        return error(ErrorCode.UPLOAD_FAIL.getCode());
-    }
 
     @PostMapping("/bind/user")
     public AjaxResult bindUser(@Valid @RequestBody FmsBlockBindUserReqVo fmsBlockBindUserReqVo){

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsLandController.java

@@ -114,25 +114,6 @@ public class FmsLandController extends BaseController
         return success(resVo);
     }
 
-    /**
-     * 新增基地
-     */
-    @PreAuthorize("@ss.hasPermi('fms:land:add')")
-    @Log(title = "基地", businessType = BusinessType.INSERT)
-    @PostMapping(value = "/add")
-    public AjaxResult add(@RequestBody @Valid FmsLand fmsLand) {
-        /* 判断基地名称不能重复 */
-        FmsLand reqVo = new FmsLand();
-        reqVo.setLandNameEq(fmsLand.getLandName());
-        List<FmsLand> list = fmsLandService.selectFmsLandList(reqVo);
-        if (!list.isEmpty()) {
-            return AjaxResult.error(ErrorCode.FMS_LAND_EXIST.getCode(), ErrorCode.FMS_LAND_EXIST.getMessage());
-        }
-        fmsLand.setLandId(fmsLand.getId());
-        fmsLand.setLandDevcount(0L);
-        fmsLand.setLandBlockcount(0L);
-        return toAjax(fmsLandService.insertFmsLand(fmsLand));
-    }
 
 
     @PreAuthorize("@ss.hasPermi('fms:land:select:list')")
@@ -180,61 +161,4 @@ public class FmsLandController extends BaseController
     public AjaxResult getInfo(@RequestParam("landId") String landId) {
         return success(fmsLandService.selectFmsLandByLandId(landId, SecurityUtils.getTid()));
     }
-
-
-
-    /**
-     * 修改基地
-     */
-    @PreAuthorize("@ss.hasPermi('fms:land:edit')")
-    @Log(title = "基地", businessType = BusinessType.UPDATE)
-    @PutMapping(value = "/edit")
-    public AjaxResult edit(@RequestBody @Valid FmsLand fmsLand) {
-        /* 判断基地名称不能重复 */
-        FmsLand fmsLand1 = fmsLandService.selectFmsLandByLandId(fmsLand.getLandId(), SecurityUtils.getTid());
-        if (!fmsLand1.getLandName().equals(fmsLand.getLandName())) {
-            FmsLand reqVo = new FmsLand();
-            reqVo.setLandNameEq(fmsLand.getLandName());
-            List<FmsLand> list = fmsLandService.selectFmsLandList(reqVo);
-            if (!list.isEmpty()) {
-                return AjaxResult.error(ErrorCode.FMS_LAND_EXIST.getCode(), ErrorCode.FMS_LAND_EXIST.getMessage());
-            }
-        }
-
-        return toAjax(fmsLandService.updateFmsLand(fmsLand));
-    }
-
-    /**
-     * 删除基地
-     */
-    @PreAuthorize("@ss.hasPermi('fms:land:delete')")
-    @Log(title = "基地", businessType = BusinessType.DELETE)
-	@DeleteMapping("/delete")
-    public AjaxResult delete(@RequestParam("landIds") String[] landIds) {
-        Integer count = 0;
-        for (String landId : landIds) {
-            Integer integer = fmsBlockService.selectCountByLandId(landId, SecurityUtils.getTid());
-            count += integer;
-        }
-        if (count > 0) {
-            return AjaxResult.error(ErrorCode.DEL_CURNODE_ERROR.getCode(), ErrorCode.DEL_CURNODE_ERROR.getMessage());
-        }
-        return toAjax(fmsLandService.deleteFmsLandByLandIds(landIds, SecurityUtils.getTid()));
-    }
-
-
-    /**
-     * 基地图片上传
-     */
-    @PreAuthorize("@ss.hasPermi('fms:land:preview:upload')")
-    @Log(title = "基地图片上传", businessType = BusinessType.UPDATE)
-    @PostMapping("/preview/upload")
-    public AjaxResult uploadLandPreview(MultipartFile file) throws Exception {
-        if (!file.isEmpty()) {
-            SysRes sysRes  = resManager.uploadRes( ResConstants.BizType.LAND, ResConstants.mediaType.IMG,"",file,getLoginUser());
-            return success(sysRes);
-        }
-        return error(ErrorCode.UPLOAD_FAIL.getCode());
-    }
-
 }