代码提交

liusheng

2023-05-25 25807350b5126265e70203889bc2093bae3ddfab

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/EquipmentinfoController.java

@@ -38,8 +38,6 @@
public class EquipmentinfoController extends BaseController {
    @Autowired
    private IEquipmentinfoService equipmentinfoService;
    @Autowired
    private DingTalkService dingTalkService;


    /**
@@ -108,39 +106,12 @@
    /**
     * 问题上报
     */

    @RequestMapping("/reportContent")
    public AjaxResult reportContent(@RequestBody ReportReqVo reportReqVo) {
        if (StringUtils.isEmpty(reportReqVo.getDealDept()) && StringUtils.isEmpty(reportReqVo.getDealPersionNO())) {
            return error("处理人和处理部门不能同时为空！");
        }
        Boolean aBoolean = false;
        //1.判断处理人的工号是否为空，如果不为空，获取用户的的联系方式
        if (StringUtils.isNotEmpty(reportReqVo.getDealPersionNO())) {

            //2.如何处理人不为空，根据通知方式，调用对应的接口，将上报问题发出
            if (reportReqVo.getNoticeWay() == "钉钉") {
                //调用钉钉接口，进行消息发送
            } else if (reportReqVo.getNoticeWay() == "微信") {
                //需要企业微信，后期再做
            } else if (reportReqVo.getNoticeWay() == "电话") {
                //调用电话的接口
            }
        }

        //3.获取处理部门，调用钉钉接口，将上报问题发出
        if (StringUtils.isNotEmpty(reportReqVo.getDealDept())) {
            DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
            //设置发送内容
            dingTalkReqVo.setContents(null);
            dingTalkReqVo.setDeptId(reportReqVo.getDealDeptID());
            dingTalkReqVo.setUserId(reportReqVo.getDealPersionDingNO());
            aBoolean = dingTalkService.sendNotification(dingTalkReqVo);
        }

        // 将工作流推至下一节点

        //返回结果
        Boolean aBoolean = equipmentinfoService.reportContent(reportReqVo);
        return toAjax(aBoolean);
    }
}

 ruoyi-system/pom.xml

@@ -22,6 +22,14 @@
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common</artifactId>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>smartor</artifactId>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>smartor</artifactId>
        </dependency>

    </dependencies>


 ruoyi-system/src/main/java/com/ruoyi/system/service/IEquipmentinfoService.java

@@ -4,6 +4,8 @@

import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.domain.Equipmentinfo;
import com.ruoyi.system.domain.ReportReqVo;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 【请填写功能名称】Service接口
@@ -61,4 +63,7 @@
    public int deleteEquipmentinfoById(Long id);


    public Boolean reportContent(ReportReqVo reportReqVo);


}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EquipmentinfoServiceImpl.java

@@ -2,6 +2,10 @@

import java.util.List;

import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.ReportReqVo;
import com.smartor.domain.DingTalkReqVo;
import com.smartor.service.DingTalkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.EquipmentinfoMapper;
@@ -18,6 +22,10 @@
public class EquipmentinfoServiceImpl implements IEquipmentinfoService {
    @Autowired
    private EquipmentinfoMapper equipmentinfoMapper;

    @Autowired
    private DingTalkService dingTalkService;


    /**
     * 查询【请填写功能名称】
@@ -84,4 +92,40 @@
    public int deleteEquipmentinfoById(Long id) {
        return equipmentinfoMapper.deleteEquipmentinfoById(id);
    }

    @Override
    public Boolean reportContent(ReportReqVo reportReqVo) {
        Boolean aBoolean = false;
        //1. 将上报的问题存库


        //2.判断处理人的工号是否为空，如果不为空，获取用户的的联系方式
        if (StringUtils.isNotEmpty(reportReqVo.getDealPersionNO())) {

            //3.如何处理人不为空，根据通知方式，调用对应的接口，将上报问题发出
            if (reportReqVo.getNoticeWay() == "钉钉") {
                //调用钉钉接口，进行消息发送
            } else if (reportReqVo.getNoticeWay() == "微信") {
                //需要企业微信，后期再做
            } else if (reportReqVo.getNoticeWay() == "电话") {
                //调用电话的接口
            }
        }

        //4.获取处理部门，调用钉钉接口，将上报问题发出
        if (StringUtils.isNotEmpty(reportReqVo.getDealDept())) {
            DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
            //设置发送内容
            dingTalkReqVo.setContents(null);
            dingTalkReqVo.setDeptId(reportReqVo.getDealDeptID());
            dingTalkReqVo.setUserId(reportReqVo.getDealPersionDingNO());
            aBoolean = dingTalkService.sendNotification(dingTalkReqVo);
        }


        // 5将工作流推至下一节点

        //返回结果
        return aBoolean;
    }
}