farm模块-新增加入当前用户租号

yudao-module-farm/pom.xml

@@ -7,6 +7,18 @@
         <artifactId>yudao</artifactId>
         <version>${revision}</version>
     </parent>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>yudao-module-farm</artifactId>
     <packaging>jar</packaging>

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java

@@ -1,11 +1,17 @@
 package cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo;
 
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import cn.idev.excel.annotation.*;
+import java.util.List;
 
 @Schema(description = "管理后台 - 模型管理-管理周期 Response VO")
 @Data
@@ -60,4 +66,11 @@ public class ModelCycleRespVO {
     @ExcelProperty("租户id")
     private String tenantId;
 
+    private List<ModelEnvironmentIndexDO> environmentIndexDOS;
+
+    private List<ModelWeatherDisasterDO> weatherDisasterDOS;
+
+    private List<ModelPestDiseaseWeedDO> pestDiseaseWeedDOS;
+
+    private List<ModelFarmingOperationDO> farmingOperationDOS;
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/ModelFarmingOperationController.java

@@ -80,8 +80,8 @@ public class ModelFarmingOperationController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     
     public CommonResult<ModelFarmingOperationRespVO> getModelFarmingOperation(@RequestParam("id") String id) {
-        ModelFarmingOperationDO modelFarmingOperation = modelFarmingOperationService.getModelFarmingOperation(id);
+        ModelFarmingOperationRespVO modelFarmingOperation = modelFarmingOperationService.getModelFarmingOperation(id);
-        return success(BeanUtils.toBean(modelFarmingOperation, ModelFarmingOperationRespVO.class));
+        return success(modelFarmingOperation);
     }
 
     @GetMapping("/page")

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/vo/ModelFarmingOperationRespVO.java

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo;
 
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import cn.idev.excel.annotation.*;
+import java.util.List;
 
 @Schema(description = "管理后台 - 模型管理-农事操作 Response VO")
 @Data
@@ -67,5 +69,5 @@ public class ModelFarmingOperationRespVO {
     @Schema(description = "租户id", example = "31485")
     @ExcelProperty("租户id")
     private String tenantId;
-
+    private List<ModelFarmingOperationInputDO> farmingOperationInputDOS;
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/ModelManagementController.java

@@ -0,0 +1,94 @@
+package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementSaveReqVO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO;
+import cn.iocoder.yudao.module.farm.service.modelmanagement.ModelManagementService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 模型管理")
+@RestController
+@RequestMapping("/farm/model-management")
+@Validated
+public class ModelManagementController {
+
+    @Resource
+    private ModelManagementService modelManagementService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建模型管理")
+    public CommonResult<String> createModelManagement(@Valid @RequestBody ModelManagementSaveReqVO createReqVO) {
+        return success(modelManagementService.createModelManagement(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新模型管理")
+    public CommonResult<Boolean> updateModelManagement(@Valid @RequestBody ModelManagementSaveReqVO updateReqVO) {
+        modelManagementService.updateModelManagement(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除模型管理")
+    @Parameter(name = "id", description = "编号", required = true)
+    public CommonResult<Boolean> deleteModelManagement(@RequestParam("id") String id) {
+        modelManagementService.deleteModelManagement(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除模型管理")
+    public CommonResult<Boolean> deleteModelManagementList(@RequestParam("ids") List<String> ids) {
+        modelManagementService.deleteModelManagementListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得模型管理")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<ModelManagementRespVO> getModelManagement(@RequestParam("id") String id) {
+        ModelManagementRespVO modelManagement = modelManagementService.getModelManagement(id);
+        return success(modelManagement);
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得模型管理分页")
+    public CommonResult<PageResult<ModelManagementRespVO>> getModelManagementPage(@Valid ModelManagementPageReqVO pageReqVO) {
+        PageResult<ModelManagementDO> pageResult = modelManagementService.getModelManagementPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ModelManagementRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出模型管理 Excel")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportModelManagementExcel(@Valid ModelManagementPageReqVO pageReqVO,
+                                           HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<ModelManagementDO> list = modelManagementService.getModelManagementPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "模型管理.xls", "数据", ModelManagementRespVO.class,
+                BeanUtils.toBean(list, ModelManagementRespVO.class));
+    }
+
+}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java

@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 模型管理分页 Request VO")
+@Data
+public class ModelManagementPageReqVO extends PageParam {
+
+    @Schema(description = "模型名称", example = "芋艿")
+    private String modelName;
+
+    @Schema(description = "物种id", example = "12816")
+    private String speciesId;
+
+    @Schema(description = "物种名称", example = "王五")
+    private String speciesName;
+
+    @Schema(description = "生命周期")
+    private String cycle;
+
+    @Schema(description = "产量参考")
+    private String harvest;
+
+    @Schema(description = "地区多选用,隔开")
+    private String suitablePlantingAreas;
+
+    @Schema(description = "品种描述", example = "随便")
+    private String description;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "基地id", example = "28352")
+    private String baseId;
+
+    @Schema(description = "基地", example = "芋艿")
+    private String baseName;
+
+    @Schema(description = "地块ID", example = "15906")
+    private String plotId;
+
+    @Schema(description = "地块", example = "李四")
+    private String plotName;
+
+    @Schema(description = "租户id", example = "20468")
+    private String tenantId;
+
+}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementRespVO.java

@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleRespVO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 模型管理 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ModelManagementRespVO {
+
+    @Schema(description = "模型id", requiredMode = Schema.RequiredMode.AUTO, example = "25218")
+    @ExcelProperty("模型id")
+    private String id;
+
+    @Schema(description = "模型名称", example = "芋艿")
+    @ExcelProperty("模型名称")
+    private String modelName;
+
+    @Schema(description = "物种id", example = "12816")
+    @ExcelProperty("物种id")
+    private String speciesId;
+
+    @Schema(description = "物种名称", example = "王五")
+    @ExcelProperty("物种名称")
+    private String speciesName;
+
+    @Schema(description = "生命周期")
+    @ExcelProperty("生命周期")
+    private String cycle;
+
+    @Schema(description = "产量参考")
+    @ExcelProperty("产量参考")
+    private String harvest;
+
+    @Schema(description = "地区多选用,隔开")
+    @ExcelProperty("地区多选用,隔开")
+    private String suitablePlantingAreas;
+
+    @Schema(description = "品种描述", example = "随便")
+    @ExcelProperty("品种描述")
+    private String description;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "基地id", example = "28352")
+    @ExcelProperty("基地id")
+    private String baseId;
+
+    @Schema(description = "基地", example = "芋艿")
+    @ExcelProperty("基地")
+    private String baseName;
+
+    @Schema(description = "地块ID", example = "15906")
+    @ExcelProperty("地块ID")
+    private String plotId;
+
+    @Schema(description = "地块", example = "李四")
+    @ExcelProperty("地块")
+    private String plotName;
+
+    @Schema(description = "租户id", example = "20468")
+    @ExcelProperty("租户id")
+    private String tenantId;
+
+    private List<ModelCycleRespVO> modelCycles;
+
+}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementSaveReqVO.java

@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 模型管理新增/修改 Request VO")
+@Data
+public class ModelManagementSaveReqVO {
+
+    @Schema(description = "模型id", requiredMode = Schema.RequiredMode.AUTO, example = "25218")
+    private String id;
+
+    @Schema(description = "模型名称", example = "芋艿")
+    private String modelName;
+
+    @Schema(description = "物种id", example = "12816")
+    private String speciesId;
+
+    @Schema(description = "物种名称", example = "王五")
+    private String speciesName;
+
+    @Schema(description = "生命周期")
+    private String cycle;
+
+    @Schema(description = "产量参考")
+    private String harvest;
+
+    @Schema(description = "地区多选用,隔开")
+    private String suitablePlantingAreas;
+
+    @Schema(description = "品种描述", example = "随便")
+    private String description;
+
+    @Schema(description = "基地id", example = "28352")
+    private String baseId;
+
+    @Schema(description = "基地", example = "芋艿")
+    private String baseName;
+
+    @Schema(description = "地块ID", example = "15906")
+    private String plotId;
+
+    @Schema(description = "地块", example = "李四")
+    private String plotName;
+
+    @Schema(description = "租户id", example = "20468")
+    private String tenantId;
+
+}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelmanagement/ModelManagementDO.java

@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
+
+import java.util.List;
+
+/**
+ * 模型管理 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("farm_model_management")
+@KeySequence("farm_model_management_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ModelManagementDO extends BaseDO {
+
+    /**
+     * 模型id
+     */
+    @TableId(type = IdType.INPUT)
+    private String id;
+    /**
+     * 模型名称
+     */
+    private String modelName;
+    /**
+     * 物种id
+     */
+    private String speciesId;
+    /**
+     * 物种名称
+     */
+    private String speciesName;
+    /**
+     * 生命周期
+     */
+    private String cycle;
+    /**
+     * 产量参考
+     */
+    private String harvest;
+    /**
+     * 地区多选用,隔开
+     */
+    private String suitablePlantingAreas;
+    /**
+     * 品种描述
+     */
+    private String description;
+    /**
+     * 基地id
+     */
+    private String baseId;
+    /**
+     * 基地
+     */
+    private String baseName;
+    /**
+     * 地块ID
+     */
+    private String plotId;
+    /**
+     * 地块
+     */
+    private String plotName;
+
+    private String tenantId;
+
+}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelcycle/ModelCycleMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCyclePag
 import cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 模型管理-管理周期 Mapper
  *
@@ -31,4 +33,5 @@ public interface ModelCycleMapper extends BaseMapperX<ModelCycleDO> {
                 .orderByDesc(ModelCycleDO::getId));
     }
 
+    List<ModelCycleDO> selectListByModelId(String modelId);
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelenvironmentindex/ModelEnvironmentIndexMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.Mo
 import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 模型管理-环境指标 Mapper
  *
@@ -32,4 +34,5 @@ public interface ModelEnvironmentIndexMapper extends BaseMapperX<ModelEnvironmen
                 .orderByDesc(ModelEnvironmentIndexDO::getId));
     }
 
+    List<ModelEnvironmentIndexDO> selectByCycleId(String cycleId);
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelfarmingoperation/ModelFarmingOperationMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.Mo
 import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 模型管理-农事操作 Mapper
  *
@@ -33,4 +35,5 @@ public interface ModelFarmingOperationMapper extends BaseMapperX<ModelFarmingOpe
                 .orderByDesc(ModelFarmingOperationDO::getId));
     }
 
+    List<ModelFarmingOperationDO> selectByCycleId(String cycleId);
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelfarmingoperationinput/ModelFarmingOperationInputMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.
 import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 模型管理-农事操作-已选择投入品列 Mapper
  *
@@ -32,4 +34,5 @@ public interface ModelFarmingOperationInputMapper extends BaseMapperX<ModelFarmi
                 .orderByDesc(ModelFarmingOperationInputDO::getId));
     }
 
