From 63d972e3bc5e50e66bc4960a5a521c92d6e3cb73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com> Date: Fri, 22 Aug 2025 15:08:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?farm=E6=A8=A1=E5=9D=97-=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=80=9A=E8=BF=87=E7=A7=9F=E5=8F=B7=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FoundationInfoController.java | 63 +++++++------------ .../foundationinfo/FoundationInfoMapper.java | 1 + .../foundationinfo/FoundationInfoService.java | 14 ++--- .../FoundationInfoServiceImpl.java | 39 +++++------- .../foundationinfo/FoundationInfoMapper.xml | 7 +++ 5 files changed, 54 insertions(+), 70 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/FoundationInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/FoundationInfoController.java index 548b5274..d502d2f0 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/FoundationInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/FoundationInfoController.java @@ -1,37 +1,30 @@ package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoRespVO; import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.validation.Valid; -import jakarta.validation.Valid; -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.foundationinfo.FoundationInfoDO; import cn.iocoder.yudao.module.farm.service.foundationinfo.FoundationInfoService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 基础信息") @RestController @@ -44,14 +37,12 @@ public class FoundationInfoController { @PostMapping("/create") @Operation(summary = "创建基础信息") - public CommonResult createFoundationInfo(@Valid @RequestBody FoundationInfoSaveReqVO createReqVO) { return success(foundationInfoService.createFoundationInfo(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新基础信息") - public CommonResult updateFoundationInfo(@Valid @RequestBody FoundationInfoSaveReqVO updateReqVO) { foundationInfoService.updateFoundationInfo(updateReqVO); return success(true); @@ -60,7 +51,6 @@ public class FoundationInfoController { @DeleteMapping("/delete") @Operation(summary = "删除基础信息") @Parameter(name = "id", description = "编号", required = true) - public CommonResult deleteFoundationInfo(@RequestParam("id") String id) { foundationInfoService.deleteFoundationInfo(id); return success(true); @@ -69,7 +59,6 @@ public class FoundationInfoController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除基础信息") - public CommonResult deleteFoundationInfoList(@RequestParam("ids") List ids) { foundationInfoService.deleteFoundationInfoListByIds(ids); return success(true); @@ -77,16 +66,13 @@ public class FoundationInfoController { @GetMapping("/get") @Operation(summary = "获得基础信息") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - - public CommonResult getFoundationInfo(@RequestParam("id") String id) { - FoundationInfoDO foundationInfo = foundationInfoService.getFoundationInfo(id); + public CommonResult getFoundationInfo() { + FoundationInfoDO foundationInfo = foundationInfoService.getFoundationInfo(); return success(BeanUtils.toBean(foundationInfo, FoundationInfoRespVO.class)); } @GetMapping("/page") @Operation(summary = "获得基础信息分页") - public CommonResult> getFoundationInfoPage(@Valid FoundationInfoPageReqVO pageReqVO) { PageResult pageResult = foundationInfoService.getFoundationInfoPage(pageReqVO); return success(BeanUtils.toBean(pageResult, FoundationInfoRespVO.class)); @@ -94,15 +80,14 @@ public class FoundationInfoController { @GetMapping("/export-excel") @Operation(summary = "导出基础信息 Excel") - @ApiAccessLog(operateType = EXPORT) public void exportFoundationInfoExcel(@Valid FoundationInfoPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = foundationInfoService.getFoundationInfoPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "基础信息.xls", "数据", FoundationInfoRespVO.class, - BeanUtils.toBean(list, FoundationInfoRespVO.class)); + BeanUtils.toBean(list, FoundationInfoRespVO.class)); } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java index 4e688e40..4c5c2609 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java @@ -31,4 +31,5 @@ public interface FoundationInfoMapper extends BaseMapperX { .orderByDesc(FoundationInfoDO::getCreateTime)); } + FoundationInfoDO selectByTenantId(Long tenantId); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoService.java index de3f7ef0..3f5a63a1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.farm.service.foundationinfo; +import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import jakarta.validation.Valid; import java.util.List; @@ -39,19 +38,18 @@ public interface FoundationInfoService { void deleteFoundationInfo(String id); /** - * 批量删除基础信息 - * - * @param ids 编号 - */ + * 批量删除基础信息 + * + * @param ids 编号 + */ void deleteFoundationInfoListByIds(List ids); /** * 获得基础信息 * - * @param id 编号 * @return 基础信息 */ - FoundationInfoDO getFoundationInfo(String id); + FoundationInfoDO getFoundationInfo(); /** * 获得基础信息分页 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java index 1c1c458c..86617c7e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java @@ -1,28 +1,20 @@ package cn.iocoder.yudao.module.farm.service.foundationinfo; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; -import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoSaveReqVO; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; - +import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoSaveReqVO; +import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO; import cn.iocoder.yudao.module.farm.dal.mysql.foundationinfo.FoundationInfoMapper; -import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil; +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.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FOUNDATION_INFO_NOT_EXISTS; @@ -45,10 +37,10 @@ public class FoundationInfoServiceImpl implements FoundationInfoService { FoundationInfoDO foundationInfo = BeanUtils.toBean(createReqVO, FoundationInfoDO.class); foundationInfo.setId(IdUtil.fastUUID()); foundationInfo.setTenantId(String.valueOf(user.getTenantId())); - + // 处理图片集合转换 handleImageConversion(foundationInfo, createReqVO); - + foundationInfoMapper.insert(foundationInfo); // 返回 @@ -61,10 +53,10 @@ public class FoundationInfoServiceImpl implements FoundationInfoService { validateFoundationInfoExists(updateReqVO.getId()); // 更新 FoundationInfoDO updateObj = BeanUtils.toBean(updateReqVO, FoundationInfoDO.class); - + // 处理图片集合转换 handleImageConversion(updateObj, updateReqVO); - + foundationInfoMapper.updateById(updateObj); } @@ -77,20 +69,21 @@ public class FoundationInfoServiceImpl implements FoundationInfoService { } @Override - public void deleteFoundationInfoListByIds(List ids) { + public void deleteFoundationInfoListByIds(List ids) { // 删除 foundationInfoMapper.deleteByIds(ids); - } + } -private void validateFoundationInfoExists(String id) { + private void validateFoundationInfoExists(String id) { if (foundationInfoMapper.selectById(id) == null) { throw exception(FOUNDATION_INFO_NOT_EXISTS); } } @Override - public FoundationInfoDO getFoundationInfo(String id) { - FoundationInfoDO foundationInfo = foundationInfoMapper.selectById(id); + public FoundationInfoDO getFoundationInfo() { + LoginUser user = getLoginUser(); + FoundationInfoDO foundationInfo = foundationInfoMapper.selectByTenantId(user.getTenantId()); if (foundationInfo != null) { // 触发图片集合转换，确保返回的DO对象包含转换后的图片集合 foundationInfo.getImageList(); diff --git a/yudao-module-farm/src/main/resources/mapper/foundationinfo/FoundationInfoMapper.xml b/yudao-module-farm/src/main/resources/mapper/foundationinfo/FoundationInfoMapper.xml index 7dfcc20e..906734d5 100644 --- a/yudao-module-farm/src/main/resources/mapper/foundationinfo/FoundationInfoMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/foundationinfo/FoundationInfoMapper.xml @@ -9,4 +9,11 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> + \ No newline at end of file From 7ec388151cd9d25fd79da75ed758139060bd5f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com> Date: Fri, 22 Aug 2025 15:15:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?farm=E6=A8=A1=E5=9D=97-=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=80=9A=E8=BF=87=E7=A7=9F=E5=8F=B7=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a147ffc8..0394923f 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 @@ -108,7 +108,7 @@ public class BaseInfoServiceImpl implements BaseInfoService { for (Map.Entry entry : baseNameMap.entrySet()) { String key = entry.getKey(); - BaseNameRespVO obj = new BaseNameRespVO(key, entry.getValue()); + BaseNameRespVO obj = new BaseNameRespVO(key, entry.getValue()); List childList = new ArrayList<>(); for (PlotInfoDO aDo : plotInfoDOS) {