diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/ErrorCodeConstants.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/ErrorCodeConstants.java new file mode 100644 index 00000000..b809f0db --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/ErrorCodeConstants.java @@ -0,0 +1,102 @@ +package cn.iocoder.yudao.module.farm.enums; + +import cn.iocoder.yudao.framework.common.exception.ErrorCode; + +/** + * 农场管理 错误码枚举类 + *

+ * farm 系统，使用 1-050-000-000 段 + */ +public interface ErrorCodeConstants { + + // ========== 基地管理 1-050-000-000 ========== + ErrorCode BASE_INFO_NOT_EXISTS = new ErrorCode(1_050_000_000, "基地不存在"); + + // ========== 公司信息 1-050-001-000 ========== + ErrorCode COMPANY_INFO_NOT_EXISTS = new ErrorCode(1_050_001_000, "公司信息不存在"); + + // ========== 种植区域 1-050-002-000 ========== + ErrorCode CULTIVATION_AREA_NOT_EXISTS = new ErrorCode(1_050_002_000, "种植区域不存在"); + + // ========== 地块信息 1-050-003-000 ========== + ErrorCode PLOT_INFO_NOT_EXISTS = new ErrorCode(1_050_003_000, "地块信息不存在"); + + // ========== 设备信息 1-050-004-000 ========== + ErrorCode DEVICE_INFO_NOT_EXISTS = new ErrorCode(1_050_004_000, "设备信息不存在"); + + // ========== 设备地块关系 1-050-005-000 ========== + ErrorCode DEVICE_PLOT_RELATION_NOT_EXISTS = new ErrorCode(1_050_005_000, "设备地块关系不存在"); + + // ========== 人员管理 1-050-006-000 ========== + ErrorCode PERSONNEL_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_050_006_000, "人员管理信息不存在"); + + // ========== 品种数据 1-050-007-000 ========== + ErrorCode VARIETY_DATA_NOT_EXISTS = new ErrorCode(1_050_007_000, "品种数据不存在"); + + // ========== 物种库 1-050-008-000 ========== + ErrorCode SPECIES_LIBRARY_NOT_EXISTS = new ErrorCode(1_050_008_000, "物种库信息不存在"); + + // ========== 投入品库 1-050-009-000 ========== + ErrorCode INPUT_LIBRARY_NOT_EXISTS = new ErrorCode(1_050_009_000, "投入品库信息不存在"); + + // ========== 病虫害草库 1-050-010-000 ========== + ErrorCode PEST_DISEASE_WEED_LIBRARY_NOT_EXISTS = new ErrorCode(1_050_010_000, "病虫害草库信息不存在"); + + // ========== 气象灾害库 1-050-011-000 ========== + ErrorCode WEATHER_DISASTER_LIBRARY_NOT_EXISTS = new ErrorCode(1_050_011_000, "气象灾害库信息不存在"); + + // ========== 环境指标配置 1-050-012-000 ========== + ErrorCode ENVIRONMENT_INDEX_CONFIG_NOT_EXISTS = new ErrorCode(1_050_012_000, "环境指标配置不存在"); + + // ========== 环境指标模型 1-050-013-000 ========== + ErrorCode MODEL_ENVIRONMENT_INDEX_NOT_EXISTS = new ErrorCode(1_050_013_000, "环境指标模型不存在"); + + // ========== 肥料指标 1-050-014-000 ========== + ErrorCode FERTILIZER_INDEX_NOT_EXISTS = new ErrorCode(1_050_014_000, "肥料指标不存在"); + + // ========== 农药残留指标 1-050-015-000 ========== + ErrorCode PESTICIDE_RESIDUE_INDEX_NOT_EXISTS = new ErrorCode(1_050_015_000, "农药残留指标不存在"); + + // ========== 生产计划 1-050-016-000 ========== + ErrorCode PRODUCTION_PLAN_NOT_EXISTS = new ErrorCode(1_050_016_000, "生产计划不存在"); + + // ========== 产品管理 1-050-017-000 ========== + ErrorCode PRODUCT_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_050_017_000, "产品管理信息不存在"); + + // ========== 农事记录 1-050-018-000 ========== + ErrorCode FARMING_RECORD_NOT_EXISTS = new ErrorCode(1_050_018_000, "农事记录不存在"); + + // ========== 农事记录输入 1-050-019-000 ========== + ErrorCode FARMING_RECORD_INPUT_NOT_EXISTS = new ErrorCode(1_050_019_000, "农事记录输入不存在"); + + // ========== 农事操作模型 1-050-020-000 ========== + ErrorCode MODEL_FARMING_OPERATION_NOT_EXISTS = new ErrorCode(1_050_020_000, "农事操作模型不存在"); + + // ========== 农事操作输入模型 1-050-021-000 ========== + ErrorCode MODEL_FARMING_OPERATION_INPUT_NOT_EXISTS = new ErrorCode(1_050_021_000, "农事操作输入模型不存在"); + + // ========== 农事类型维护 1-050-022-000 ========== + ErrorCode FARMING_TYPE_MAINTENANCE_NOT_EXISTS = new ErrorCode(1_050_022_000, "农事类型维护信息不存在"); + + // ========== 农事名称维护 1-050-023-000 ========== + ErrorCode FARMING_NAME_MAINTENANCE_NOT_EXISTS = new ErrorCode(1_050_023_000, "农事名称维护信息不存在"); + + // ========== 模型周期 1-050-024-000 ========== + ErrorCode MODEL_CYCLE_NOT_EXISTS = new ErrorCode(1_050_024_000, "模型周期不存在"); + + // ========== 模型气象灾害 1-050-025-000 ========== + ErrorCode MODEL_WEATHER_DISASTER_NOT_EXISTS = new ErrorCode(1_050_025_000, "模型气象灾害不存在"); + + // ========== 模型病虫害草 1-050-026-000 ========== + ErrorCode MODEL_PEST_DISEASE_WEED_NOT_EXISTS = new ErrorCode(1_050_026_000, "模型病虫害草不存在"); + + // ========== 灾害数据 1-050-027-000 ========== + ErrorCode DISASTER_DATA_NOT_EXISTS = new ErrorCode(1_050_027_000, "灾害数据不存在"); + + // ========== 基础信息 1-050-028-000 ========== + ErrorCode FOUNDATION_INFO_NOT_EXISTS = new ErrorCode(1_050_028_000, "基础信息不存在"); + + // ========== 消息中心 1-050-029-000 ========== + ErrorCode MESSAGE_CENTER_NOT_EXISTS = new ErrorCode(1_050_029_000, "消息中心信息不存在"); + +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoService.java index 1f17f0b7..2979b1e6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoService.java @@ -1,11 +1,12 @@ package cn.iocoder.yudao.module.farm.service.baseinfo; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.*; -import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +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; +import jakarta.validation.Valid; + +import java.util.List; /** * 基地 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java index 26a65724..4e9bdfaf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java @@ -1,24 +1,19 @@ package cn.iocoder.yudao.module.farm.service.baseinfo; -import cn.hutool.core.collection.CollUtil; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.*; -import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; 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.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; import cn.iocoder.yudao.module.farm.dal.mysql.baseinfo.BaseInfoMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +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.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; -import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.BASE_INFO_NOT_EXISTS; /** * 基地 Service 实现类 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoService.java index d49a21b5..c6334cdf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoService.java @@ -1,11 +1,12 @@ package cn.iocoder.yudao.module.farm.service.companyinfo; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.*; -import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +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; +import jakarta.validation.Valid; + +import java.util.List; /** * 企业信息 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoServiceImpl.java index 693e34aa..22bbe7ca 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoServiceImpl.java @@ -1,24 +1,19 @@ package cn.iocoder.yudao.module.farm.service.companyinfo; -import cn.hutool.core.collection.CollUtil; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.*; -import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO; 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.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; import cn.iocoder.yudao.module.farm.dal.mysql.companyinfo.CompanyInfoMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +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.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; -import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.COMPANY_INFO_NOT_EXISTS; /** * 企业信息 Service 实现类 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceService.java index 38ee958f..cb106004 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceService.java @@ -20,28 +20,28 @@ public interface FarmingNameMaintenanceService { * @param createReqVO 创建信息 * @return 编号 */ - String createingNameMaintenance(@Valid FarmingNameMaintenanceSaveReqVO createReqVO); + String createFarmingNameMaintenance(@Valid FarmingNameMaintenanceSaveReqVO createReqVO); /** * 更新农事名称维护 * * @param updateReqVO 更新信息 */ - void updateingNameMaintenance(@Valid FarmingNameMaintenanceSaveReqVO updateReqVO); + void updateFarmingNameMaintenance(@Valid FarmingNameMaintenanceSaveReqVO updateReqVO); /** * 删除农事名称维护 * * @param id 编号 */ - void deleteingNameMaintenance(String id); + void deleteFarmingNameMaintenance(String id); /** * 批量删除农事名称维护 * * @param ids 编号 */ - void deleteingNameMaintenanceListByIds(List ids); + void deleteFarmingNameMaintenanceListByIds(List ids); /** * 获得农事名称维护 @@ -49,7 +49,7 @@ public interface FarmingNameMaintenanceService { * @param id 编号 * @return 农事名称维护 */ - FarmingNameMaintenanceDO getingNameMaintenance(String id); + FarmingNameMaintenanceDO getFarmingNameMaintenance(String id); /** * 获得农事名称维护分页 @@ -57,6 +57,6 @@ public interface FarmingNameMaintenanceService { * @param pageReqVO 分页查询 * @return 农事名称维护分页 */ - PageResult getingNameMaintenancePage(FarmingNameMaintenancePageReqVO pageReqVO); + PageResult getFarmingNameMaintenancePage(FarmingNameMaintenancePageReqVO pageReqVO); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceServiceImpl.java index e0cb0d19..7440f0ab 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceServiceImpl.java @@ -1,24 +1,19 @@ package cn.iocoder.yudao.module.farm.service.farmingnamemaintenance; -import cn.hutool.core.collection.CollUtil; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.*; -import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO; 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.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; import cn.iocoder.yudao.module.farm.dal.mysql.farmingnamemaintenance.FarmingNameMaintenanceMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +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.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; -import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FARMING_NAME_MAINTENANCE_NOT_EXISTS; /** * 农事名称维护 Service 实现类 @@ -30,56 +25,56 @@ import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; public class FarmingNameMaintenanceServiceImpl implements FarmingNameMaintenanceService { @Resource - private FarmingNameMaintenanceMapper ingNameMaintenanceMapper; + private FarmingNameMaintenanceMapper farmingNameMaintenanceMapper; @Override - public String createingNameMaintenance(FarmingNameMaintenanceSaveReqVO createReqVO) { + public String createFarmingNameMaintenance(FarmingNameMaintenanceSaveReqVO createReqVO) { // 插入 - FarmingNameMaintenanceDO ingNameMaintenance = BeanUtils.toBean(createReqVO, FarmingNameMaintenanceDO.class); - ingNameMaintenanceMapper.insert(ingNameMaintenance); + FarmingNameMaintenanceDO farmingNameMaintenance = BeanUtils.toBean(createReqVO, FarmingNameMaintenanceDO.class); + farmingNameMaintenanceMapper.insert(farmingNameMaintenance); // 返回 - return ingNameMaintenance.getId(); + return farmingNameMaintenance.getId(); } @Override - public void updateingNameMaintenance(FarmingNameMaintenanceSaveReqVO updateReqVO) { + public void updateFarmingNameMaintenance(FarmingNameMaintenanceSaveReqVO updateReqVO) { // 校验存在 - validateingNameMaintenanceExists(updateReqVO.getId()); + validateFarmingNameMaintenanceExists(updateReqVO.getId()); // 更新 FarmingNameMaintenanceDO updateObj = BeanUtils.toBean(updateReqVO, FarmingNameMaintenanceDO.class); - ingNameMaintenanceMapper.updateById(updateObj); + farmingNameMaintenanceMapper.updateById(updateObj); } @Override - public void deleteingNameMaintenance(String id) { + public void deleteFarmingNameMaintenance(String id) { // 校验存在 - validateingNameMaintenanceExists(id); + validateFarmingNameMaintenanceExists(id); // 删除 - ingNameMaintenanceMapper.deleteById(id); + farmingNameMaintenanceMapper.deleteById(id); } @Override - public void deleteingNameMaintenanceListByIds(List ids) { + public void deleteFarmingNameMaintenanceListByIds(List ids) { // 删除 - ingNameMaintenanceMapper.deleteByIds(ids); - } + farmingNameMaintenanceMapper.deleteByIds(ids); + } - private void validateingNameMaintenanceExists(String id) { - if (ingNameMaintenanceMapper.selectById(id) == null) { - throw exception(ING_NAME_MAINTENANCE_NOT_EXISTS); + private void validateFarmingNameMaintenanceExists(String id) { + if (farmingNameMaintenanceMapper.selectById(id) == null) { + throw exception(FARMING_NAME_MAINTENANCE_NOT_EXISTS); } } @Override - public FarmingNameMaintenanceDO getingNameMaintenance(String id) { - return ingNameMaintenanceMapper.selectById(id); + public FarmingNameMaintenanceDO getFarmingNameMaintenance(String id) { + return farmingNameMaintenanceMapper.selectById(id); } @Override - public PageResult getingNameMaintenancePage(FarmingNameMaintenancePageReqVO pageReqVO) { - return ingNameMaintenanceMapper.selectPage(pageReqVO); + public PageResult getFarmingNameMaintenancePage(FarmingNameMaintenancePageReqVO pageReqVO) { + return farmingNameMaintenanceMapper.selectPage(pageReqVO); } } \ No newline at end of file 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 107d0bc2..dadd3f84 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 @@ -20,28 +20,28 @@ public interface FarmingRecordService { * @param createReqVO 创建信息 * @return 编号 */ - String createingRecord(@Valid FarmingRecordSaveReqVO createReqVO); + String createFarmingRecord(@Valid FarmingRecordSaveReqVO createReqVO); /** * 更新种植中心-农事基地-农事记录 * * @param updateReqVO 更新信息 */ - void updateingRecord(@Valid FarmingRecordSaveReqVO updateReqVO); + void updateFarmingRecord(@Valid FarmingRecordSaveReqVO updateReqVO); /** * 删除种植中心-农事基地-农事记录 * * @param id 编号 */ - void deleteingRecord(String id); + void deleteFarmingRecord(String id); /** * 批量删除种植中心-农事基地-农事记录 * * @param ids 编号 */ - void deleteingRecordListByIds(List ids); + void deleteFarmingRecordListByIds(List ids); /** * 获得种植中心-农事基地-农事记录 @@ -49,7 +49,7 @@ public interface FarmingRecordService { * @param id 编号 * @return 种植中心-农事基地-农事记录 */ - FarmingRecordDO getingRecord(String id); + FarmingRecordDO getFarmingRecord(String id); /** * 获得种植中心-农事基地-农事记录分页 @@ -57,6 +57,6 @@ public interface FarmingRecordService { * @param pageReqVO 分页查询 * @return 种植中心-农事基地-农事记录分页 */ - PageResult getingRecordPage(FarmingRecordPageReqVO pageReqVO); + PageResult getFarmingRecordPage(FarmingRecordPageReqVO pageReqVO); } \ No newline at end of file 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 feaf8e05..f9da330a 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 @@ -1,24 +1,19 @@ package cn.iocoder.yudao.module.farm.service.farmingrecord; -import cn.hutool.core.collection.CollUtil; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.*; -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 cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +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; import cn.iocoder.yudao.module.farm.dal.mysql.farmingrecord.FarmingRecordMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +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.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; -import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FARMING_RECORD_NOT_EXISTS; /** * 种植中心-农事基地-农事记录 Service 实现类 @@ -30,56 +25,56 @@ import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; public class FarmingRecordServiceImpl implements FarmingRecordService { @Resource - private FarmingRecordMapper ingRecordMapper; + private FarmingRecordMapper farmingRecordMapper; @Override - public String createingRecord(FarmingRecordSaveReqVO createReqVO) { + public String createFarmingRecord(FarmingRecordSaveReqVO createReqVO) { // 插入 - FarmingRecordDO ingRecord = BeanUtils.toBean(createReqVO, FarmingRecordDO.class); - ingRecordMapper.insert(ingRecord); + FarmingRecordDO farmingRecord = BeanUtils.toBean(createReqVO, FarmingRecordDO.class); + farmingRecordMapper.insert(farmingRecord); // 返回 - return ingRecord.getId(); + return farmingRecord.getId(); } @Override - public void updateingRecord(FarmingRecordSaveReqVO updateReqVO) { + public void updateFarmingRecord(FarmingRecordSaveReqVO updateReqVO) { // 校验存在 - validateingRecordExists(updateReqVO.getId()); + validateFarmingRecordExists(updateReqVO.getId()); // 更新 FarmingRecordDO updateObj = BeanUtils.toBean(updateReqVO, FarmingRecordDO.class); - ingRecordMapper.updateById(updateObj); + farmingRecordMapper.updateById(updateObj); } @Override - public void deleteingRecord(String id) { + public void deleteFarmingRecord(String id) { // 校验存在 - validateingRecordExists(id); + validateFarmingRecordExists(id); // 删除 - ingRecordMapper.deleteById(id); + farmingRecordMapper.deleteById(id); } @Override - public void deleteingRecordListByIds(List ids) { + public void deleteFarmingRecordListByIds(List ids) { // 删除 - ingRecordMapper.deleteByIds(ids); - } + farmingRecordMapper.deleteByIds(ids); + } - private void validateingRecordExists(String id) { - if (ingRecordMapper.selectById(id) == null) { - throw exception(ING_RECORD_NOT_EXISTS); + private void validateFarmingRecordExists(String id) { + if (farmingRecordMapper.selectById(id) == null) { + throw exception(FARMING_RECORD_NOT_EXISTS); } } @Override - public FarmingRecordDO getingRecord(String id) { - return ingRecordMapper.selectById(id); + public FarmingRecordDO getFarmingRecord(String id) { + return farmingRecordMapper.selectById(id); } @Override - public PageResult getingRecordPage(FarmingRecordPageReqVO pageReqVO) { - return ingRecordMapper.selectPage(pageReqVO); + public PageResult getFarmingRecordPage(FarmingRecordPageReqVO pageReqVO) { + return farmingRecordMapper.selectPage(pageReqVO); } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputService.java index a78c8674..75c1dae1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputService.java @@ -20,28 +20,28 @@ public interface FarmingRecordInputService { * @param createReqVO 创建信息 * @return 编号 */ - String createingRecordInput(@Valid FarmingRecordInputSaveReqVO createReqVO); + String createFarmingRecordInput(@Valid FarmingRecordInputSaveReqVO createReqVO); /** * 更新种植中心-农事基地-农事记录-投入品 * * @param updateReqVO 更新信息 */ - void updateingRecordInput(@Valid FarmingRecordInputSaveReqVO updateReqVO); + void updateFarmingRecordInput(@Valid FarmingRecordInputSaveReqVO updateReqVO); /** * 删除种植中心-农事基地-农事记录-投入品 * * @param id 编号 */ - void deleteingRecordInput(String id); + void deleteFarmingRecordInput(String id); /** * 批量删除种植中心-农事基地-农事记录-投入品 * * @param ids 编号 */ - void deleteingRecordInputListByIds(List ids); + void deleteFarmingRecordInputListByIds(List ids); /** * 获得种植中心-农事基地-农事记录-投入品 @@ -49,7 +49,7 @@ public interface FarmingRecordInputService { * @param id 编号 * @return 种植中心-农事基地-农事记录-投入品 */ - FarmingRecordInputDO getingRecordInput(String id); + FarmingRecordInputDO getFarmingRecordInput(String id); /** * 获得种植中心-农事基地-农事记录-投入品分页 @@ -57,6 +57,6 @@ public interface FarmingRecordInputService { * @param pageReqVO 分页查询 * @return 种植中心-农事基地-农事记录-投入品分页 */ - PageResult getingRecordInputPage(FarmingRecordInputPageReqVO pageReqVO); + PageResult getFarmingRecordInputPage(FarmingRecordInputPageReqVO pageReqVO); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java index f6abee79..88ca7e1e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java @@ -30,56 +30,56 @@ import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; public class FarmingRecordInputServiceImpl implements FarmingRecordInputService { @Resource - private FarmingRecordInputMapper ingRecordInputMapper; + private FarmingRecordInputMapper farmingRecordInputMapper; @Override - public String createingRecordInput(FarmingRecordInputSaveReqVO createReqVO) { + public String createFarmingRecordInput(FarmingRecordInputSaveReqVO createReqVO) { // 插入 - FarmingRecordInputDO ingRecordInput = BeanUtils.toBean(createReqVO, FarmingRecordInputDO.class); - ingRecordInputMapper.insert(ingRecordInput); + FarmingRecordInputDO farmingRecordInput = BeanUtils.toBean(createReqVO, FarmingRecordInputDO.class); + farmingRecordInputMapper.insert(farmingRecordInput); // 返回 - return ingRecordInput.getId(); + return farmingRecordInput.getId(); } @Override - public void updateingRecordInput(FarmingRecordInputSaveReqVO updateReqVO) { + public void updateFarmingRecordInput(FarmingRecordInputSaveReqVO updateReqVO) { // 校验存在 - validateingRecordInputExists(updateReqVO.getId()); + validateFarmingRecordInputExists(updateReqVO.getId()); // 更新 FarmingRecordInputDO updateObj = BeanUtils.toBean(updateReqVO, FarmingRecordInputDO.class); - ingRecordInputMapper.updateById(updateObj); + farmingRecordInputMapper.updateById(updateObj); } @Override - public void deleteingRecordInput(String id) { + public void deleteFarmingRecordInput(String id) { // 校验存在 - validateingRecordInputExists(id); + validateFarmingRecordInputExists(id); // 删除 - ingRecordInputMapper.deleteById(id); + farmingRecordInputMapper.deleteById(id); } @Override - public void deleteingRecordInputListByIds(List ids) { + public void deleteFarmingRecordInputListByIds(List ids) { // 删除 - ingRecordInputMapper.deleteByIds(ids); + farmingRecordInputMapper.deleteByIds(ids); } - private void validateingRecordInputExists(String id) { - if (ingRecordInputMapper.selectById(id) == null) { - throw exception(ING_RECORD_INPUT_NOT_EXISTS); + private void validateFarmingRecordInputExists(String id) { + if (farmingRecordInputMapper.selectById(id) == null) { + throw exception(FARMING_RECORD_INPUT_NOT_EXISTS); } } @Override - public FarmingRecordInputDO getingRecordInput(String id) { - return ingRecordInputMapper.selectById(id); + public FarmingRecordInputDO getFarmingRecordInput(String id) { + return farmingRecordInputMapper.selectById(id); } @Override - public PageResult getingRecordInputPage(FarmingRecordInputPageReqVO pageReqVO) { - return ingRecordInputMapper.selectPage(pageReqVO); + public PageResult getFarmingRecordInputPage(FarmingRecordInputPageReqVO pageReqVO) { + return farmingRecordInputMapper.selectPage(pageReqVO); } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceService.java index 05eb2d06..6868d156 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceService.java @@ -20,28 +20,28 @@ public interface FarmingTypeMaintenanceService { * @param createReqVO 创建信息 * @return 编号 */ - String createingTypeMaintenance(@Valid FarmingTypeMaintenanceSaveReqVO createReqVO); + String createFarmingTypeMaintenance(@Valid FarmingTypeMaintenanceSaveReqVO createReqVO); /** * 更新农事类型维护 * * @param updateReqVO 更新信息 */ - void updateingTypeMaintenance(@Valid FarmingTypeMaintenanceSaveReqVO updateReqVO); + void updateFarmingTypeMaintenance(@Valid FarmingTypeMaintenanceSaveReqVO updateReqVO); /** * 删除农事类型维护 * * @param id 编号 */ - void deleteingTypeMaintenance(String id); + void deleteFarmingTypeMaintenance(String id); /** * 批量删除农事类型维护 * * @param ids 编号 */ - void deleteingTypeMaintenanceListByIds(List ids); + void deleteFarmingTypeMaintenanceListByIds(List ids); /** * 获得农事类型维护 @@ -49,7 +49,7 @@ public interface FarmingTypeMaintenanceService { * @param id 编号 * @return 农事类型维护 */ - FarmingTypeMaintenanceDO getingTypeMaintenance(String id); + FarmingTypeMaintenanceDO getFarmingTypeMaintenance(String id); /** * 获得农事类型维护分页 @@ -57,6 +57,6 @@ public interface FarmingTypeMaintenanceService { * @param pageReqVO 分页查询 * @return 农事类型维护分页 */ - PageResult getingTypeMaintenancePage(FarmingTypeMaintenancePageReqVO pageReqVO); + PageResult getFarmingTypeMaintenancePage(FarmingTypeMaintenancePageReqVO pageReqVO); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java index f716ef95..d106593d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java @@ -30,56 +30,56 @@ import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; public class FarmingTypeMaintenanceServiceImpl implements FarmingTypeMaintenanceService { @Resource - private FarmingTypeMaintenanceMapper ingTypeMaintenanceMapper; + private FarmingTypeMaintenanceMapper farmingTypeMaintenanceMapper; @Override - public String createingTypeMaintenance(FarmingTypeMaintenanceSaveReqVO createReqVO) { + public String createFarmingTypeMaintenance(FarmingTypeMaintenanceSaveReqVO createReqVO) { // 插入 - FarmingTypeMaintenanceDO ingTypeMaintenance = BeanUtils.toBean(createReqVO, FarmingTypeMaintenanceDO.class); - ingTypeMaintenanceMapper.insert(ingTypeMaintenance); + FarmingTypeMaintenanceDO farmingTypeMaintenance = BeanUtils.toBean(createReqVO, FarmingTypeMaintenanceDO.class); + farmingTypeMaintenanceMapper.insert(farmingTypeMaintenance); // 返回 - return ingTypeMaintenance.getId(); + return farmingTypeMaintenance.getId(); } @Override - public void updateingTypeMaintenance(FarmingTypeMaintenanceSaveReqVO updateReqVO) { + public void updateFarmingTypeMaintenance(FarmingTypeMaintenanceSaveReqVO updateReqVO) { // 校验存在 - validateingTypeMaintenanceExists(updateReqVO.getId()); + validateFarmingTypeMaintenanceExists(updateReqVO.getId()); // 更新 FarmingTypeMaintenanceDO updateObj = BeanUtils.toBean(updateReqVO, FarmingTypeMaintenanceDO.class); - ingTypeMaintenanceMapper.updateById(updateObj); + farmingTypeMaintenanceMapper.updateById(updateObj); } @Override - public void deleteingTypeMaintenance(String id) { + public void deleteFarmingTypeMaintenance(String id) { // 校验存在 - validateingTypeMaintenanceExists(id); + validateFarmingTypeMaintenanceExists(id); // 删除 - ingTypeMaintenanceMapper.deleteById(id); + farmingTypeMaintenanceMapper.deleteById(id); } @Override - public void deleteingTypeMaintenanceListByIds(List ids) { + public void deleteFarmingTypeMaintenanceListByIds(List ids) { // 删除 - ingTypeMaintenanceMapper.deleteByIds(ids); + farmingTypeMaintenanceMapper.deleteByIds(ids); } - private void validateingTypeMaintenanceExists(String id) { - if (ingTypeMaintenanceMapper.selectById(id) == null) { - throw exception(ING_TYPE_MAINTENANCE_NOT_EXISTS); + private void validateFarmingTypeMaintenanceExists(String id) { + if (farmingTypeMaintenanceMapper.selectById(id) == null) { + throw exception(FARMING_TYPE_MAINTENANCE_NOT_EXISTS); } } @Override - public FarmingTypeMaintenanceDO getingTypeMaintenance(String id) { - return ingTypeMaintenanceMapper.selectById(id); + public FarmingTypeMaintenanceDO getFarmingTypeMaintenance(String id) { + return farmingTypeMaintenanceMapper.selectById(id); } @Override - public PageResult getingTypeMaintenancePage(FarmingTypeMaintenancePageReqVO pageReqVO) { - return ingTypeMaintenanceMapper.selectPage(pageReqVO); + public PageResult getFarmingTypeMaintenancePage(FarmingTypeMaintenancePageReqVO pageReqVO) { + return farmingTypeMaintenanceMapper.selectPage(pageReqVO); } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java index 3a3b72d3..4b156575 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java @@ -1,11 +1,12 @@ package cn.iocoder.yudao.module.farm.service.specieslibrary; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.*; -import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +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; +import jakarta.validation.Valid; + +import java.util.List; /** * 物种库维护 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java index 43a46572..5c1e6144 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java @@ -1,24 +1,19 @@ package cn.iocoder.yudao.module.farm.service.specieslibrary; -import cn.hutool.core.collection.CollUtil; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.*; -import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; 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.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; import cn.iocoder.yudao.module.farm.dal.mysql.specieslibrary.SpeciesLibraryMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +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.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; -import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.SPECIES_LIBRARY_NOT_EXISTS; /** * 物种库维护 Service 实现类 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataService.java index 10a58cb4..c03bc8b8 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataService.java @@ -1,11 +1,12 @@ package cn.iocoder.yudao.module.farm.service.varietydata; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.*; -import cn.iocoder.yudao.module.farm.dal.dataobject.varietydata.VarietyDataDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +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; +import jakarta.validation.Valid; + +import java.util.List; /** * 品种数据 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java index c9b7b8f2..4d8b95e5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java @@ -1,24 +1,19 @@ package cn.iocoder.yudao.module.farm.service.varietydata; -import cn.hutool.core.collection.CollUtil; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.*; -import cn.iocoder.yudao.module.farm.dal.dataobject.varietydata.VarietyDataDO; 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.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; import cn.iocoder.yudao.module.farm.dal.mysql.varietydata.VarietyDataMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +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.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; -import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.VARIETY_DATA_NOT_EXISTS; /** * 品种数据 Service 实现类 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryService.java index 168c8803..85003151 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryService.java @@ -1,11 +1,12 @@ package cn.iocoder.yudao.module.farm.service.weatherdisasterlibrary; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo.*; -import cn.iocoder.yudao.module.farm.dal.dataobject.weatherdisasterlibrary.WeatherDisasterLibraryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +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; +import jakarta.validation.Valid; + +import java.util.List; /** * 气象灾害库维护 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryServiceImpl.java index 16c890eb..70d1e965 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryServiceImpl.java @@ -1,24 +1,19 @@ package cn.iocoder.yudao.module.farm.service.weatherdisasterlibrary; -import cn.hutool.core.collection.CollUtil; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo.*; -import cn.iocoder.yudao.module.farm.dal.dataobject.weatherdisasterlibrary.WeatherDisasterLibraryDO; 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.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; import cn.iocoder.yudao.module.farm.dal.mysql.weatherdisasterlibrary.WeatherDisasterLibraryMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +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.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; -import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.WEATHER_DISASTER_LIBRARY_NOT_EXISTS; /** * 气象灾害库维护 Service 实现类