+    List<ModelFarmingOperationInputDO> selectByFarmingId(String farmingId);
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelmanagement/ModelManagementMapper.java

@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.farm.dal.mysql.modelmanagement;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.*;
+
+/**
+ * 模型管理 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface ModelManagementMapper extends BaseMapperX<ModelManagementDO> {
+
+    default PageResult<ModelManagementDO> selectPage(ModelManagementPageReqVO reqVO) {
+        MPJLambdaWrapperX<ModelManagementDO> query = new MPJLambdaWrapperX<ModelManagementDO>()
+                .selectAll(ModelManagementDO.class)
+                .likeIfPresent(ModelManagementDO::getModelName, reqVO.getModelName())
+                .eqIfPresent(ModelManagementDO::getSpeciesId, reqVO.getSpeciesId())
+                .likeIfPresent(ModelManagementDO::getSpeciesName, reqVO.getSpeciesName())
+                .eqIfPresent(ModelManagementDO::getCycle, reqVO.getCycle())
+                .eqIfPresent(ModelManagementDO::getHarvest, reqVO.getHarvest())
+                .eqIfPresent(ModelManagementDO::getSuitablePlantingAreas, reqVO.getSuitablePlantingAreas())
+                .eqIfPresent(ModelManagementDO::getDescription, reqVO.getDescription())
+                .betweenIfPresent(ModelManagementDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(ModelManagementDO::getBaseId, reqVO.getBaseId())
+                .likeIfPresent(ModelManagementDO::getBaseName, reqVO.getBaseName())
+                .eqIfPresent(ModelManagementDO::getPlotId, reqVO.getPlotId())
+                .likeIfPresent(ModelManagementDO::getPlotName, reqVO.getPlotName())
+                .eqIfPresent(ModelManagementDO::getTenantId, reqVO.getTenantId())
+                .orderByDesc(ModelManagementDO::getId)
+                // 连表：物种库
+                .leftJoin(SpeciesLibraryDO.class, SpeciesLibraryDO::getId, ModelManagementDO::getSpeciesId)
+                .selectAs(SpeciesLibraryDO::getCultivarName, ModelManagementDO::getSpeciesName)
+                // 连表：基地信息
+                .leftJoin(BaseInfoDO.class, BaseInfoDO::getId, ModelManagementDO::getBaseId)
+                .selectAs(BaseInfoDO::getName, ModelManagementDO::getBaseName)
+                // 连表：地块信息
+                .leftJoin(PlotInfoDO.class, PlotInfoDO::getPlotId, ModelManagementDO::getPlotId)
+                .selectAs(PlotInfoDO::getPlotName, ModelManagementDO::getPlotName);
+
+        return selectJoinPage(reqVO, ModelManagementDO.class, query);
+    }
+
+}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.Mod
 import cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 模型管理-病虫草害 Mapper
  *
@@ -31,4 +33,5 @@ public interface ModelPestDiseaseWeedMapper extends BaseMapperX<ModelPestDisease
                 .orderByDesc(ModelPestDiseaseWeedDO::getId));
     }
 
+    List<ModelPestDiseaseWeedDO> selectByCycleId(String cycleId);
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelweatherdisaster/ModelWeatherDisasterMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.Mod
 import cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 模型管理-气象灾害 Mapper
  *
@@ -31,4 +33,5 @@ public interface ModelWeatherDisasterMapper extends BaseMapperX<ModelWeatherDisa
                 .orderByDesc(ModelWeatherDisasterDO::getId));
     }
 
+    List<ModelWeatherDisasterDO> selectByCycleId(String cycleId);
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/ErrorCodeConstants.java

@@ -99,4 +99,6 @@ public interface ErrorCodeConstants {
     // ========== 消息中心 1-050-029-000 ==========
     ErrorCode MESSAGE_CENTER_NOT_EXISTS = new ErrorCode(1_050_029_000, "消息中心信息不存在");
 
+    // ========== 模型管理 1-050-030-000 ==========
+    ErrorCode MODEL_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_050_030_000, "模型不存在");
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.module.farm.service.baseinfo;
 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseInfoPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseInfoSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO;
@@ -13,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.BASE_INFO_NOT_EXISTS;
 
 /**
@@ -29,8 +32,11 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 
     @Override
     public String createBaseInfo(BaseInfoSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         BaseInfoDO baseInfo = BeanUtils.toBean(createReqVO, BaseInfoDO.class);
+        baseInfo.setId(IdUtil.fastUUID());
+        baseInfo.setTenantId(String.valueOf(user.getTenantId()));
         baseInfoMapper.insert(baseInfo);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.module.farm.service.companyinfo;
 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO;
@@ -13,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.COMPANY_INFO_NOT_EXISTS;
 
 /**
@@ -29,8 +32,11 @@ public class CompanyInfoServiceImpl implements CompanyInfoService {
 
     @Override
     public String createCompanyInfo(CompanyInfoSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         CompanyInfoDO companyInfo = BeanUtils.toBean(createReqVO, CompanyInfoDO.class);
+        companyInfo.setId(IdUtil.fastUUID());
+        companyInfo.setTenantId(String.valueOf(user.getTenantId()));
         companyInfoMapper.insert(companyInfo);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cultivationarea/CultivationAreaServiceImpl.java

@@ -1,16 +1,18 @@
 package cn.iocoder.yudao.module.farm.service.cultivationarea;
 
-import cn.hutool.core.collection.CollUtil;
+ 
+import cn.hutool.core.util.IdUtil;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo.CultivationAreaPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo.CultivationAreaSaveReqVO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
+ 
 
 import cn.iocoder.yudao.module.farm.dal.dataobject.cultivationarea.CultivationAreaDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+ 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.cultivationarea.CultivationAreaMapper;
@@ -18,8 +20,7 @@ import cn.iocoder.yudao.module.farm.dal.mysql.cultivationarea.CultivationAreaMap
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.CULTIVATION_AREA_NOT_EXISTS;
 
 /**
@@ -36,8 +37,11 @@ public class CultivationAreaServiceImpl implements CultivationAreaService {
 
     @Override
     public String createCultivationArea(CultivationAreaSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         CultivationAreaDO cultivationArea = BeanUtils.toBean(createReqVO, CultivationAreaDO.class);
+        cultivationArea.setId(IdUtil.fastUUID());
+        cultivationArea.setTenantId(String.valueOf(user.getTenantId()));
         cultivationAreaMapper.insert(cultivationArea);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.deviceinfo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.deviceinfo.DeviceInfoDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.deviceinfo.DeviceInfoMapper;
 
@@ -20,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.DEVICE_INFO_NOT_EXISTS;
 
 /**
@@ -36,8 +39,11 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
 
     @Override
     public String createDeviceInfo(DeviceInfoSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         DeviceInfoDO deviceInfo = BeanUtils.toBean(createReqVO, DeviceInfoDO.class);
+        deviceInfo.setId(IdUtil.fastUUID());
+        deviceInfo.setTenantId(String.valueOf(user.getTenantId()));
         deviceInfoMapper.insert(deviceInfo);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceplotrelation/DevicePlotRelationServiceImpl.java

@@ -1,6 +1,10 @@
 package cn.iocoder.yudao.module.farm.service.deviceplotrelation;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo.DevicePlotRelationPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo.DevicePlotRelationSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -9,9 +13,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 
 import cn.iocoder.yudao.module.farm.dal.dataobject.deviceplotrelation.DevicePlotRelationDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.deviceplotrelation.DevicePlotRelationMapper;
 
@@ -36,8 +40,11 @@ public class DevicePlotRelationServiceImpl implements DevicePlotRelationService
 
     @Override
     public String createDevicePlotRelation(DevicePlotRelationSaveReqVO createReqVO) {
+        LoginUser user = SecurityFrameworkUtils.getLoginUser();
         // 插入
         DevicePlotRelationDO devicePlotRelation = BeanUtils.toBean(createReqVO, DevicePlotRelationDO.class);
+        devicePlotRelation.setId(IdUtil.fastUUID());
+        devicePlotRelation.setTenantId(String.valueOf(user.getTenantId()));
         devicePlotRelationMapper.insert(devicePlotRelation);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.disasterdata;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.disasterdata.DisasterDataMapper;
 
@@ -20,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.DISASTER_DATA_NOT_EXISTS;
 
 /**
@@ -36,8 +39,11 @@ public class DisasterDataServiceImpl implements DisasterDataService {
 
     @Override
     public String createDisasterData(DisasterDataSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         DisasterDataDO disasterData = BeanUtils.toBean(createReqVO, DisasterDataDO.class);
+        disasterData.setId(IdUtil.fastUUID());
+        disasterData.setTenantId(String.valueOf(user.getTenantId()));
         disasterDataMapper.insert(disasterData);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigServiceImpl.java

@@ -1,6 +1,10 @@
 package cn.iocoder.yudao.module.farm.service.environmentindexconfig;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -9,9 +13,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 
 import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindexconfig.EnvironmentIndexConfigDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.environmentindexconfig.EnvironmentIndexConfigMapper;
 
@@ -20,6 +23,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.ENVIRONMENT_INDEX_CONFIG_NOT_EXISTS;
 
 /**
@@ -36,8 +40,11 @@ public class EnvironmentIndexConfigServiceImpl implements EnvironmentIndexConfig
 
     @Override
     public String createEnvironmentIndexConfig(EnvironmentIndexConfigSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         EnvironmentIndexConfigDO environmentIndexConfig = BeanUtils.toBean(createReqVO, EnvironmentIndexConfigDO.class);
+        environmentIndexConfig.setId(IdUtil.fastUUID());
+        environmentIndexConfig.setTenantId(String.valueOf(user.getTenantId()));
         environmentIndexConfigMapper.insert(environmentIndexConfig);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.module.farm.service.farmingnamemaintenance;
 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO;
@@ -13,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FARMING_NAME_MAINTENANCE_NOT_EXISTS;
 
 /**
@@ -29,8 +32,11 @@ public class FarmingNameMaintenanceServiceImpl implements FarmingNameMaintenance
 
     @Override
     public String createFarmingNameMaintenance(FarmingNameMaintenanceSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         FarmingNameMaintenanceDO farmingNameMaintenance = BeanUtils.toBean(createReqVO, FarmingNameMaintenanceDO.class);
+        farmingNameMaintenance.setId(IdUtil.fastUUID());
+        farmingNameMaintenance.setTenantId(String.valueOf(user.getTenantId()));
         farmingNameMaintenanceMapper.insert(farmingNameMaintenance);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.module.farm.service.farmingrecord;
 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO;
@@ -13,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FARMING_RECORD_NOT_EXISTS;
 
 /**
@@ -29,8 +32,11 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
 
     @Override
     public String createFarmingRecord(FarmingRecordSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         FarmingRecordDO farmingRecord = BeanUtils.toBean(createReqVO, FarmingRecordDO.class);
+        farmingRecord.setId(IdUtil.fastUUID());
+        farmingRecord.setTenantId(String.valueOf(user.getTenantId()));
         farmingRecordMapper.insert(farmingRecord);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.farmingrecordinput;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRec
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.farmingrecordinput.FarmingRecordInputMapper;
 
@@ -20,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FARMING_RECORD_INPUT_NOT_EXISTS;
 
 /**
@@ -36,8 +39,11 @@ public class FarmingRecordInputServiceImpl implements FarmingRecordInputService
 
     @Override
     public String createFarmingRecordInput(FarmingRecordInputSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         FarmingRecordInputDO farmingRecordInput = BeanUtils.toBean(createReqVO, FarmingRecordInputDO.class);
+        farmingRecordInput.setId(IdUtil.fastUUID());
+        farmingRecordInput.setTenantId(String.valueOf(user.getTenantId()));
         farmingRecordInputMapper.insert(farmingRecordInput);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.farm.service.farmingtypemaintenance;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -20,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FARMING_TYPE_MAINTENANCE_NOT_EXISTS;
 
 /**
@@ -36,8 +39,11 @@ public class FarmingTypeMaintenanceServiceImpl implements FarmingTypeMaintenance
 
     @Override
     public String createFarmingTypeMaintenance(FarmingTypeMaintenanceSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         FarmingTypeMaintenanceDO farmingTypeMaintenance = BeanUtils.toBean(createReqVO, FarmingTypeMaintenanceDO.class);
+        farmingTypeMaintenance.setId(IdUtil.fastUUID());
+        farmingTypeMaintenance.setTenantId(String.valueOf(user.getTenantId()));
         farmingTypeMaintenanceMapper.insert(farmingTypeMaintenance);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.fertilizerindex;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -20,6 +21,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FERTILIZER_INDEX_NOT_EXISTS;
 
 /**
@@ -36,8 +38,10 @@ public class FertilizerIndexServiceImpl implements FertilizerIndexService {
 
     @Override
     public String createFertilizerIndex(FertilizerIndexSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         FertilizerIndexDO fertilizerIndex = BeanUtils.toBean(createReqVO, FertilizerIndexDO.class);
+        fertilizerIndex.setTenantId(String.valueOf(user.getTenantId()));
         fertilizerIndexMapper.insert(fertilizerIndex);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.foundationinfo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfo
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.foundationinfo.FoundationInfoMapper;
 
@@ -20,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FOUNDATION_INFO_NOT_EXISTS;
 
 /**
@@ -36,8 +39,11 @@ public class FoundationInfoServiceImpl implements FoundationInfoService {
 
     @Override
     public String createFoundationInfo(FoundationInfoSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         FoundationInfoDO foundationInfo = BeanUtils.toBean(createReqVO, FoundationInfoDO.class);
+        foundationInfo.setId(IdUtil.fastUUID());
+        foundationInfo.setTenantId(String.valueOf(user.getTenantId()));
         foundationInfoMapper.insert(foundationInfo);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.inputlibrary;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibrarySaveReqVO;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.inputlibrary.InputLibraryMapper;
 
@@ -20,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.INPUT_LIBRARY_NOT_EXISTS;
 
 /**
@@ -36,8 +39,11 @@ public class InputLibraryServiceImpl implements InputLibraryService {
 
     @Override
     public String createInputLibrary(InputLibrarySaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         InputLibraryDO inputLibrary = BeanUtils.toBean(createReqVO, InputLibraryDO.class);
+        inputLibrary.setId(IdUtil.fastUUID());
+        inputLibrary.setTenantId(String.valueOf(user.getTenantId()));
         inputLibraryMapper.insert(inputLibrary);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagecenter/MessageCenterServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.messagecenter;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.messagecenter.MessageCenterDO
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.messagecenter.MessageCenterMapper;
 
@@ -20,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MESSAGE_CENTER_NOT_EXISTS;
 
 /**
@@ -36,8 +39,11 @@ public class MessageCenterServiceImpl implements MessageCenterService {
 
     @Override
     public String createMessageCenter(MessageCenterSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         MessageCenterDO messageCenter = BeanUtils.toBean(createReqVO, MessageCenterDO.class);
+        messageCenter.setId(IdUtil.fastUUID());
+        messageCenter.setTenantId(String.valueOf(user.getTenantId()));
         messageCenterMapper.insert(messageCenter);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelcycle/ModelCycleServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.modelcycle;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCyclePageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.modelcycle.ModelCycleMapper;
 
@@ -20,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_CYCLE_NOT_EXISTS;
 
 /**
@@ -36,8 +39,11 @@ public class ModelCycleServiceImpl implements ModelCycleService {
 
     @Override
     public String createModelCycle(ModelCycleSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         ModelCycleDO modelCycle = BeanUtils.toBean(createReqVO, ModelCycleDO.class);
+        modelCycle.setId(IdUtil.fastUUID());
+        modelCycle.setTenantId(String.valueOf(user.getTenantId()));
         modelCycleMapper.insert(modelCycle);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelenvironmentindex/ModelEnvironmentIndexServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.modelenvironmentindex;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEn
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.modelenvironmentindex.ModelEnvironmentIndexMapper;
 
@@ -20,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_ENVIRONMENT_INDEX_NOT_EXISTS;
 
 /**
@@ -36,8 +39,11 @@ public class ModelEnvironmentIndexServiceImpl implements ModelEnvironmentIndexSe
 
     @Override
     public String createModelEnvironmentIndex(ModelEnvironmentIndexSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         ModelEnvironmentIndexDO modelEnvironmentIndex = BeanUtils.toBean(createReqVO, ModelEnvironmentIndexDO.class);
+        modelEnvironmentIndex.setId(IdUtil.fastUUID());
+        modelEnvironmentIndex.setTenantId(String.valueOf(user.getTenantId()));
         modelEnvironmentIndexMapper.insert(modelEnvironmentIndex);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationService.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.modelfarmingoperation;
 
 import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -51,7 +52,7 @@ public interface ModelFarmingOperationService {
      * @param id 编号
      * @return 模型管理-农事操作
      */
