From be175fe739e687cd1d45da58f2cb7dd0c36d001f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 11 八月 2023 11:48:10 +0800
Subject: [PATCH] 调整Pressure的接口包位置到COre中，然后增加modBus-TCP协议通讯报道
---
igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java | 38 +++++---------------------------------
1 files changed, 5 insertions(+), 33 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java b/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java
index e1df4fd..65b2400 100644
--- a/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java
+++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java
@@ -72,50 +72,22 @@
/**
* 鏍规嵁checkId鑾峰彇妫�楠岄」淇℃伅
*
- * checkStandardPR#listCheckItemsByCheckId
+ * checkStandardPR#listCheckItemsByParam
*
* @param param
* @return
*/
@DataProvider
- public List<CheckItemData> listCheckItemsByCheckId(Map<String, Object> param) {
+ @Expose
+ public List<CheckItemData> listCheckItemsByParam(Map<String, Object> param) {
String checkId = (String) param.get("checkId");
- String deptId = (String) param.get("deptId");
String foodVariety = (String) param.get("foodVariety");
+ String type = (String) param.get("type");
- return checkStandardManager.listCheckItem(checkId, null, deptId, foodVariety);
+ return checkStandardManager.listCheckItem(ContextUtil.getCompanyId(),checkId, foodVariety);
}
- /**
- * 鏍规嵁foodVariety鑾峰彇妫�楠岄」淇℃伅
- *
- * checkStandardPR#listCheckItemsByFoodVariety
- *
- * @param param
- * @return
- */
- @Expose
- public List<CheckItemData> listCheckItemsByFoodVariety(Map<String, Object> param) {
-
- String deptId = (String) param.get("deptId");
- String foodVariety = (String) param.get("foodVariety");
-
- return checkStandardManager.listCheckItem(null, null, deptId, foodVariety);
- }
-
-
-// /*=============== 鍖栭獙鎶ヨ〃鎵撳嵃鐩稿叧 ===============*/
-// /**
-// * checkStandardPR#pageReportCheckData 鍒嗛〉鑾峰彇鍑哄叆搴撶殑鍖栭獙鍗曟嵁鎶ヨ〃淇℃伅
-// *
-// * @param page
-// * @param param
-// */
-// @DataProvider
-// public void pageReportCheckData(Page<ReportInoutCheckData> page, Map<String, Object> param) {
-// jdbcInoutCheckService.pageReportCheckData(page, param);
-// }
/**
* checkStandardPR#getQuery 鏍规嵁鎶ヨ〃绫诲瀷锛岃幏鍙栭粯璁ゆ煡璇俊鎭紝姣斿琛ㄥご淇℃伅绛�
--
Gitblit v1.9.3