From 444b1808d73d21f9df361e64f44381b910947792 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 27 九月 2024 11:05:08 +0800
Subject: [PATCH] 去掉tdedgine，去掉一部分rocketmq，去掉dmplog模块
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/WorkstationFeedbackController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/WorkstationFeedbackController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/WorkstationFeedbackController.java
index 7b7e1e5..f7c74f7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/WorkstationFeedbackController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/WorkstationFeedbackController.java
@@ -87,13 +87,18 @@
return R.data(WorkstationFeedbackWrapper.build().entityVO(feedback));
}
+ /**
+ * 鐘舵�佸弽棣堢晫闈㈠垎椤垫煡璇�
+ * @param query
+ * @param queryDTO
+ * @return
+ */
@PostMapping({"/page"})
@ApiOperationSupport
@ApiOperation("宸ヤ綅鍙嶉鍒嗛〉鍒楄〃鏌ヨ")
public R<IPage<WorkstationFeedBackDetailVO>> page(Query query, @RequestBody WorkstationFeedBackQueryDTO queryDTO) {
IPage<WorkstationFeedbackDetail> page = this.detailService.page(Condition.getPage(query),
-
- Lambda.eq(WorkstationFeedbackDetail::getStatus, Integer.valueOf(FeedbackDetailStatus.EFFECTED.getValue()))
+ Lambda.eq(WorkstationFeedbackDetail::getStatus, FeedbackDetailStatus.EFFECTED.getValue())
.eq(WorkstationFeedbackDetail::getCancel, Boolean.FALSE)
.in(Func.isNotEmpty(queryDTO.getWorkstationGroupId()), WorkstationFeedbackDetail::getWorkstationId, this.workstationService
.getWorkstationByGroupIds(ListUtil.toList(new String[] { queryDTO.getWorkstationGroupId() })).stream().map(WorkstationVO::getId).collect(Collectors.toList()))
@@ -143,6 +148,11 @@
return R.data(page);
}
+ /**
+ * 搴旇鏄洿鎺ュ綍鍏ヤ竴涓姸鎬侊紙涓嶅綍鍏ヨ捣姝㈡椂闂达級锛岃捣濮嬫椂闂翠负褰撳墠鏃堕棿锛屽鏋滄湁鐜板瓨鐨勫嵆鏃剁姸鎬侊紝鍒欑洿鎺ユ洿鏂板叾缁撴潫鏃堕棿涓哄綋鍓嶆椂闂�
+ * @param immediateFeedBackDTO
+ * @return
+ */
@PostMapping({"/start-feedback-by-immediate"})
@ApiOperationSupport(order = 3)
@ApiOperation(value = "H5: 鐘舵�佸嵆鏃跺弽棣堢櫥璁�", notes = "宸ヤ綅鍗虫椂鍙嶉, 杩涜涓殑鍙嶉")
@@ -150,6 +160,11 @@
return R.status(this.wcsFeedbackService.startFeedbackByImmediate(immediateFeedBackDTO));
}
+ /**
+ * 淇濆瓨浜哄伐鍙嶉鐨勭姸鎬侊紙鐘舵�佽褰曠晫闈級
+ * @param noImmediateFeedBackDTO
+ * @return
+ */
@PostMapping({"/start-feedback-by-no-immediate"})
@ApiOperationSupport(order = 4)
@ApiOperation(value = "H5: 鏃堕棿娈靛弽棣�", notes = "鏃堕棿娈靛弽棣�")
@@ -160,11 +175,16 @@
return R.status(this.wcsFeedbackService.startFeedbackByNoImmediate(noImmediateFeedBackDTO));
}
+ /**
+ * 鐘舵�佹彁浜ゅ墠妫�鏌�
+ * @param noImmediateFeedBackDTO
+ * @return
+ */
@PostMapping({"/overwrite-feedback-check"})
@ApiOperationSupport(order = 4)
@ApiOperation(value = "鏌ヨ鏄惁鏈夎鐩栫殑鍙嶉", notes = "data true: 浼氳鐩栧弽棣�,鎻愮ず false: 涓嶄細瑕嗙洊鍙嶉,涓嶆彁绀虹洿鎺ユ彁浜�")
public R<Boolean> overwriteFeedback(@Validated @RequestBody WorkstationNoImmediateFeedBackDTO noImmediateFeedBackDTO) {
- return R.data(Boolean.valueOf(this.detailService.overwriteFeedbackCheck(noImmediateFeedBackDTO)));
+ return R.data(this.detailService.overwriteFeedbackCheck(noImmediateFeedBackDTO));
}
@ApiOperationSupport(order = RegionCache.VILLAGE_LEVEL)
--
Gitblit v1.9.3