From ee243ee6a7cd9715fa84442e27b17816750033b5 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 09 一月 2025 11:57:28 +0800
Subject: [PATCH] 部分VO中增加json中的属性排序
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 271 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 231 insertions(+), 40 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
index 96f3f92..dae2151 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
@@ -1,32 +1,34 @@
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.voBa.VoRoleSimple;
+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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import java.nio.charset.StandardCharsets;
+import java.util.List;
import java.util.Objects;
/**
@@ -43,17 +45,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;
/**
* 鍒涘缓宸ュ崟
@@ -64,9 +69,13 @@
@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());
+ }
+
+ if(po.getClientReportId() != null && po.getInspectorReportId() != null) {
+ return BaseResponseUtils.buildErrorMsg("宸ュ崟浠呰兘鍏宠仈涓�涓棶棰樹笂鎶�");
}
Long workOrderId = workOrderSv.insertWorkOrder(po);
@@ -79,7 +88,7 @@
return BaseResponseUtils.buildErrorMsg("鑾峰彇宸ュ崟澶辫触");
}
- if(!sendWorkOrder(voWorkOrder)) {
+ if(!sendWorkOrder(voWorkOrder, workOrderId)) {
return BaseResponseUtils.buildErrorMsg("宸ュ崟鎺ㄩ�佸け璐�");
}
@@ -87,28 +96,210 @@
}
/**
- * 鎺ㄩ�佸伐鍗�
- * @param voWorkOrder
- * @throws MQClientException
- * @throws MQBrokerException
- * @throws RemotingException
- * @throws InterruptedException
+ * 閫氳繃mosquitto鍙戦�佸贰妫�鍛業D鍙婂伐鍗旾D
+ * @param voWorkOrder 宸ュ崟瀵硅薄
+ * @param workOrderId 宸ュ崟ID
+ * @return
*/
- private Boolean sendWorkOrder(VoWorkOrder voWorkOrder) throws MQClientException, MQBrokerException, RemotingException, InterruptedException {
- String tag = voWorkOrder.getInspector();
- String key = voWorkOrder.getInspectorId().toString();
- String message = JSON.toJSONString(voWorkOrder);
+ public Boolean sendWorkOrder(VoWorkOrder voWorkOrder, Long workOrderId) {
+ //String message = JSON.toJSONString(voWorkOrder);
- 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;
}
+ /**
+ * 閫昏緫鍒犻櫎鎸囧畾娲惧崟浜虹殑鎸囧畾鏈垹闄ゅ伐鍗�
+ * 鍏堝垽鏂寚瀹氭淳鍗曚汉銆佹湭鍒犻櫎鐨勬寚瀹氬伐鍗曟槸鍚﹀瓨鍦�
+ * @param deleteWorkOrder 鍒犻櫎宸ュ崟浼犺緭绫�
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "deleteWorkOrder")
+ @SsoAop()
+ public BaseResponse<Boolean> deleteWorkOrder(@RequestBody @Valid DtoDeleteWorkOrder deleteWorkOrder, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ OpeWorkOrder workOrder = workOrderSv.getWorkOrder(deleteWorkOrder.getWorkOrderId(), deleteWorkOrder.getDispatcherId());
+ if(workOrder == null) {
+ return BaseResponseUtils.buildErrorMsg("鎮ㄨ鍒犻櫎鐨勫伐鍗曚笉瀛樺湪");
+ }
+
+ if(workOrderSv.deleteWorkOrder(deleteWorkOrder.getWorkOrderId()) == 0) {
+ return BaseResponseUtils.buildErrorMsg("宸ュ崟鍒犻櫎澶辫触");
+ }
+
+ return BaseResponseUtils.buildSuccess();
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏈垹闄ょ殑宸ュ崟鍒楄〃
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "/getWorkOrders")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoWorkOrder>>> getWorkOrders(QoWorkOrder qo){
+ try {
+ return BaseResponseUtils.buildSuccess(workOrderSv.getWorkOrders(qo));
+ } catch (Exception e) {
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
+ * 鑾峰彇宸ュ崟璇︽儏
+ * @param workOrderId
+ * @return
+ */
+ @GetMapping(path = "/getOneWorkOrder")
+ @SsoAop()
+ public BaseResponse<VoWorkOrder> getOneWorkOrder(@RequestParam("workOrderId") Long workOrderId) {
+ try {
+ VoWorkOrder workOrder = workOrderSv.getWorkOrderById(workOrderId);
+ if(workOrder == null) {
+ return BaseResponseUtils.buildNonExist();
+ }
+ return BaseResponseUtils.buildSuccess(workOrder);
+ } catch (Exception e) {
+ log.error("鑾峰彇宸ュ崟璇︽儏寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 涓婃姤宸ュ崟澶勭悊缁撴灉
+ * 1.鏈笂鎶ョ殑锛岀洿鎺ヤ笂鎶�
+ * 2. 宸蹭笂鎶ョ殑鐨勶紝鎻愮ず鐢ㄦ埛涓嶈兘閲嶅涓婃姤
+ * 3. 宸查�氳繃鐨勶紝鎻愮ず鐢ㄦ埛澶勭悊缁撴灉澶勭悊缁撴灉宸查�氳繃
+ * 4. 椹冲洖鐨勶紝閫昏緫鍒犻櫎鍘熷鐞嗙粨鏋滐紝涓婃姤鏂扮殑澶勭悊缁撴灉
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "addProcessingResult")
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> addProcessingResult(@RequestBody @Valid OpeProcessingResult po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ String result = workOrderSv.addProcessingResult(po);
+ if(!result.equals("success")) {
+ return BaseResponseUtils.buildErrorMsg(result);
+ }
+
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+
+ /**
+ * 閫昏緫鍒犻櫎涓�涓鐞嗙粨鏋�
+ * @param deleteProResult
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "deleteProResult")
+ @SsoAop()
+ public BaseResponse<Boolean> deleteProResult(@RequestBody @Valid DtoDeleteProResult deleteProResult, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ OpeProcessingResult proResult = workOrderSv.getProResult(deleteProResult.getProResultId(), deleteProResult.getInspectorId());
+ if(proResult == null) {
+ return BaseResponseUtils.buildErrorMsg("鎮ㄨ鍒犻櫎鐨勫鐞嗙粨鏋滀笉瀛樺湪");
+ }
+
+ if(workOrderSv.deleteProResult(deleteProResult.getProResultId()) == 0) {
+ return BaseResponseUtils.buildErrorMsg("澶勭悊缁撴灉鍒犻櫎澶辫触");
+ }
+
+ return BaseResponseUtils.buildSuccess();
+ }
+
+ /**
+ * 鑾峰彇澶勭悊缁撴灉璇︽儏
+ * @param proResultId
+ * @return
+ */
+ @GetMapping(path = "/getProResult")
+ @SsoAop()
+ public BaseResponse<VoProcessingResult> getProResult(@RequestParam("proResultId") Long proResultId) {
+ try {
+ String aa = JSON.toJSONString(workOrderSv.getProResultById(proResultId));
+ System.out.println(aa);
+ return BaseResponseUtils.buildSuccess(workOrderSv.getProResultById(proResultId));
+ } catch (Exception e) {
+ log.error("鑾峰彇澶勭悊缁撴灉璇︽儏寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 瀹℃牳澶勭悊缁撴灉
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "approveProResult")
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> approveProResult(@RequestBody @Valid OpeApproveResult po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ String result = workOrderSv.approveProResult(po);
+ if(!result.equals("success")) {
+ return BaseResponseUtils.buildErrorMsg(result);
+ }
+
+ 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());
+ }
+ }
+
+ /**
+ * 鑾峰彇宸℃鍛樺垪琛�
+ * @param inspector
+ * @return
+ */
+ @GetMapping(path = "/getInspectors")
+ @SsoAop()
+ public BaseResponse<List<VoRoleSimple>> getInspectors(@RequestParam("inspector") String inspector) {
+ try {
+ return BaseResponseUtils.buildSuccess(workOrderSv.getInspectors(inspector));
+ } catch (Exception e) {
+ log.error("鑾峰彇浠诲姟绫诲瀷寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0