增加验证

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/block/BlockController.java

@@ -2,7 +2,9 @@ package com.cjy.traceability.module.traceability.controller.admin.block;
 
 import cn.hutool.core.util.StrUtil;
 import com.cjy.traceability.framework.operatelog.core.enums.OperateTypeEnum;
+import com.cjy.traceability.module.traceability.dal.dataobject.base.TraceabilityBaseDO;
 import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockCropDO;
+import com.cjy.traceability.module.traceability.service.base.TraceabilityBaseService;
 import org.aspectj.apache.bcel.generic.RET;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -15,6 +17,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
+import java.math.BigDecimal;
 import java.util.*;
 import java.io.IOException;
 
@@ -43,7 +46,8 @@ public class BlockController {
 
     @Resource
     private BlockService blockService;
-
+    @Resource
+    private TraceabilityBaseService baseService;
     @PostMapping("/create")
     @Operation(summary = "创建地块信息")
     @PreAuthorize("@ss.hasPermission('traceability:block:create')")
@@ -51,6 +55,10 @@ public class BlockController {
         if( null ==createReqVO.getBaseId()){
             return error(500,"请选择农场");
         }
+        TraceabilityBaseDO traceabilityBaseDO = baseService.selectById(createReqVO.getBaseId().longValue());
+        if(traceabilityBaseDO.getBaseArea().compareTo(createReqVO.getBlockArea()) ==-1){
+            return  error(500,"该地块超出基地面积!");
+        }
         return success(blockService.createBlock(createReqVO));
     }
 
@@ -58,6 +66,10 @@ public class BlockController {
     @Operation(summary = "更新地块信息")
     @PreAuthorize("@ss.hasPermission('traceability:block:update')")
     public CommonResult<Boolean> updateBlock(@Valid @RequestBody BlockSaveReqVO updateReqVO) {
+        TraceabilityBaseDO traceabilityBaseDO = baseService.selectById(updateReqVO.getBaseId().longValue());
+        if(traceabilityBaseDO.getBaseArea().compareTo(updateReqVO.getBlockArea()) ==-1){
+            return  error(500,"该地块超出基地面积!");
+        }
         blockService.updateBlock(updateReqVO);
         return success(true);
     }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/base/TraceabilityBaseService.java

@@ -73,4 +73,6 @@ public interface TraceabilityBaseService {
      * @return
      */
     boolean selectIsBindBlock(Integer id);
+
+    TraceabilityBaseDO selectById(Long id);
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/base/TraceabilityBaseServiceImpl.java

@@ -138,4 +138,9 @@ public class TraceabilityBaseServiceImpl implements TraceabilityBaseService {
 	public boolean selectIsBindBlock(Integer id) {
 		return blockMapper.selectIsBindBlock(id)>0;
 	}
+
+	@Override
+	public TraceabilityBaseDO selectById(Long id) {
+		return  baseMapper.selectById(id);
+	}
 }