From ff55f15de19cb5bf02fa4d2313f4882ef9b3a452 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 30 四月 2025 10:47:34 +0800
Subject: [PATCH] 表阀一体机上报心跳数据最小间隔经常改动，时常不通知软件开发人员，所以通信中间件根据最小上报数据间隔会切断设备网络连接，为此改变中间件配置，最小心跳间隔改为在properties文件中配置。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java
index 1884f70..0dfd021 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java
@@ -2,13 +2,13 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSe.SeUnlockMapper;
+import com.dy.pipIrrGlobal.pojoSe.SeUnlock;
import com.dy.pipIrrGlobal.voSe.VoUnlock;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -30,15 +30,15 @@
//瀹屽杽鏌ヨ娉ㄩ攢璁板綍鐨勮捣姝㈡椂闂�
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- LocalDateTime unlocklTimeStart = queryVo.unlocklTimeStart;
- LocalDateTime unlockTimeStop = queryVo.unlockTimeStop;
+ String unlocklTimeStart = queryVo.unlocklTimeStart;
+ String unlockTimeStop = queryVo.unlockTimeStop;
if(unlocklTimeStart != null) {
- unlocklTimeStart = LocalDateTime.parse(df.format(unlocklTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ unlocklTimeStart = unlocklTimeStart + " 00:00:00";
queryVo.setUnlocklTimeStart(unlocklTimeStart);
}
if(unlockTimeStop != null) {
- unlockTimeStop = LocalDateTime.parse(df.format(unlockTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ unlockTimeStop = unlockTimeStop + " 23:59:59";
queryVo.setUnlockTimeStop(unlockTimeStop);
}
@@ -49,8 +49,19 @@
QueryResultVo<List<VoUnlock>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = queryVo.pageSize ;
rsVo.pageCurr = queryVo.pageCurr ;
+
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seUnlockMapper.getUnlocks(params);
return rsVo ;
}
+
+ /**
+ * 娣诲姞瑙ｉ攣璁板綍
+ * @param po
+ * @return
+ */
+ public Long add(SeUnlock po) {
+ seUnlockMapper.insert(po);
+ return po.getId();
+ }
}
--
Gitblit v1.8.0