-    ModelFarmingOperationDO getModelFarmingOperation(String id);
+    ModelFarmingOperationRespVO getModelFarmingOperation(String id);
 
     /**
      * 获得模型管理-农事操作分页

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.java

@@ -1,11 +1,16 @@
 package cn.iocoder.yudao.module.farm.service.modelfarmingoperation;
 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO;
 import cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperation.ModelFarmingOperationMapper;
+import cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperationinput.ModelFarmingOperationInputMapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -13,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_FARMING_OPERATION_NOT_EXISTS;
 
 /**
@@ -26,11 +32,16 @@ public class ModelFarmingOperationServiceImpl implements ModelFarmingOperationSe
 
     @Resource
     private ModelFarmingOperationMapper modelFarmingOperationMapper;
+    @Resource
+    private ModelFarmingOperationInputMapper modelFarmingOperationInputMapper;
 
     @Override
     public String createModelFarmingOperation(ModelFarmingOperationSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         ModelFarmingOperationDO modelFarmingOperation = BeanUtils.toBean(createReqVO, ModelFarmingOperationDO.class);
+        modelFarmingOperation.setId(IdUtil.fastUUID());
+        modelFarmingOperation.setTenantId(String.valueOf(user.getTenantId()));
         modelFarmingOperationMapper.insert(modelFarmingOperation);
 
         // 返回
@@ -55,20 +66,23 @@ public class ModelFarmingOperationServiceImpl implements ModelFarmingOperationSe
     }
 
     @Override
-        public void deleteModelFarmingOperationListByIds(List<String> ids) {
+    public void deleteModelFarmingOperationListByIds(List<String> ids) {
         // 删除
         modelFarmingOperationMapper.deleteByIds(ids);
-        }
+    }
 
-private void validateModelFarmingOperationExists(String id) {
+    private void validateModelFarmingOperationExists(String id) {
         if (modelFarmingOperationMapper.selectById(id) == null) {
             throw exception(MODEL_FARMING_OPERATION_NOT_EXISTS);
         }
     }
 
     @Override
-    public ModelFarmingOperationDO getModelFarmingOperation(String id) {
+    public ModelFarmingOperationRespVO getModelFarmingOperation(String id) {
-        return modelFarmingOperationMapper.selectById(id);
+        ModelFarmingOperationRespVO bean = BeanUtils.toBean(modelFarmingOperationMapper.selectById(id), ModelFarmingOperationRespVO.class);
+        List<ModelFarmingOperationInputDO> farmingOperationInputDOS = modelFarmingOperationInputMapper.selectByFarmingId(id);
+        bean.setFarmingOperationInputDOS(farmingOperationInputDOS);
+        return bean;
     }
 
     @Override

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperationinput/ModelFarmingOperationInputServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.module.farm.service.modelfarmingoperationinput;
 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.ModelFarmingOperationInputPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.ModelFarmingOperationInputSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO;
@@ -13,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_FARMING_OPERATION_INPUT_NOT_EXISTS;
 
 /**
@@ -29,8 +32,11 @@ public class ModelFarmingOperationInputServiceImpl implements ModelFarmingOperat
 
     @Override
     public String createModelFarmingOperationInput(ModelFarmingOperationInputSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         ModelFarmingOperationInputDO modelFarmingOperationInput = BeanUtils.toBean(createReqVO, ModelFarmingOperationInputDO.class);
+        modelFarmingOperationInput.setId(IdUtil.fastUUID());
+        modelFarmingOperationInput.setTenantId(String.valueOf(user.getTenantId()));
         modelFarmingOperationInputMapper.insert(modelFarmingOperationInput);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.farm.service.modelmanagement;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementSaveReqVO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * 模型管理 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface ModelManagementService {
+
+    /**
+     * 创建模型管理
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    String createModelManagement(@Valid ModelManagementSaveReqVO createReqVO);
+
+    /**
+     * 更新模型管理
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateModelManagement(@Valid ModelManagementSaveReqVO updateReqVO);
+
+    /**
+     * 删除模型管理
+     *
+     * @param id 编号
+     */
+    void deleteModelManagement(String id);
+
+    /**
+     * 批量删除模型管理
+     *
+     * @param ids 编号
+     */
+    void deleteModelManagementListByIds(List<String> ids);
+
+    /**
+     * 获得模型管理
+     *
+     * @param id 编号
+     * @return 模型管理
+     */
+    ModelManagementRespVO getModelManagement(String id);
+
+    /**
+     * 获得模型管理分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 模型管理分页
+     */
+    PageResult<ModelManagementDO> getModelManagementPage(ModelManagementPageReqVO pageReqVO);
+
+}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java

