Commit b150b683 authored by 周昊's avatar 周昊
Browse files

1、开发接口获取固有风险详情

parent edf09961

censoft-rongtong/pom.xml

+7 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,13 @@ 
            <artifactId>lombok</artifactId>

            <artifactId>lombok</artifactId>

        </dependency>

        </dependency>





        <!-- hutool 常用工具类包 -->

        <dependency>

            <groupId>cn.hutool</groupId>

            <artifactId>hutool-all</artifactId>

            <version>5.8.5</version>

        </dependency>



    </dependencies>

    </dependencies>





</project>
 
</project>

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

+12 −4
Original line number Original line Diff line number Diff line 
package com.censoft.censoftrongtong.controller;

package com.censoft.censoftrongtong.controller;





import com.censoft.censoftrongtong.domain.*;

import com.censoft.censoftrongtong.domain.*;

import com.censoft.censoftrongtong.domain.dto.RiskInherentListSaveDto;

import com.censoft.censoftrongtong.domain.dto.*;

import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;

import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;

import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;

import com.censoft.censoftrongtong.enums.RiskPlanStatusType;

import com.censoft.censoftrongtong.enums.RiskPlanStatusType;

import com.censoft.censoftrongtong.service.*;

import com.censoft.censoftrongtong.service.*;

import com.ruoyi.common.config.RuoYiConfig;

import com.ruoyi.common.config.RuoYiConfig;
@@ -250,4 +247,15 @@ public class RiskPlanAppController extends BaseController { 




        return R.ok(riskPlanInherentListService.saveRiskInherentListSaveDto(saveDto));

        return R.ok(riskPlanInherentListService.saveRiskInherentListSaveDto(saveDto));

    }

    }



    /**

     * 获取固有风险详情

     *

     * @param inherentId     固有风险id

     * @real_return {@link R<RiskPlanAppInherentListDetailsDto>}

     */

    @GetMapping("/inherent/details/{inherentId}")

    public R<RiskPlanAppInherentListDetailsDto> getRiskPlanAppInherentListDetailsDtoByInherentId(@PathVariable("inherentId") Long inherentId) {

        return R.ok(riskPlanInherentListService.getRiskPlanAppInherentListDetailsDtoByInherentId(inherentId));

    }

}
 
}

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

0 → 100644
+99 −0
Original line number Original line Diff line number Diff line 
package com.censoft.censoftrongtong.domain.dto;





import com.ruoyi.system.domain.SysUploadFile;

import lombok.Data;



import java.util.List;



/**

 * @author 周昊

 * @desc ...

 * @date 2023-06-27 14:45:45

 */

@Data

public class RiskPlanAppInherentListDetailsDto {

    /** id */

    private Long id;



    /** 评估人id */

    private Long userId;



    /** 评估人名称 */

    private String userName;



    /** 项目id */

    private Long projectId;



    /** 项目名称 */

    private String projectName;



    /** 楼栋ids */

    private String buildingId;



    /** 楼栋名称 */

    private String buildingName;



    /** 楼层id */

    private Long floorId;



    /** 楼层名称 */

    private String floorName;



    /** 房间id */

    private Long roomId;



    /** 房间名称 */

    private String roomName;



    /** 风险源名称 */

    private String name;



    /** 风险因素 */

    private String factor;



    /** 事故类型 */

    private String type;



    /** 风险等级 */

    private String level;



    /** 存在部位 */

    private String presenceLocation;



    /** 风险源照片id */

    private String pictureFileIds;



    /** 风险源照片 */

    private List<SysUploadFile> pictureFile;



    /** 工程技术措施 */

    private String measuresProject;



    /** 工程技术措施附件 */

    private String measuresProjectFileIds;



    /** 工程技术措施附件 */

    private List<SysUploadFile> measuresProjectFile;



    /** 管理措施 */

    private String measuresAdministration;



    /** 管理措施附件 */

    private String measuresAdministrationFileIds;



    /** 管理措施附件 */

    private List<SysUploadFile> measuresAdministrationFile;



    /** 应急处置措施 */

    private String measuresEmergency;



    /** 应急处置措施附件 */

    private String measuresEmergencyFileIds;



    /** 应急处置措施附件 */

    private List<SysUploadFile> measuresEmergencyFile;



    /** 参考依据 */

    private String referenceBasis;

}

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

+3 −0
Original line number Original line Diff line number Diff line 
package com.censoft.censoftrongtong.mapper;

package com.censoft.censoftrongtong.mapper;





import com.censoft.censoftrongtong.domain.RiskPlanInherentList;

import com.censoft.censoftrongtong.domain.RiskPlanInherentList;

import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;

import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;

import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;

import org.apache.ibatis.annotations.Param;

import org.apache.ibatis.annotations.Param;
@@ -63,4 +64,6 @@ public interface RiskPlanInherentListMapper 
    public int deleteRiskPlanInherentListByIds(Long[] ids);

    public int deleteRiskPlanInherentListByIds(Long[] ids);





    List<RiskPlanAppInherentListDto> getInherentListByPlanId(@Param("planId") Long planId, @Param("buildingId") Long buildingId, @Param("floorId") Long floorId, @Param("roomId") Long roomId);

    List<RiskPlanAppInherentListDto> getInherentListByPlanId(@Param("planId") Long planId, @Param("buildingId") Long buildingId, @Param("floorId") Long floorId, @Param("roomId") Long roomId);



    RiskPlanAppInherentListDetailsDto getRiskPlanAppInherentListDetailsDtoByInherentId(@Param("inherentId") Long inherentId);

}
 
}

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ package com.censoft.censoftrongtong.service; 




import com.censoft.censoftrongtong.domain.RiskPlanInherentList;

import com.censoft.censoftrongtong.domain.RiskPlanInherentList;

import com.censoft.censoftrongtong.domain.dto.RiskInherentListSaveDto;

import com.censoft.censoftrongtong.domain.dto.RiskInherentListSaveDto;

import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;

import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;

import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;





import java.util.List;

import java.util.List;
@@ -65,4 +66,6 @@ public interface IRiskPlanInherentListService 
    List<RiskPlanAppInherentListDto> getInherentListByPlanId(Long planId, Long buildingId, Long floorId, Long roomId);

    List<RiskPlanAppInherentListDto> getInherentListByPlanId(Long planId, Long buildingId, Long floorId, Long roomId);





    Integer saveRiskInherentListSaveDto(RiskInherentListSaveDto saveDto);

    Integer saveRiskInherentListSaveDto(RiskInherentListSaveDto saveDto);



    RiskPlanAppInherentListDetailsDto getRiskPlanAppInherentListDetailsDtoByInherentId(Long inherentId);

}
 
}