Commit ad34d78b authored by 周昊's avatar 周昊

1、开发接口根据固有风险id获取现有风险列表

2、开发接口添加现有风险
parent b150b683
......@@ -49,6 +49,9 @@ public class RiskPlanAppController extends BaseController {
@Resource
private IRiskPlanInherentListService riskPlanInherentListService;
@Resource
private IRiskPlanExistingListService riskPlanExistingListService;
@Resource
private ISysUploadFileService uploadFileService;
......@@ -186,7 +189,7 @@ public class RiskPlanAppController extends BaseController {
* @param buildingId 楼宇id
* @param floorId 楼层id
* @param roomId 房间id
* @real_return {@link R<List<LedgerRoom>>}
* @real_return {@link R<List<RiskPlanAppInherentListDto>>}
*/
@GetMapping("/inherent/list/{planId}/{buildingId}")
public R<List<RiskPlanAppInherentListDto>> getInherentListByPlanId(@PathVariable("planId") Long planId
......@@ -258,4 +261,71 @@ public class RiskPlanAppController extends BaseController {
public R<RiskPlanAppInherentListDetailsDto> getRiskPlanAppInherentListDetailsDtoByInherentId(@PathVariable("inherentId") Long inherentId) {
return R.ok(riskPlanInherentListService.getRiskPlanAppInherentListDetailsDtoByInherentId(inherentId));
}
/**
* 根据固有风险id获取现有风险列表
*
* @param inherentId 固有风险id
* @real_return {@link R<List<RiskPlanAppExistingListDto>>}
*/
@GetMapping("/existing/list/{inherentId}")
public R<List<RiskPlanAppExistingListDto>> getExistingListByInherentId(@PathVariable("inherentId") Long inherentId) {
return R.ok(riskPlanInherentListService.getExistingListByInherentId(inherentId));
}
/**
* 添加现有风险
*
* @param saveDto 现有风险表单
* @real_return {@link R<Integer>}
*/
@PostMapping("/existing")
public R<Integer> saveRiskExistingListSaveDto(RiskExistingListSaveDto saveDto
, @RequestParam(value = "pictureFile[]", required = false) MultipartFile[] pictureFile
, @RequestParam(value = "measuresProjectFile[]", required = false) MultipartFile[] measuresProjectFile
, @RequestParam(value = "measuresAdministrationFile[]", required = false) MultipartFile[] measuresAdministrationFile
, @RequestParam(value = "measuresEmergencyFile[]", required = false) MultipartFile[] measuresEmergencyFile) {
String userId = getUserId().toString();
//风险源照片
if (pictureFile != null) {
String pictureFileIds = Arrays.stream(pictureFile)
.filter(multipartFile -> !multipartFile.isEmpty())
.map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
.collect(Collectors.joining(","));
saveDto.setPictureFileIds(pictureFileIds);
}
//工程技术措施附件
if (measuresProjectFile != null) {
String measuresProjectFileIds = Arrays.stream(measuresProjectFile)
.filter(multipartFile -> !multipartFile.isEmpty())
.map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
.collect(Collectors.joining(","));
saveDto.setMeasuresProjectFileIds(measuresProjectFileIds);
}
//管理措施附件
if (measuresAdministrationFile != null) {
String measuresAdministrationFileIds = Arrays.stream(measuresAdministrationFile)
.filter(multipartFile -> !multipartFile.isEmpty())
.map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
.collect(Collectors.joining(","));
saveDto.setMeasuresAdministrationFileIds(measuresAdministrationFileIds);
}
//应急处置措施附件
if (measuresEmergencyFile != null) {
String measuresEmergencyFileIds = Arrays.stream(measuresEmergencyFile)
.filter(multipartFile -> !multipartFile.isEmpty())
.map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
.collect(Collectors.joining(","));
saveDto.setMeasuresEmergencyFileIds(measuresEmergencyFileIds);
}
return R.ok(riskPlanExistingListService.saveRiskExistingListSaveDto(saveDto));
}
}
package com.censoft.censoftrongtong.domain.dto;
import lombok.Data;
/**
* 固有风险清单库对象 risk_inherent_list
*
* @author ruoyi
* @date 2023-06-26
*/
@Data
public class RiskExistingListSaveDto {
/** id */
private Long id;
/** 评估人id */
private Long userId;
/** 房间id */
private Long roomId;
/** 计划id */
private Long planId;
/** 风险源名称 */
private String name;
/** 风险因素 */
private String factor;
/** 事故类型 */
private String type;
/** 风险等级 */
private String level;
/** 风险描述 */
private String describe;
/** 风险源照片id */
private String pictureFileIds;
/** 工程技术措施 */
private String measuresProject;
/** 工程技术措施附件 */
private String measuresProjectFileIds;
/** 管理措施 */
private String measuresAdministration;
/** 管理措施附件 */
private String measuresAdministrationFileIds;
/** 应急处置措施 */
private String measuresEmergency;
/** 应急处置措施附件 */
private String measuresEmergencyFileIds;
/** 参考依据 */
private String referenceBasis;
}
package com.censoft.censoftrongtong.domain.dto;
import lombok.Data;
import java.util.Date;
/**
* @author 周昊
* @desc ...
* @date 2023-06-27 14:45:45
*/
@Data
public class RiskPlanAppExistingListDto {
/** id */
private Long id;
/** 风险源名称 */
private String name;
/** 风险系数 */
private String coefficient;
/** 创建时间 */
private Date createTime;
/** 风险描述 */
private String describe;
/** 评估人id */
private Long userId;
/** 评估人名称 */
private String userName;
/** 评估人头像 */
private String avatar;
}
package com.censoft.censoftrongtong.mapper;
import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
import org.apache.ibatis.annotations.Param;
......@@ -66,4 +67,6 @@ public interface RiskPlanInherentListMapper
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);
List<RiskPlanAppExistingListDto> getExistingListByInherentId(@Param("inherentId") Long inherentId);
}
package com.censoft.censoftrongtong.service;
import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
import com.censoft.censoftrongtong.domain.dto.RiskExistingListSaveDto;
import java.util.List;
......@@ -59,4 +60,6 @@ public interface IRiskPlanExistingListService
* @return 结果
*/
public int deleteRiskPlanExistingListById(Long id);
int saveRiskExistingListSaveDto(RiskExistingListSaveDto saveDto);
}
......@@ -2,6 +2,7 @@ package com.censoft.censoftrongtong.service;
import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
import com.censoft.censoftrongtong.domain.dto.RiskInherentListSaveDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
......@@ -68,4 +69,6 @@ public interface IRiskPlanInherentListService
Integer saveRiskInherentListSaveDto(RiskInherentListSaveDto saveDto);
RiskPlanAppInherentListDetailsDto getRiskPlanAppInherentListDetailsDtoByInherentId(Long inherentId);
List<RiskPlanAppExistingListDto> getExistingListByInherentId(Long inherentId);
}
......@@ -3,9 +3,12 @@ package com.censoft.censoftrongtong.service.impl;
import java.util.List;
import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
import com.censoft.censoftrongtong.domain.dto.RiskExistingListSaveDto;
import com.censoft.censoftrongtong.mapper.RiskPlanExistingListMapper;
import com.censoft.censoftrongtong.service.IRiskPlanExistingListService;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -94,4 +97,11 @@ public class RiskPlanExistingListServiceImpl implements IRiskPlanExistingListSer
{
return riskPlanExistingListMapper.deleteRiskPlanExistingListById(id);
}
@Override
public int saveRiskExistingListSaveDto(RiskExistingListSaveDto saveDto) {
RiskPlanExistingList existingList = new RiskPlanExistingList();
BeanUtils.copyProperties(saveDto, existingList);
return insertRiskPlanExistingList(existingList);
}
}
......@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
import cn.hutool.core.util.StrUtil;
import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
import com.censoft.censoftrongtong.domain.dto.RiskInherentListSaveDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
import com.censoft.censoftrongtong.mapper.RiskPlanInherentListMapper;
......@@ -149,4 +150,9 @@ public class RiskPlanInherentListServiceImpl implements IRiskPlanInherentListSer
}
return dto;
}
@Override
public List<RiskPlanAppExistingListDto> getExistingListByInherentId(Long inherentId) {
return riskPlanInherentListMapper.getExistingListByInherentId(inherentId);
}
}
......@@ -78,9 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planId != null">plan_id,</if>
<if test="roomId != null">room_id,</if>
<if test="code != null">code,</if>
<if test="name != null">name,</if>
<if test="type != null">type,</if>
<if test="describe != null">describe,</if>
<if test="name != null">`name`,</if>
<if test="type != null">`type`,</if>
<if test="describe != null">`describe`,</if>
<if test="evaluationModel != null">evaluation_model,</if>
<if test="evaluationRange != null">evaluation_range,</if>
<if test="level != null">level,</if>
......
......@@ -129,6 +129,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE
rpil.id = #{inherentId}
</select>
<select id="getExistingListByInherentId"
resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDto">
SELECT
reil.id,
reil.`name`,
reil.create_time AS createTime,
reil.`describe`,
su.user_id AS userId,
su.nick_name AS userName,
su.avatar
FROM
risk_plan_existing_list reil
LEFT JOIN sys_user su ON su.user_id = reil.user_id
WHERE
reil.inherent_id = #{inherentId}
</select>
<insert id="insertRiskPlanInherentList" parameterType="com.censoft.censoftrongtong.domain.RiskPlanInherentList" useGeneratedKeys="true" keyProperty="id">
insert into risk_plan_inherent_list
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment