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

1、开发接口添加固有风险

parent 6ca61ccc

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

+94 −25
Original line number Diff line number Diff line 
package com.censoft.censoftrongtong.controller;



import com.censoft.censoftrongtong.domain.*;

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

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.service.*;

import com.ruoyi.common.config.RuoYiConfig;

import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.core.domain.R;

import com.ruoyi.common.core.domain.entity.SysUser;

import com.ruoyi.system.service.ISysUploadFileService;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.web.bind.annotation.*;

import org.springframework.web.multipart.MultipartFile;



import javax.annotation.Resource;

import java.util.Arrays;

import java.util.List;

import java.util.stream.Collectors;





/**
@@ -46,6 +52,15 @@ public class RiskPlanAppController extends BaseController { 
    @Resource

    private IRiskPlanInherentListService riskPlanInherentListService;



    @Resource

    private ISysUploadFileService uploadFileService;



    /**

     * 服务器地址

     */

    @Value("${ruoyi.serverAddress}")

    private String serverAddress;



    /**

     * 获取自身部门及以下的项目

     *
@@ -168,7 +183,7 @@ public class RiskPlanAppController extends BaseController { 
    }



    /**

     * 根据计划id、楼宇id、楼层id、房间id获取房间列表

     * 根据计划id、楼宇id、楼层id、房间id获取固有风险列表

     *

     * @param planId     计划id

     * @param buildingId 楼宇id
@@ -181,4 +196,58 @@ public class RiskPlanAppController extends BaseController { 
            , @PathVariable("buildingId") Long buildingId, Long floorId, Long roomId) {

        return R.ok(riskPlanInherentListService.getInherentListByPlanId(planId, buildingId, floorId, roomId));

    }



    /**

     * 添加固有风险

     *

     * @param saveDto 固有风险表单

     * @real_return {@link R<Integer>}

     */

    @PostMapping("/inherent")

    public R<Integer> saveRiskInherentListSaveDto(RiskInherentListSaveDto 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(riskPlanInherentListService.saveRiskInherentListSaveDto(saveDto));

    }

}

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

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



import com.ruoyi.common.annotation.Excel;

import com.ruoyi.common.core.domain.BaseEntity;

import lombok.Data;

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;



/**

 * 固有风险清单库对象 risk_inherent_list

 * 

 * @author ruoyi

 * @date 2023-06-26

 */

@Data

public class RiskInherentListSaveDto{



    /** 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 presenceLocation;



    /** 风险源照片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;

}

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

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



import com.censoft.censoftrongtong.domain.RiskPlanInherentList;

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

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



import java.util.List;
@@ -62,4 +63,6 @@ public interface IRiskPlanInherentListService 
    public int deleteRiskPlanInherentListById(Long id);



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



    Integer saveRiskInherentListSaveDto(RiskInherentListSaveDto saveDto);

}

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

+9 −0
Original line number Diff line number Diff line
@@ -3,10 +3,12 @@ package com.censoft.censoftrongtong.service.impl; 
import java.util.List;



import com.censoft.censoftrongtong.domain.RiskPlanInherentList;

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

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

import com.censoft.censoftrongtong.mapper.RiskPlanInherentListMapper;

import com.censoft.censoftrongtong.service.IRiskPlanInherentListService;

import com.ruoyi.common.utils.DateUtils;

import org.springframework.beans.BeanUtils;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;
@@ -100,4 +102,11 @@ public class RiskPlanInherentListServiceImpl implements IRiskPlanInherentListSer 
    public List<RiskPlanAppInherentListDto> getInherentListByPlanId(Long planId, Long buildingId, Long floorId, Long roomId) {

        return riskPlanInherentListMapper.getInherentListByPlanId(planId, buildingId, floorId, roomId);

    }



    @Override

    public Integer saveRiskInherentListSaveDto(RiskInherentListSaveDto saveDto) {

        RiskPlanInherentList inherentList = new RiskPlanInherentList();

        BeanUtils.copyProperties(saveDto,inherentList);

        return insertRiskPlanInherentList(inherentList);

    }

}

ruoyi-admin/src/main/resources/application.yml

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ ruoyi: 
  addressEnabled: false

  # 验证码类型 math 数字计算 char 字符验证

  captchaType: math

  # 服务器地址

  serverAddress: http://192.168.4.232/dev-api



# 开发环境配置

server: