获取任务类型列表接口，获取工单列表接口返回值增加处理结果ID字段

zhubaomin

2024-11-28 107ef10e9309dd299e8983232dbec5beacecb06d

 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java

@@ -1,36 +1,32 @@
package com.dy.pipIrrApp.workOrder;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrApp.workOrder.dto.DtoDeleteProResult;
import com.dy.pipIrrApp.workOrder.dto.DtoDeleteWorkOrder;
import com.dy.pipIrrApp.workOrder.mqtt.MqttClientConnectorPool;
import com.dy.pipIrrApp.workOrder.mqtt.MqttMsgSender;
import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder;
import com.dy.pipIrrGlobal.pojoOp.OpeApproveResult;
import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
import com.dy.pipIrrGlobal.voOp.VoTaskType;
import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.rocketmq.client.exception.MQBrokerException;
import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.client.producer.DefaultMQProducer;
import org.apache.rocketmq.client.producer.SendResult;
import org.apache.rocketmq.common.message.Message;
import org.apache.rocketmq.remoting.exception.RemotingException;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;

import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Objects;

@@ -48,17 +44,20 @@
public class WorkOrderCtrl {
    private final WorkOrderSv workOrderSv;

    @Autowired
    private RocketMQTemplate rocketMQTemplate;
    @Value("${mqtt.broker}")
    private String broker;

    @Value("${rocketmq.name-server}")
    protected String nameServer;
    @Value("${mqtt.username}")
    private String username;

    @Value("${rocketmq.producer.group}")
    protected String producerGroup;
    @Value("${mqtt.password}")
    private String password;

    @Value("${rocketmq.topic}")
    protected String topic;
    @Value("${mqtt.topic}")
    private String topic;

    @Value("${mqtt.qos}")
    private Integer qos;

    /**
     * 创建工单
@@ -69,7 +68,7 @@
    @PostMapping(path = "addWorkOrder", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> addWorkOrder(@RequestBody @Valid OpeWorkOrder po, BindingResult bindingResult) throws MQBrokerException, RemotingException, InterruptedException, MQClientException {
    public BaseResponse<Boolean> addWorkOrder(@RequestBody @Valid OpeWorkOrder po, BindingResult bindingResult) {
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
@@ -96,30 +95,27 @@
    }

    /**
     * 通过RocketMQ推送工单主键
     * @param voWorkOrder 工单视图对象
     * 通过mosquitto发送巡检员ID及工单ID
     * @param voWorkOrder 工单对象
     * @param workOrderId 工单ID
     * @return
     * @throws MQClientException
     * @throws MQBrokerException
     * @throws RemotingException
     * @throws InterruptedException
     */
    private Boolean sendWorkOrder(VoWorkOrder voWorkOrder, Long workOrderId) throws MQClientException, MQBrokerException, RemotingException, InterruptedException {
        String tag = voWorkOrder.getInspector();
        String key = voWorkOrder.getInspectorId().toString();
    public Boolean sendWorkOrder(VoWorkOrder voWorkOrder, Long workOrderId) {
        //String message = JSON.toJSONString(voWorkOrder);
        String message = workOrderId.toString();

        DefaultMQProducer producer = new DefaultMQProducer(producerGroup);
        producer.setNamesrvAddr(nameServer);
        producer.start();
        Message msg = new Message(topic, tag, key, message.getBytes(StandardCharsets.UTF_8));
        SendResult approveSendResult = producer.send(msg);
        if(!approveSendResult.getSendStatus().toString().equals("SEND_OK")) {
        JSONObject message_job = new JSONObject();
        message_job.put("inspectorId", voWorkOrder.getInspectorId().toString());
        message_job.put("workOrderId", workOrderId.toString());
        String message = JSON.toJSONString(message_job);

        MqttClient mqttClient = MqttClientConnectorPool.connectMQTT(broker, username, password);
        MqttMsgSender sender = new MqttMsgSender();
        if (null != mqttClient){
            sender.sendMessage(mqttClient, topic, message, qos);
        } else {
            log.info("MqttClient为空，无法发送！");
            return false;
        }

        return true;
    }

@@ -270,4 +266,19 @@

        return BaseResponseUtils.buildSuccess(true) ;
    }

    /**
     * 获取任务类型列表
     * @return
     */
    @GetMapping(path = "/getTaskTypes")
    @SsoAop()
    public BaseResponse<List<VoTaskType>> getTaskTypes() {
        try {
            return BaseResponseUtils.buildSuccess(workOrderSv.getTaskTypes());
        } catch (Exception e) {
            log.error("获取任务类型异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }
}