@@ -0,0 +1,133 @@
+package cn.iocoder.yudao.module.farm.service.modelmanagement;
+
+import cn.hutool.core.util.IdUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
+import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementSaveReqVO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO;
+import cn.iocoder.yudao.module.farm.dal.mysql.modelcycle.ModelCycleMapper;
+import cn.iocoder.yudao.module.farm.dal.mysql.modelenvironmentindex.ModelEnvironmentIndexMapper;
+import cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperation.ModelFarmingOperationMapper;
+import cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperationinput.ModelFarmingOperationInputMapper;
+import cn.iocoder.yudao.module.farm.dal.mysql.modelmanagement.ModelManagementMapper;
+import cn.iocoder.yudao.module.farm.dal.mysql.modelpestdiseaseweed.ModelPestDiseaseWeedMapper;
+import cn.iocoder.yudao.module.farm.dal.mysql.modelweatherdisaster.ModelWeatherDisasterMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
+import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_MANAGEMENT_NOT_EXISTS;
+
+/**
+ * 模型管理 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class ModelManagementServiceImpl implements ModelManagementService {
+
+    @Resource
+    private ModelManagementMapper modelManagementMapper;
+    @Resource
+    private ModelCycleMapper modelCycleMapper;
+    @Resource
+    private ModelEnvironmentIndexMapper modelEnvironmentIndexMapper;
+    @Resource
+    private ModelWeatherDisasterMapper modelWeatherDisasterMapper;
+    @Resource
+    private ModelPestDiseaseWeedMapper modelPestDiseaseWeedMapper;
+    @Resource
+    private ModelFarmingOperationMapper modelFarmingOperationMapper;
+
+
+    @Override
+    public String createModelManagement(ModelManagementSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
+        // 插入
+        ModelManagementDO modelManagement = BeanUtils.toBean(createReqVO, ModelManagementDO.class);
+        modelManagement.setId(IdUtil.fastUUID());
+        modelManagement.setTenantId(String.valueOf(user.getTenantId()));
+        modelManagementMapper.insert(modelManagement);
+
+        // 返回
+        return modelManagement.getId();
+    }
+
+    @Override
+    public void updateModelManagement(ModelManagementSaveReqVO updateReqVO) {
+        // 校验存在
+        validateModelManagementExists(updateReqVO.getId());
+        // 更新
+        ModelManagementDO updateObj = BeanUtils.toBean(updateReqVO, ModelManagementDO.class);
+        modelManagementMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteModelManagement(String id) {
+        // 校验存在
+        validateModelManagementExists(id);
+        // 删除
+        modelManagementMapper.deleteById(id);
+    }
+
+    @Override
+    public void deleteModelManagementListByIds(List<String> ids) {
+        // 删除
+        modelManagementMapper.deleteByIds(ids);
+    }
+
+
+    private void validateModelManagementExists(String id) {
+        if (modelManagementMapper.selectById(id) == null) {
+            throw exception(MODEL_MANAGEMENT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ModelManagementRespVO getModelManagement(String id) {
+        ModelManagementDO modelManagementDO = modelManagementMapper.selectById(id);
+        ModelManagementRespVO bean = BeanUtils.toBean(modelManagementDO, ModelManagementRespVO.class);
+        List<ModelCycleRespVO> vos = new ArrayList<>();
+        List<ModelCycleDO> list = modelCycleMapper.selectListByModelId(id);
+        list.forEach(cycle -> {
+            ModelCycleRespVO vo = BeanUtils.toBean(cycle, ModelCycleRespVO.class);
+            //环境指标
+            List<ModelEnvironmentIndexDO> environmentIndexDO = modelEnvironmentIndexMapper.selectByCycleId(cycle.getId());
+            vo.setEnvironmentIndexDOS(environmentIndexDO);
+            //气象灾害
+            List<ModelWeatherDisasterDO> weatherDisasterDO = modelWeatherDisasterMapper.selectByCycleId(cycle.getId());
+            vo.setWeatherDisasterDOS(weatherDisasterDO);
+            //病虫草灾害
+            List<ModelPestDiseaseWeedDO> pestDiseaseWeedDO = modelPestDiseaseWeedMapper.selectByCycleId(cycle.getId());
+            vo.setPestDiseaseWeedDOS(pestDiseaseWeedDO);
+            //农事操作
+            List<ModelFarmingOperationDO> farmingOperationDO = modelFarmingOperationMapper.selectByCycleId(cycle.getId());
+            vo.setFarmingOperationDOS(farmingOperationDO);
+            vos.add(vo);
+        });
+        bean.setModelCycles(vos);
+        return bean;
+    }
+
+    @Override
+    public PageResult<ModelManagementDO> getModelManagementPage(ModelManagementPageReqVO pageReqVO) {
+        return modelManagementMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelpestdiseaseweed/ModelPestDiseaseWeedServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.module.farm.service.modelpestdiseaseweed;
 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.ModelPestDiseaseWeedPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.ModelPestDiseaseWeedSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO;
@@ -13,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_PEST_DISEASE_WEED_NOT_EXISTS;
 
 /**
@@ -29,8 +32,11 @@ public class ModelPestDiseaseWeedServiceImpl implements ModelPestDiseaseWeedServ
 
     @Override
     public String createModelPestDiseaseWeed(ModelPestDiseaseWeedSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         ModelPestDiseaseWeedDO modelPestDiseaseWeed = BeanUtils.toBean(createReqVO, ModelPestDiseaseWeedDO.class);
+        modelPestDiseaseWeed.setId(IdUtil.fastUUID());
+        modelPestDiseaseWeed.setTenantId(String.valueOf(user.getTenantId()));
         modelPestDiseaseWeedMapper.insert(modelPestDiseaseWeed);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelweatherdisaster/ModelWeatherDisasterServiceImpl.java

@@ -1,16 +1,17 @@
 package cn.iocoder.yudao.module.farm.service.modelweatherdisaster;
 
-import cn.hutool.core.collection.CollUtil;
+ 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterSaveReqVO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
+ 
 
 import cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+ 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.modelweatherdisaster.ModelWeatherDisasterMapper;
@@ -18,8 +19,7 @@ import cn.iocoder.yudao.module.farm.dal.mysql.modelweatherdisaster.ModelWeatherD
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_WEATHER_DISASTER_NOT_EXISTS;
 
 /**
@@ -36,8 +36,11 @@ public class ModelWeatherDisasterServiceImpl implements ModelWeatherDisasterServ
 
     @Override
     public String createModelWeatherDisaster(ModelWeatherDisasterSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         ModelWeatherDisasterDO modelWeatherDisaster = BeanUtils.toBean(createReqVO, ModelWeatherDisasterDO.class);
+        modelWeatherDisaster.setId(IdUtil.fastUUID());
+        modelWeatherDisaster.setTenantId(String.valueOf(user.getTenantId()));
         modelWeatherDisasterMapper.insert(modelWeatherDisaster);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java

@@ -1,6 +1,10 @@
 package cn.iocoder.yudao.module.farm.service.personnelmanagement;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -9,9 +13,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 
 import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement.PersonnelManagementMapper;
 
@@ -36,8 +40,11 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic
 
     @Override
     public String createPersonnelManagement(PersonnelManagementSaveReqVO createReqVO) {
+        LoginUser user = SecurityFrameworkUtils.getLoginUser();
         // 插入
         PersonnelManagementDO personnelManagement = BeanUtils.toBean(createReqVO, PersonnelManagementDO.class);
+        personnelManagement.setId(IdUtil.fastUUID());
+        personnelManagement.setTenantId(String.valueOf(user.getTenantId()));
         personnelManagementMapper.insert(personnelManagement);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pestdiseaseweedlibrary/PestDiseaseWeedLibraryServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.pestdiseaseweedlibrary;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo.PestDiseaseWeedLibraryPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo.PestDiseaseWeedLibrarySaveReqVO;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.pestdiseaseweedlibrary.PestDi
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.pestdiseaseweedlibrary.PestDiseaseWeedLibraryMapper;
 
@@ -20,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PEST_DISEASE_WEED_LIBRARY_NOT_EXISTS;
 
 /**
@@ -36,8 +39,11 @@ public class PestDiseaseWeedLibraryServiceImpl implements PestDiseaseWeedLibrary
 
     @Override
     public String createPestDiseaseWeedLibrary(PestDiseaseWeedLibrarySaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         PestDiseaseWeedLibraryDO pestDiseaseWeedLibrary = BeanUtils.toBean(createReqVO, PestDiseaseWeedLibraryDO.class);
+        pestDiseaseWeedLibrary.setId(IdUtil.fastUUID());
+        pestDiseaseWeedLibrary.setTenantId(String.valueOf(user.getTenantId()));
         pestDiseaseWeedLibraryMapper.insert(pestDiseaseWeedLibrary);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.pesticideresidueindex;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.pesticideresidueindex.Pestici
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.pesticideresidueindex.PesticideResidueIndexMapper;
 
@@ -20,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PESTICIDE_RESIDUE_INDEX_NOT_EXISTS;
 
 /**
@@ -36,8 +39,11 @@ public class PesticideResidueIndexServiceImpl implements PesticideResidueIndexSe
 
     @Override
     public String createPesticideResidueIndex(PesticideResidueIndexSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         PesticideResidueIndexDO pesticideResidueIndex = BeanUtils.toBean(createReqVO, PesticideResidueIndexDO.class);
+        pesticideResidueIndex.setId(IdUtil.fastUUID());
+        pesticideResidueIndex.setTenantId(String.valueOf(user.getTenantId()));
         pesticideResidueIndexMapper.insert(pesticideResidueIndex);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.service.plotinfo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoSaveReqVO;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.plotinfo.PlotInfoMapper;
 
@@ -20,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PLOT_INFO_NOT_EXISTS;
 
 /**
@@ -36,8 +39,11 @@ public class PlotInfoServiceImpl implements PlotInfoService {
 
     @Override
     public String createPlotInfo(PlotInfoSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         PlotInfoDO plotInfo = BeanUtils.toBean(createReqVO, PlotInfoDO.class);
+        plotInfo.setId(IdUtil.fastUUID());
+        plotInfo.setTenantId(String.valueOf(user.getTenantId()));
         plotInfoMapper.insert(plotInfo);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java

@@ -1,25 +1,26 @@
 package cn.iocoder.yudao.module.farm.service.productionplan;
 
-import cn.hutool.core.collection.CollUtil;
+ 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanSaveReqVO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
+ 
 
 import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+ 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.productionplan.ProductionPlanMapper;
 
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PRODUCTION_PLAN_NOT_EXISTS;
 
 /**
@@ -36,8 +37,11 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
 
     @Override
     public String createProductionPlan(ProductionPlanSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         ProductionPlanDO productionPlan = BeanUtils.toBean(createReqVO, ProductionPlanDO.class);
+        productionPlan.setId(IdUtil.fastUUID());
+        productionPlan.setTenantId(String.valueOf(user.getTenantId()));
         productionPlanMapper.insert(productionPlan);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementServiceImpl.java

@@ -1,29 +1,30 @@
 package cn.iocoder.yudao.module.farm.service.productmanagement;
 
-import cn.hutool.core.collection.CollUtil;
+ 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementSaveReqVO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
+ 
 
 import cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement.ProductManagementDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+ 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 
 import cn.iocoder.yudao.module.farm.dal.mysql.productmanagement.ProductManagementMapper;
 
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PRODUCT_MANAGEMENT_NOT_EXISTS;
 
 /**
- * 商品管理 Service 实现类
+ * 产品管理 Service 实现类
  *
  * @author 芋道源码
  */
