1、开发接口获取计划下的楼宇

censoft-rongtong/pom.xml

@@ -29,6 +29,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-framework</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 
     </dependencies>
 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

@@ -60,7 +60,7 @@ public class RiskPlanAppController extends BaseController {
      * @real_return {@link R<List<LedgerBuilding>>}
      */
     @GetMapping("/building/list/{projectId}")
-    public R<List<LedgerBuilding>> getBuildingListByProjectId(@PathVariable Long projectId){
+    public R<List<LedgerBuilding>> getBuildingListByProjectId(@PathVariable("projectId") Long projectId){
         return R.ok(ledgerBuildingService.getBuildingListByProjectId(projectId));
     }
 
@@ -71,7 +71,7 @@ public class RiskPlanAppController extends BaseController {
      * @real_return {@link R<List<SysUser>>}
      */
     @GetMapping("/user/list/{projectId}")
-    public R<List<SysUser>> getUserListByProjectId(@PathVariable Long projectId){
+    public R<List<SysUser>> getUserListByProjectId(@PathVariable("projectId") Long projectId){
         return R.ok(ledgerProjectService.getUserListByProjectId(projectId));
     }
 
@@ -126,4 +126,15 @@ public class RiskPlanAppController extends BaseController {
     public R<RiskPlanAppDetailsDto> getRiskPlanAppDetailsDtoByPlanId(@PathVariable("planId") Long planId){
         return R.ok(riskPlanService.getRiskPlanAppDetailsDtoByPlanId(planId));
     }
+
+    /**
+     * 获取计划下的楼宇
+     *
+     * @param planId 项目id
+     * @real_return {@link R<List<LedgerBuilding>>}
+     */
+    @GetMapping("/plan/building/list/{planId}")
+    public R<List<LedgerBuilding>> getBuildingListByPlanId(@PathVariable("planId") Long planId){
+        return R.ok(riskPlanService.getBuildingListByPlanId(planId));
+    }
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppListDto.java

 package com.censoft.censoftrongtong.domain.dto;
 
+
 import lombok.Data;
 
 import java.util.Date;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerBuildingMapper.java

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -59,4 +60,6 @@ public interface LedgerBuildingMapper
      * @return 结果
      */
     public int deleteLedgerBuildingByIds(Long[] ids);
+
+    List<LedgerBuilding> getBuildingListByIds(@Param("ids") List<String> ids);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerBuildingService.java

@@ -61,4 +61,6 @@ public interface ILedgerBuildingService
     public int deleteLedgerBuildingById(Long id);
 
     List<LedgerBuilding> getBuildingListByProjectId(Long projectId);
+
+    List<LedgerBuilding> getBuildingListByIds(List<String> ids);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanService.java

 package com.censoft.censoftrongtong.service;
 
+import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
@@ -68,4 +69,6 @@ public interface IRiskPlanService
     List<RiskPlanAppListDto> getRiskPlanAppListDtoList(List<RiskPlanStatusType> statusList, Long createUserId, Long leaderUserId);
 
     RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(Long planId);
+
+    List<LedgerBuilding> getBuildingListByPlanId(Long planId);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerBuildingServiceImpl.java

@@ -102,4 +102,9 @@ public class LedgerBuildingServiceImpl implements ILedgerBuildingService
         query.setStatus("0");
         return selectLedgerBuildingList(query);
     }
+
+    @Override
+    public List<LedgerBuilding> getBuildingListByIds(List<String> ids) {
+        return ledgerBuildingMapper.getBuildingListByIds(ids);
+    }
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 import com.censoft.censoftrongtong.mapper.RiskPlanMapper;
+import com.censoft.censoftrongtong.service.ILedgerBuildingService;
 import com.censoft.censoftrongtong.service.IRiskPlanService;
 import com.censoft.censoftrongtong.service.IRiskPlanTaskService;
 import com.ruoyi.common.utils.DateUtils;
@@ -35,6 +34,9 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
     @Resource
     private IRiskPlanTaskService riskPlanTaskService;
 
+    @Resource
+    private ILedgerBuildingService ledgerBuildingService;
+
     /**
      * 查询风险计划
      *
@@ -171,6 +173,12 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
         return dto;
     }
 
+    @Override
+    public List<LedgerBuilding> getBuildingListByPlanId(Long planId) {
+        RiskPlan riskPlan = selectRiskPlanById(planId);
+        return ledgerBuildingService.getBuildingListByIds(Arrays.asList(riskPlan.getBuildingIds().split(",")));
+    }
+
     private String getNo() {
         Random random = new Random();
         int randomNumber = random.nextInt(1000); // 生成0到999之间的随机数

censoft-rongtong/src/main/resources/mapper/system/LedgerBuildingMapper.xml

@@ -48,7 +48,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectLedgerBuildingVo"/>
         where id = #{id}
     </select>
-        
+    <select id="getBuildingListByIds"  resultMap="LedgerBuildingResult">
+        <include refid="selectLedgerBuildingVo"/>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
     <insert id="insertLedgerBuilding" parameterType="com.censoft.censoftrongtong.domain.LedgerBuilding" useGeneratedKeys="true" keyProperty="id">
         insert into ledger_building
         <trim prefix="(" suffix=")" suffixOverrides=",">