From 25db770e621f1259b8d5b7fd514207f7481c2d0f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 30 十月 2024 11:25:37 +0800
Subject: [PATCH] blade_cps路径改为smis
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/ProcessParameterController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/ProcessParameterController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/ProcessParameterController.java
index b09b735..7310f74 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/ProcessParameterController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/ProcessParameterController.java
@@ -17,6 +17,7 @@
import com.qianwen.core.tool.api.R;
import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
+import com.qianwen.smartman.modules.mdc.dto.DatapointDTO;
import com.qianwen.smartman.modules.mdc.dto.ProcessParameterRealVO;
import com.qianwen.smartman.modules.mdc.service.IProcessParameterService;
import com.qianwen.smartman.modules.mdc.vo.AllShiftTimeDetail;
@@ -29,6 +30,8 @@
import com.qianwen.smartman.modules.mdc.vo.ShiftTimeVO;
import com.qianwen.smartman.modules.mdc.vo.WorkstationShiftSearchVO;
import com.qianwen.smartman.modules.mdc.vo.excel.ProcessParamExcelVO;
+
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -37,11 +40,9 @@
@ApiResource({"blade-mdc/process-parameter"})
@RestController
public class ProcessParameterController {
- private final IProcessParameterService processParameterService;
+ @Autowired
+ private IProcessParameterService processParameterService;
- public ProcessParameterController(final IProcessParameterService processParameterService) {
- this.processParameterService = processParameterService;
- }
@ApiOperationSupport(order = 1)
@PostResource({"/chart"})
@@ -73,14 +74,24 @@
public R<List<GlobalWcs>> listGlobalWcs() {
return R.data(this.processParameterService.listGlobalWcs());
}
-
+ /*
@ApiOperationSupport(order = RegionCache.VILLAGE_LEVEL)
@GetResource({"/param"})
@ApiOperation("鍙傛暟閫夋嫨")
@PreAuth
+ //TODO 璋冭瘯鏂拌繃绋嬪弬鏁板睍绀哄悗鍒犻櫎
public R<List<WorkstationWcsDmpDTO>> processParam(@RequestParam("workstationId") String workstationId) {
return R.data(this.processParameterService.processParam(workstationId));
}
+ */
+
+ @ApiOperationSupport(order = RegionCache.VILLAGE_LEVEL)
+ @GetResource({"/params"})
+ @ApiOperation("灞曠ず鏁版嵁鐐瑰垪琛�")
+ @PreAuth
+ public R<List<DatapointDTO>> params(@RequestParam("workstationId") String workstationId) {
+ return R.data(this.processParameterService.processParams(workstationId));
+ }
@ApiOperationSupport(order = 6)
@PostResource({"/excel/export"})
--
Gitblit v1.9.3