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-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java index dce5580..2b6e52c 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; import java.util.Map; @@ -33,13 +34,20 @@ private SeReportReplyMapper seReportReplyMapper; /** - * 娣诲姞闂涓婃姤淇℃伅 + * 娣诲姞鐢ㄦ埛闂涓婃姤 * @param po * @return */ - public Long insertIssueReport(SeIssueReport po) { + public String addIssueReport(SeIssueReport po) { + po.setReportTime(new Date()); + po.setState((byte)1); seIssueReportMapper.insert(po); - return po.getId(); + Long issueReportId = po.getId(); + if(issueReportId == null) { + return "鍐滄埛闂涓婃姤澶辫触"; + } + + return "success"; } /** @@ -83,6 +91,16 @@ } /** + * 鏍规嵁涓婃姤ID鍙婂啘鎴稩D鑾峰彇鏈垹闄ょ殑涓婃姤锛屽垹闄や笂鎶ュ垽鏂娇鐢� + * @param issueReportId + * @param clientId + * @return + */ + public SeIssueReport getReport(Long issueReportId, Long clientId) { + return seIssueReportMapper.getReport(issueReportId, clientId); + } + + /** * 鍒犻櫎鍐滄埛闂涓婃姤 * @param issueReportId * @return -- Gitblit v1.8.0