修改请求地址

heheng

2024-11-15 9015e720487b737743232b0b3aa464c2ac9e8d17

 src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java

@@ -1,8 +1,13 @@
package com.ruoyi.project.tr.riskList.controller;

import com.ruoyi.common.utils.BeanCopyUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskCheckUnitRespDTO;
import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskUnitCodeAndNameListQueryRespDTO;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -17,15 +22,13 @@
import com.ruoyi.project.tr.riskCheckPoint.service.IRiskCheckPointService;
import com.ruoyi.project.tr.riskEvaluationPlan.domain.RiskEvaluationPlan;
import com.ruoyi.project.tr.riskEvaluationPlan.service.IRiskEvaluationPlanService;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.riskList.domain.RiskListByCrafts;
import com.ruoyi.project.tr.riskList.domain.RiskListByDevice;
import com.ruoyi.project.tr.riskList.domain.RiskListByWork;
import com.ruoyi.project.tr.riskList.domain.*;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
import com.ruoyi.project.tr.riskType.domain.RiskType;
import com.ruoyi.project.tr.riskType.service.IRiskTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;

@@ -44,6 +47,7 @@
public class RiskListController extends BaseController {
    private String prefix = "tr/riskList";


    @Autowired
    private IRiskListService riskListService;
    @Autowired
@@ -59,6 +63,9 @@

    @Autowired
    private IRegionService regionService;

    @Autowired
    private RiskService riskService;

    @GetMapping("/{name}")
    public String riskList(@PathVariable("name") String name, ModelMap mmap) {
@@ -92,7 +99,7 @@
    }

    /**
     * 查询风险清单列表
     * 查询风险清单列表 todo-20240522-风险四色图
     */
    @PostMapping("/list/{id}")
    @ResponseBody
@@ -103,6 +110,20 @@
        riskList.setCompanyId(sysUser.getCompanyId());

        List<RiskList> list = riskListService.selectRiskListList(riskList);

        if (riskList.getRiskType() == 5){
            //获取所有风险评价计划
            List<RiskList> allPlan = riskListService.getAllPlan();
            for (RiskList risk : list) {
                for (RiskList riskListOfPlan : allPlan) {
                    if (risk.getRiskListId().equals(riskListOfPlan.getRiskListId())){
                        risk.setEvaluationNowFengxianJibie(riskListOfPlan.getEvaluationNowFengxianJibie());
                        risk.setEvaluationNowFengxianse(riskListOfPlan.getEvaluationNowFengxianse());
                        risk.setEvaluationNowJibie(riskListOfPlan.getEvaluationNowJibie());
                    }
                }
            }
        }
        //判断是否是作业活动，如果是，则再次查询工作频率类型
        if (id == 2) {
            RiskType riskType = new RiskType();
@@ -182,6 +203,7 @@
    @Log(title = "风险清单", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @ResponseBody
    @Transactional
    public AjaxResult addSave(RiskList riskList) {
        //保存前获取用户名以及公司信息
        User sysUser = getSysUser();
@@ -191,7 +213,17 @@
        riskList.setCreateTime(nowDate);
        riskList.setUpdateTime(nowDate);
        riskList.setCompanyId(sysUser.getCompanyId());
        return toAjax(riskListService.insertRiskList(riskList));

        int result = riskListService.insertRiskList(riskList);
        riskList.getRiskListId();
        //todo-2022
        //新代码，为设施设备清单附属表添加uuid
        int uuidResult = riskService.insertRiskUnitUuid(riskList.getRiskListId());
        if (uuidResult < 0){
            throw new RuntimeException("保存uuid对应关系失败");
        }

        return toAjax(result);
    }

    /**
@@ -279,6 +311,7 @@
    /**
     * 修改保存风险清单
     */
    @Transactional
    @Log(title = "风险清单", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @ResponseBody
@@ -286,7 +319,12 @@
        User sysUser = getSysUser();
        riskList.setUpdateBy(sysUser.getUserName());
        riskList.setUpdateTime(DateUtils.getNowDate());
        return toAjax(riskListService.updateRiskList(riskList));
        int result = riskListService.updateRiskList(riskList);

        //todo-2022 新代码，附属表变更
        riskService.updateRiskUnit(riskList.getRiskListId());

        return toAjax(result);
    }

    /**
@@ -297,7 +335,12 @@
    @ResponseBody
    public AjaxResult remove(String ids) {
        //删除风险清单的同时,删除评价计划,
        return toAjax(riskListService.deleteRiskListByIds(ids));
        int result = riskListService.deleteRiskListByIds(ids);

        //todo-2022 新代码，附属表变更
        riskService.deleteRiskUnit(ids);

        return toAjax(result);
    }

    /**
@@ -408,8 +451,23 @@
    @ResponseBody
    public TableDataInfo list(RiskList riskList) {
        startPage();
        List<RiskList> list = riskListService.selectRiskListList(riskList);
        return getDataTable(list);
        List<RiskList> riskLists = riskListService.selectRiskListList(riskList);

        List<PreventRiskCheckUnitRespDTO> list = new ArrayList<>();
        //todo-2022 新代码，使用DTO,封装进去措施数据 --暂时不使用
//        for (RiskList risk : riskLists) {
//            PreventRiskCheckUnitRespDTO respDTO = BeanCopyUtils.copyBean(risk, PreventRiskCheckUnitRespDTO.class);
//
//            //查询封装管控措施
//            List<PreventRiskControlMeasure> riskControlMeasureList = riskService.getRiskControlMeasureByRiskId(risk.getRiskListId());
//            if (riskControlMeasureList != null && riskControlMeasureList.size() > 1){
//                respDTO.setRiskControlMeasures(riskControlMeasureList);
//            }
//
//            list.add(respDTO);
//        }

        return getDataTable(riskLists);
    }