farm模块-基础信息通过租号获取

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<String> createFoundationInfo(@Valid @RequestBody FoundationInfoSaveReqVO createReqVO) {
         return success(foundationInfoService.createFoundationInfo(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新基础信息")
-    
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteFoundationInfoList(@RequestParam("ids") List<String> 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<FoundationInfoRespVO> getFoundationInfo() {
-    
+        FoundationInfoDO foundationInfo = foundationInfoService.getFoundationInfo();
-    public CommonResult<FoundationInfoRespVO> getFoundationInfo(@RequestParam("id") String id) {
-        FoundationInfoDO foundationInfo = foundationInfoService.getFoundationInfo(id);
         return success(BeanUtils.toBean(foundationInfo, FoundationInfoRespVO.class));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得基础信息分页")
-    
     public CommonResult<PageResult<FoundationInfoRespVO>> getFoundationInfoPage(@Valid FoundationInfoPageReqVO pageReqVO) {
         PageResult<FoundationInfoDO> pageResult = foundationInfoService.getFoundationInfoPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, FoundationInfoRespVO.class));
@@ -94,7 +80,6 @@ public class FoundationInfoController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出基础信息 Excel")
-    
     @ApiAccessLog(operateType = EXPORT)
     public void exportFoundationInfoExcel(@Valid FoundationInfoPageReqVO pageReqVO,
                                           HttpServletResponse response) throws IOException {

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<FoundationInfoDO> {
                 .orderByDesc(FoundationInfoDO::getCreateTime));
     }
 
+    FoundationInfoDO selectByTenantId(Long tenantId);
 }

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;
@@ -48,10 +47,9 @@ public interface FoundationInfoService {
     /**
      * 获得基础信息
      *
-     * @param id 编号
      * @return 基础信息
      */
-    FoundationInfoDO getFoundationInfo(String id);
+    FoundationInfoDO getFoundationInfo();
 
     /**
      * 获得基础信息分页

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;
 
@@ -89,8 +81,9 @@ private void validateFoundationInfoExists(String id) {
     }
 
     @Override
-    public FoundationInfoDO getFoundationInfo(String id) {
+    public FoundationInfoDO getFoundationInfo() {
-        FoundationInfoDO foundationInfo = foundationInfoMapper.selectById(id);
+        LoginUser user = getLoginUser();
+        FoundationInfoDO foundationInfo = foundationInfoMapper.selectByTenantId(user.getTenantId());
         if (foundationInfo != null) {
             // 触发图片集合转换，确保返回的DO对象包含转换后的图片集合
             foundationInfo.getImageList();

yudao-module-farm/src/main/resources/mapper/foundationinfo/FoundationInfoMapper.xml

@@ -9,4 +9,11 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="selectByTenantId" parameterType="Long"
+            resultType="cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO">
+        select *
+        from farm_foundation_info
+        where tenant_id = #{tenantId}
+          and deleted = 0
+    </select>
 </mapper>