From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 207 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 158 insertions(+), 49 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..1711a73 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
@@ -4,29 +4,24 @@
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.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.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.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,18 +38,6 @@
public class WorkOrderCtrl {
private final WorkOrderSv workOrderSv;
- @Autowired
- private RocketMQTemplate rocketMQTemplate;
-
- @Value("${rocketmq.name-server}")
- protected String nameServer;
-
- @Value("${rocketmq.producer.group}")
- protected String producerGroup;
-
- @Value("${rocketmq.topic}")
- protected String topic;
-
/**
* 鍒涘缓宸ュ崟
* @param po
@@ -64,9 +47,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,36 +66,158 @@
return BaseResponseUtils.buildErrorMsg("鑾峰彇宸ュ崟澶辫触");
}
- if(!sendWorkOrder(voWorkOrder)) {
- return BaseResponseUtils.buildErrorMsg("宸ュ崟鎺ㄩ�佸け璐�");
+ //if(!sendWorkOrder(voWorkOrder, workOrderId)) {
+ // return BaseResponseUtils.buildErrorMsg("宸ュ崟鎺ㄩ�佸け璐�");
+ //}
+
+ return BaseResponseUtils.buildSuccess();
+ }
+
+ /**
+ * 閫昏緫鍒犻櫎鎸囧畾娲惧崟浜虹殑鎸囧畾鏈垹闄ゅ伐鍗�
+ * 鍏堝垽鏂寚瀹氭淳鍗曚汉銆佹湭鍒犻櫎鐨勬寚瀹氬伐鍗曟槸鍚﹀瓨鍦�
+ * @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 voWorkOrder
- * @throws MQClientException
- * @throws MQBrokerException
- * @throws RemotingException
- * @throws InterruptedException
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏈垹闄ょ殑宸ュ崟鍒楄〃
+ * @param qo
+ * @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);
-
- 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")) {
- return false;
+ @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()) ;
}
-
- return true;
}
+ /**
+ * 鑾峰彇宸ュ崟璇︽儏
+ * @param workOrderId
+ * @return
+ */
+ @GetMapping(path = "/getOneWorkOrder")
+ @SsoAop()
+ public BaseResponse<VoWorkOrder> getOneWorkOrder(@RequestParam("workOrderId") Long workOrderId) {
+ try {
+ return BaseResponseUtils.buildSuccess(workOrderSv.getWorkOrderById(workOrderId));
+ } 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) ;
+ }
}
--
Gitblit v1.8.0