@@ -36,8 +37,11 @@ public class ProductManagementServiceImpl implements ProductManagementService {
 
     @Override
     public String createProductManagement(ProductManagementSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         ProductManagementDO productManagement = BeanUtils.toBean(createReqVO, ProductManagementDO.class);
+        productManagement.setId(IdUtil.fastUUID());
+        productManagement.setTenantId(String.valueOf(user.getTenantId()));
         productManagementMapper.insert(productManagement);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.module.farm.service.specieslibrary;
 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.SpeciesLibraryPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.SpeciesLibrarySaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO;
@@ -13,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.SPECIES_LIBRARY_NOT_EXISTS;
 
 /**
@@ -29,8 +32,11 @@ public class SpeciesLibraryServiceImpl implements SpeciesLibraryService {
 
     @Override
     public String createSpeciesLibrary(SpeciesLibrarySaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         SpeciesLibraryDO speciesLibrary = BeanUtils.toBean(createReqVO, SpeciesLibraryDO.class);
+        speciesLibrary.setId(IdUtil.fastUUID());
+        speciesLibrary.setTenantId(String.valueOf(user.getTenantId()));
         speciesLibraryMapper.insert(speciesLibrary);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.module.farm.service.varietydata;
 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.varietydata.VarietyDataDO;
@@ -13,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.VARIETY_DATA_NOT_EXISTS;
 
 /**
@@ -29,8 +32,11 @@ public class VarietyDataServiceImpl implements VarietyDataService {
 
     @Override
     public String createVarietyData(VarietyDataSaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         VarietyDataDO varietyData = BeanUtils.toBean(createReqVO, VarietyDataDO.class);
+        varietyData.setId(IdUtil.fastUUID());
+        varietyData.setTenantId(String.valueOf(user.getTenantId()));
         varietyDataMapper.insert(varietyData);
 
         // 返回

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.module.farm.service.weatherdisasterlibrary;
 
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo.WeatherDisasterLibraryPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo.WeatherDisasterLibrarySaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.weatherdisasterlibrary.WeatherDisasterLibraryDO;
@@ -13,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.WEATHER_DISASTER_LIBRARY_NOT_EXISTS;
 
 /**
@@ -29,8 +32,11 @@ public class WeatherDisasterLibraryServiceImpl implements WeatherDisasterLibrary
 
     @Override
     public String createWeatherDisasterLibrary(WeatherDisasterLibrarySaveReqVO createReqVO) {
+        LoginUser user = getLoginUser();
         // 插入
         WeatherDisasterLibraryDO weatherDisasterLibrary = BeanUtils.toBean(createReqVO, WeatherDisasterLibraryDO.class);
+        weatherDisasterLibrary.setId(IdUtil.fastUUID());
+        weatherDisasterLibrary.setTenantId(String.valueOf(user.getTenantId()));
         weatherDisasterLibraryMapper.insert(weatherDisasterLibrary);
 
         // 返回

yudao-module-farm/src/main/resources/mapper/modelcycle/ModelCycleMapper.xml

@@ -9,4 +9,10 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="selectListByModelId" parameterType="String"
+            resultType="cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO">
+        select *
+        from farm_model_cycle
+        where model_id = #{modelId}
+    </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/modelenvironmentindex/ModelEnvironmentIndexMapper.xml

@@ -9,4 +9,10 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="selectByCycleId" parameterType="String"
+            resultType="cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO">
+        select *
+        from farm_model_environment_index
+        where cycle_id = #{cycleId}
+    </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/modelfarmingoperation/ModelFarmingOperationMapper.xml

@@ -9,4 +9,8 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="selectByCycleId" parameterType="String"
+            resultType="cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO">
+
+    </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/modelfarmingoperationinput/ModelFarmingOperationInputMapper.xml

@@ -9,4 +9,10 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="selectByFarmingId" parameterType="String"
+            resultType="cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO">
+        select *
+        from farm_model_farming_operation_input
+        where farming_id = #{farmingId}
+    </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/modelmanagement/ModelManagementMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.farm.dal.mysql.modelmanagement.ModelManagementMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

yudao-module-farm/src/main/resources/mapper/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.xml

@@ -9,4 +9,10 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="selectByCycleId" parameterType="String"
+            resultType="cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO">
+        select *
+        from farm_model_pest_disease_weed
+        where cycle_id = #{cycleId}
+    </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/modelweatherdisaster/ModelWeatherDisasterMapper.xml

@@ -9,4 +9,10 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="selectByCycleId" parameterType="String"
+            resultType="cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO">
+        select *
+        from farm_model_weather_disaster
+        where cycle_id = #{cycleId}
+    </select>
 </mapper>