From f608e00e49461f60ba8df1566fc4b9a998430ace Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 03 八月 2024 21:41:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index 9da6d79..313d8ad 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -5,7 +5,6 @@
import com.yuanchu.mom.dto.ADto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
-import com.yuanchu.mom.pojo.PkMaster;
import com.yuanchu.mom.vo.Result;
import javax.servlet.http.HttpServletRequest;
@@ -42,4 +41,8 @@
List<ADto> menu();
List<Map<String, Object>> treeDevice(String deviceName);
+
+ Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request);
+
+ Object formulaCalculation(Map<String, Object> map, Boolean isAdopt);
}
--
Gitblit v1.9.3