diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java index 8b280e42..9fa24ba6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java @@ -4,10 +4,10 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.*; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordCreateReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordCreateReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import cn.iocoder.yudao.module.farm.enums.CommonConstants; import cn.iocoder.yudao.module.farm.service.cropFarmingCenter.CropFarmingCenterService; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordCreateReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordCreateReqVO.java similarity index 97% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordCreateReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordCreateReqVO.java index 568ac82b..b687ce74 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordCreateReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordPageReqVO.java similarity index 96% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordPageReqVO.java index 28e8abdc..1c7939d5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordRespVO.java similarity index 97% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordRespVO.java index 71d7ce7e..888822f4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordSaveReqVO.java similarity index 96% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordSaveReqVO.java index faaabb23..bd41b1ea 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/productionplan/ProductionPlanPageReqVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/productionplan/ProductionPlanPageReqVO.java index 4581c1a8..6bfbdac2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/productionplan/ProductionPlanPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/productionplan/ProductionPlanRespVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/productionplan/ProductionPlanRespVO.java index 7af6f541..e2d7e243 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/productionplan/ProductionPlanRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/productionplan/ProductionPlanSaveReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/productionplan/ProductionPlanSaveReqVO.java index 223ae3c4..cd5cef57 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/productionplan/ProductionPlanSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/FarmingRecordController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/FarmingRecordController.java deleted file mode 100644 index 7a4441ce..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/FarmingRecordController.java +++ /dev/null @@ -1,112 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.farmingrecord; - -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import jakarta.validation.Valid; -import jakarta.servlet.http.HttpServletResponse; -import java.util.List; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import java.io.IOException; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; - -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordCreateReqVO; -import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; -import cn.iocoder.yudao.module.farm.service.farmingrecord.FarmingRecordService; - -//@Tag(name = "种植中心-农事记录") -//@RestController -//@RequestMapping("/farm/farming-record") -//@Validated -public class FarmingRecordController { - -// @Resource -// private FarmingRecordService farmingRecordService; -// -// @PostMapping("/create") -// @Operation(summary = "创建种植中心-农事基地-农事记录") -// -// public CommonResult createFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO createReqVO) { -// return success(farmingRecordService.createFarmingRecord(createReqVO)); -// } -// -// @PostMapping("/create-new") -// @Operation(summary = "创建种植中心-农事基地-农事记录（新格式）") -// public CommonResult createFarmingRecordNew(@Valid @RequestBody FarmingRecordCreateReqVO createReqVO) { -// return success(farmingRecordService.createFarmingRecordNew(createReqVO)); -// } -// -// @PutMapping("/update") -// @Operation(summary = "更新种植中心-农事基地-农事记录") -// -// public CommonResult updateFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO updateReqVO) { -// farmingRecordService.updateFarmingRecord(updateReqVO); -// return success(true); -// } -// -// @DeleteMapping("/delete") -// @Operation(summary = "删除种植中心-农事基地-农事记录") -// @Parameter(name = "id", description = "编号", required = true) -// -// public CommonResult deleteFarmingRecord(@RequestParam("id") String id) { -// farmingRecordService.deleteFarmingRecord(id); -// return success(true); -// } -// -// @DeleteMapping("/delete-list") -// @Parameter(name = "ids", description = "编号", required = true) -// @Operation(summary = "批量删除种植中心-农事基地-农事记录") -// -// public CommonResult deleteFarmingRecordList(@RequestParam("ids") List ids) { -// farmingRecordService.deleteFarmingRecordListByIds(ids); -// return success(true); -// } -// -// @GetMapping("/get") -// @Operation(summary = "获得种植中心-农事基地-农事记录") -// @Parameter(name = "id", description = "编号", required = true, example = "1024") -// -// public CommonResult getFarmingRecord(@RequestParam("id") String id) { -// FarmingRecordDO farmingRecord = farmingRecordService.getFarmingRecord(id); -// return success(BeanUtils.toBean(farmingRecord, FarmingRecordRespVO.class)); -// } -// -// @GetMapping("/page") -// @Operation(summary = "获得种植中心-农事基地-农事记录分页") -// -// public CommonResult> getFarmingRecordPage(@Valid FarmingRecordPageReqVO pageReqVO) { -// PageResult pageResult = farmingRecordService.getFarmingRecordPage(pageReqVO); -// return success(BeanUtils.toBean(pageResult, FarmingRecordRespVO.class)); -// } -// -// @GetMapping("/export-excel") -// @Operation(summary = "导出种植中心-农事基地-农事记录 Excel") -// -// @ApiAccessLog(operateType = EXPORT) -// public void exportFarmingRecordExcel(@Valid FarmingRecordPageReqVO pageReqVO, -// HttpServletResponse response) throws IOException { -// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); -// List list = farmingRecordService.getFarmingRecordPage(pageReqVO).getList(); -// // 导出 Excel -// ExcelUtils.write(response, "种植中心-农事基地-农事记录.xls", "数据", FarmingRecordRespVO.class, -// BeanUtils.toBean(list, FarmingRecordRespVO.class)); -// } - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/ProductionPlanController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/ProductionPlanController.java deleted file mode 100644 index 94de4286..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/ProductionPlanController.java +++ /dev/null @@ -1,105 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.productionplan; - -import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.validation.Valid; -import jakarta.servlet.http.HttpServletResponse; -import java.util.List; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; - -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import java.io.IOException; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; - -import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO; -import cn.iocoder.yudao.module.farm.service.productionplan.ProductionPlanService; - -//@Tag(name = "种植中心-生产计划") -//@RestController -//@RequestMapping("/farm/production-plan") -//@Validated -public class ProductionPlanController { - -// @Resource -// private ProductionPlanService productionPlanService; -// -// @PostMapping("/create") -// @Operation(summary = "创建种植中心-生产计划-生产计划") -// -// public CommonResult createProductionPlan(@Valid @RequestBody ProductionPlanSaveReqVO createReqVO) { -// return success(productionPlanService.createProductionPlan(createReqVO)); -// } -// -// @PutMapping("/update") -// @Operation(summary = "更新种植中心-生产计划-生产计划") -// -// public CommonResult updateProductionPlan(@Valid @RequestBody ProductionPlanSaveReqVO updateReqVO) { -// productionPlanService.updateProductionPlan(updateReqVO); -// return success(true); -// } -// -// @DeleteMapping("/delete") -// @Operation(summary = "删除种植中心-生产计划-生产计划") -// @Parameter(name = "id", description = "编号", required = true) -// -// public CommonResult deleteProductionPlan(@RequestParam("id") String id) { -// productionPlanService.deleteProductionPlan(id); -// return success(true); -// } -// -// @DeleteMapping("/delete-list") -// @Parameter(name = "ids", description = "编号", required = true) -// @Operation(summary = "批量删除种植中心-生产计划-生产计划") -// -// public CommonResult deleteProductionPlanList(@RequestParam("ids") List ids) { -// productionPlanService.deleteProductionPlanListByIds(ids); -// return success(true); -// } -// -// @GetMapping("/get") -// @Operation(summary = "获得种植中心-生产计划-生产计划") -// @Parameter(name = "id", description = "编号", required = true, example = "1024") -// -// public CommonResult getProductionPlan(@RequestParam("id") String id) { -// ProductionPlanDO productionPlan = productionPlanService.getProductionPlan(id); -// return success(BeanUtils.toBean(productionPlan, ProductionPlanRespVO.class)); -// } -// -// @GetMapping("/page") -// @Operation(summary = "获得种植中心-生产计划-生产计划分页") -// public CommonResult> getProductionPlanPage(@Valid ProductionPlanPageReqVO pageReqVO) { -// PageResult pageResult = productionPlanService.getProductionPlanPage(pageReqVO); -// return success(BeanUtils.toBean(pageResult, ProductionPlanRespVO.class)); -// } -// -// @GetMapping("/export-excel") -// @Operation(summary = "导出种植中心-生产计划-生产计划 Excel") -// -// @ApiAccessLog(operateType = EXPORT) -// public void exportProductionPlanExcel(@Valid ProductionPlanPageReqVO pageReqVO, -// HttpServletResponse response) throws IOException { -// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); -// List list = productionPlanService.getProductionPlanPage(pageReqVO).getList(); -// // 导出 Excel -// ExcelUtils.write(response, "种植中心-生产计划-生产计划.xls", "数据", ProductionPlanRespVO.class, -// BeanUtils.toBean(list, ProductionPlanRespVO.class)); -// } - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java index d2a99208..505fd8fa 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmingDistributionReqVO; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmingDistributionRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java index 712fa5b0..0db908f1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java @@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.*; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.ProductionPlanPage2ReqVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.ProductionPlanRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan.ProductionPlanPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO; import cn.iocoder.yudao.module.farm.enums.CommonConstants; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/DeviceManager.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/DeviceManager.java deleted file mode 100644 index 4ea3a79b..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/DeviceManager.java +++ /dev/null @@ -1,100 +0,0 @@ -package cn.iocoder.yudao.module.farm.manager.devices; - -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.v2.DeviceInfoDetailV2RespVO; -import cn.iocoder.yudao.module.farm.manager.devices.soil.SoilService; -import cn.iocoder.yudao.module.farm.manager.devices.soil.dto.HistoryDataListPageReqVO; -import cn.iocoder.yudao.module.farm.manager.devices.soil.dto.HistoryDataListPageRespVO; -import cn.iocoder.yudao.module.farm.manager.devices.soil.dto.RealTimeDataReqVO; -import cn.iocoder.yudao.module.farm.manager.devices.soil.dto.RealTimeDataRespVO; -import cn.iocoder.yudao.module.farm.manager.devices.wf.WaterFertilizerService; -import cn.iocoder.yudao.module.farm.utils.DateUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.stereotype.Service; - -import java.util.List; - -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; - -/** - * @description: 设备管理 - * 参考文档: 物连网农业四情采集api协议.pdf 版本:v2.0.3 日期:2022.08.16 - * @author: binda - * @date: 2025/9/17 10:50 - */ -//@Service -public class DeviceManager { - -// private final SoilService soilService; -// private final WaterFertilizerService waterFertilizerService; -// -// public DeviceManager(SoilService soilService, WaterFertilizerService waterFertilizerService) { -// this.soilService = soilService; -// this.waterFertilizerService = waterFertilizerService; -// } -// -// public DeviceInfoDetailV2RespVO getRealData(String deviceUniqueId) { -// DeviceInfoDetailV2RespVO.SoilInfo soilInfo = this.getSoilData(deviceUniqueId); -// DeviceInfoDetailV2RespVO.WfInfo wfInfo = this.getWfData(deviceUniqueId); -// return new DeviceInfoDetailV2RespVO(deviceUniqueId, null, null); -// } -// -// public DeviceInfoDetailV2RespVO.SoilInfo getSoilData(String deviceUniqueId) { -// // 判断该deviceUniqueId是否来源于土壤墒情 -// boolean flag = false; -// if (flag) { -// return null; -// } -// -// String tenantId = String.valueOf(getLoginUser().getTenantId()); -// if (!soilService.validateUserToken(tenantId)) { -// soilService.userLogin(); -// } -// -// List realTimeData = soilService.getRealTimeData(new RealTimeDataReqVO(deviceUniqueId)); -// HistoryDataListPageRespVO historyDataList = soilService.getHistoryDataList(new HistoryDataListPageReqVO()); -// return new DeviceInfoDetailV2RespVO.SoilInfo(deviceUniqueId, coverToSoil(realTimeData), coverToSoil(historyDataList)); -// } -// -// public DeviceInfoDetailV2RespVO.RealTimeData coverToSoil(List realTimeData) { -// if (ObjectUtils.isEmpty(realTimeData)) { -// return null; -// } -// RealTimeDataRespVO sourceObj = realTimeData.get(0); -// return BeanUtils.toBean(sourceObj, DeviceInfoDetailV2RespVO.RealTimeData.class); -// } -// -// public List coverToSoil(HistoryDataListPageRespVO historyDataList ) { -// if (ObjectUtils.isEmpty(historyDataList)) { -// return null; -// } -// -// List source = historyDataList.getRows(); -// return source.stream().map(e -> { -// DeviceInfoDetailV2RespVO.HistoryDataList target = new DeviceInfoDetailV2RespVO.HistoryDataList(); -// target.setHistoryId(e.getHistoryId()); -// target.setRecordTime(DateUtils.timestampToLocalDateTime(e.getRecordTime())); -// target.setDeviceAddress(e.getDeviceAddress()); -// target.setAlarmStatus(e.getAlarmStatus()); -// target.setAlarmStatusName(ALARM_STATUS_NAME_MAP.getOrDefault(e.getAlarmStatus(),"")); -// target.setTemStr(e.getTemStr()); -// target.setTemValue(e.getTemValue()); -// target.setHumStr(e.getHumStr()); -// target.setHumValue(e.getHumValue()); -// return target; -// }).toList(); -// -// } -// -// -// -// public DeviceInfoDetailV2RespVO.WfInfo getWfData(String deviceUniqueId) { -// String tenantId = String.valueOf(getLoginUser().getTenantId()); -// -// -// -// return null; -// } - - -} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/commons/DeviceConst.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/commons/DeviceConst.java deleted file mode 100644 index 158e9e55..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/commons/DeviceConst.java +++ /dev/null @@ -1,105 +0,0 @@ -package cn.iocoder.yudao.module.farm.manager.devices.commons; - -import java.util.HashMap; -import java.util.Map; - -/** - * @description: 设备常量 - * @author: binda - * @date: 2025/9/17 15:24 - */ -public class DeviceConst { -// -// /** -// * 四情 设备类型 -// * -// * 虫情设备普通版： worm； -// * 虫情设备旗舰版： wormFlagship； -// * 孢子设备： spore； -// * 气象设备：met； -// * 墒情设备：soil； -// * 智慧环控 3.0 设备：irrigation； -// * 智慧环控 2.0 设备：irrigation2； -// * 摄像头：camera； -// * -// */ -// public final String DEVICE_TYPE_IRRIGATION = "irrigation"; -// public final String DEVICE_TYPE_WORM = "worm"; -// public final String DEVICE_TYPE_WORM_FLAG_SHIP = "wormFlagship"; -// public final String DEVICE_TYPE_SOIL = "soil"; -// public final String DEVICE_TYPE_MET = "met"; -// public final String DEVICE_TYPE_SPORE = "spore"; -// public final String DEVICE_TYPE_CAMERA = "camera"; -// -// /** -// * 四情 设备状态 -// */ -// public final String DEVICE_STATUS_ONLINE = "online"; -// public final String DEVICE_STATUS_OFFLINE = "offline"; -// public final String DEVICE_STATUS_ALARM = "alarm"; -// -// /** -// * 四情 http 状态 -// */ -// public final String HTTP_STATUS_1000 = "1000"; // 成功 -// public final String HTTP_STATUS_1001 = "1001"; // 失败 (执行错误) -// public final String HTTP_STATUS_1002 = "1002"; // 失败 (验证失败) -// public final String HTTP_STATUS_1003 = "1003"; // 服务端异常 -// public final String HTTP_STATUS_1004 = "1004"; // 登录过期 -// public final String HTTP_STATUS_2000 = "2000"; // 登录超时 -// public final String HTTP_STATUS_4000 = "4000"; // 未登录或登录失败 -// public final String HTTP_STATUS_5000 = "5000"; // 操作失败 -// -// /** -// * 四情-墒情 设备实时数据 - 节点类型 -// */ -// public final int NODE_TYPE_1 = 1; // 模拟量 -// public final int NODE_TYPE_1_1 = 1; // 模拟量 使能模拟量 -// public final int NODE_TYPE_1_2 = 2; // 模拟量 使能 -// -// public final int NODE_TYPE_2 = 2; // 模拟量 -// public final int NODE_TYPE_2_1 = 1; // 模拟量 使能模拟量 -// public final int NODE_TYPE_2_2 = 2; // 模拟量 禁用 -// -// public final int NODE_TYPE_3 = 3; // 模拟量 -// public final int NODE_TYPE_3_1 = 1; // 模拟量 禁用模拟量 -// public final int NODE_TYPE_3_2 = 2; // 模拟量 使能 -// -// public final int NODE_TYPE_4 = 4; // 浮点型设备 -// public final int NODE_TYPE_5 = 5; // 开关量型设备 -// public final int NODE_TYPE_6 = 6; // 32位有符号整型 -// public final int NODE_TYPE_7 = 7; // 32位无符号整型 -// public final int NODE_TYPE_8 = 8; // 遥调设备 -// -// /** -// * 四情-墒情 设备实时数据 - 节点报警等级 -// */ -// public final int ALARM_STATUS_0 = 0; // 正常 -// public final int ALARM_STATUS_1 = 1; // 超上限报警 -// public final int ALARM_STATUS_2 = 2; // 超下限报警 -// public final int ALARM_STATUS_3 = 3; // 开关闭合报警 -// public final int ALARM_STATUS_4 = 4; // 开关断开报警 -// public final int ALARM_STATUS_5 = 5; // 遥调报警 -// -// /** -// * 四情-设备报警通知记录 - 通知类型 -// */ -// public final int NOTICE_TYPE_0 = 0; // 邮箱 -// public final int NOTICE_TYPE_1 = 1; // 短信 -// -// -// -// -// public final static int ALARM_STATUS_NAME_0 = 0; // 正常 -// public final static int ALARM_STATUS_NAME_1 = 1; // 报警 -// -// // TODO: 2025/9/17 UpdateNodeInfoReqVO -// -// -// public static Map ALARM_STATUS_NAME_MAP = new HashMap<>(); -// static { -// ALARM_STATUS_NAME_MAP.put(ALARM_STATUS_NAME_0, "正常"); -// ALARM_STATUS_NAME_MAP.put(ALARM_STATUS_NAME_1, "报警"); -// } - -} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/conf/DeviceConf.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/conf/DeviceConf.java deleted file mode 100644 index eca66f56..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/conf/DeviceConf.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.iocoder.yudao.module.farm.manager.devices.conf; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -/** - * @description: 设备配置 - * @author: binda - * @date: 2025/9/17 10:55 - */ -//@Data -//@Configuration -//@ConfigurationProperties(prefix = "device-manager") -public class DeviceConf { - -// private FourSituations fourSituations; -// private WaterAndFertilizer waterAndFertilizer; -// -// @Data -// public static class FourSituations { -// private String hosts; -// private String username; -// private String password; -// private Global global; -// private Soil soil; -// } -// -// @Data -// public static class Global { -// private String url21; // 用户登录 -// private String url22; // 获取登录用户信息 -// private String url23; // 获取子用户信息 -// private String url24; // 设备报警通知记录 -// private String url25; // 获取用户区域 -// private String url26; // 获取用户设备 -// private String url27; // 批量获取摄像头设备信息 -// private String url28; // 获取设备实时数据 -// private String url29; // 区域绑定设备 -// } -// -// @Data -// public static class Soil { -// private String url41; // 墒情设备, 获取设备全部信息 -// private String url42; // 墒情设备, 更新设备信息 -// private String url43; // 墒情设备, 更新节点信息 -// private String url44; // 墒情设备, 获取历史数据 -// } -// -// @Data -// public static class WaterAndFertilizer { -// private String hosts; -// private String username; -// private String password; -// private String url1; -// private String url2; -// private String url3; -// private String url4; -// } - - -} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/conf/SchedulingConfig.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/conf/SchedulingConfig.java deleted file mode 100644 index be35ebca..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/conf/SchedulingConfig.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.iocoder.yudao.module.farm.manager.devices.conf; - -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; - -/** - * @description: - * @author: binda - * @date: 2025/9/17 14:42 - */ -//@Configuration -//@EnableScheduling -public class SchedulingConfig { - -} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/scheduled/FarmingRecordJob.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/scheduled/FarmingRecordJob.java index 941f4eef..5537cdaf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/scheduled/FarmingRecordJob.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/scheduled/FarmingRecordJob.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.scheduled; import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler; import cn.iocoder.yudao.framework.tenant.core.job.TenantJob; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/scheduled/ProductionPlanJob.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/scheduled/ProductionPlanJob.java index aa6b4e8d..b28f3b31 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/scheduled/ProductionPlanJob.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/scheduled/ProductionPlanJob.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.scheduled; import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler; import cn.iocoder.yudao.framework.tenant.core.job.TenantJob; -import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan.ProductionPlanSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO; import cn.iocoder.yudao.module.farm.service.productionplan.ProductionPlanService; import lombok.extern.slf4j.Slf4j; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java index 1829afbf..52735811 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.farm.service.cropFarmingCenter; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.*; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordCreateReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordCreateReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import jakarta.validation.Valid; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java index 39a0453b..51e0dddd 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java @@ -5,10 +5,10 @@ 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.cropfarmingcenter.vo.*; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordCreateReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordCreateReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo.FarmingRecordInputSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCycleRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationRespVO; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java index 19bf2117..d1c39185 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java @@ -139,10 +139,8 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { // 设备类型名称 target.setDeviceTypeName(map.getOrDefault(target.getDeviceType(), "")); - // 从设备商服务 获取设备实时/历史数据 -// DeviceInfoDetailV2RespVO realData = deviceManager.getRealData(id); -// target.setSoilInfo(realData.getSoilInfo()); -// target.setWfInfo(realData.getWfInfo()); + // TODO: 2025/9/26 从设备商服务 获取设备实时/历史数据 + return target; } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordService.java index 6e45d7f3..899e3b42 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordService.java @@ -3,12 +3,11 @@ package cn.iocoder.yudao.module.farm.service.farmingrecord; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmingDistributionReqVO; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmingDistributionRespVO; -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.controller.admin.farmingrecord.vo.FarmingRecordCreateReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordCreateReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import jakarta.validation.Valid; import java.util.List; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java index 9d9b3cc6..ee011b61 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java @@ -7,9 +7,9 @@ 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.api.vo.FarmingDistributionReqVO; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmingDistributionRespVO; -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.controller.admin.farmingrecord.vo.FarmingRecordCreateReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordCreateReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; @@ -18,12 +18,10 @@ import cn.iocoder.yudao.module.farm.dal.mysql.farmingnamemaintenance.FarmingName import cn.iocoder.yudao.module.farm.dal.mysql.farmingrecord.FarmingRecordMapper; import cn.iocoder.yudao.module.farm.dal.mysql.farmingrecordinput.FarmingRecordInputMapper; import cn.iocoder.yudao.module.farm.dal.mysql.farmingtypemaintenance.FarmingTypeMaintenanceMapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; -import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java index 42f70b82..70e4e614 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java @@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.farm.service.productionplan; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.*; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseNamePlanRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan.ProductionPlanPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan.ProductionPlanSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import jakarta.validation.Valid; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java index 160d32e5..19a127e9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java @@ -6,13 +6,12 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.*; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseNamePlanRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan.ProductionPlanPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan.ProductionPlanSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; import cn.iocoder.yudao.module.farm.dal.mysql.baseinfo.BaseInfoMapper; import cn.iocoder.yudao.module.farm.dal.mysql.specieslibrary.SpeciesLibraryMapper; -import cn.iocoder.yudao.module.farm.enums.CommonConstants; import cn.iocoder.yudao.module.farm.utils.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang3.ObjectUtils;