From 3a6f6d86d14284a665dc016914b39a1a6a82b29b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 05 十月 2024 23:19:09 +0800
Subject: [PATCH] 导出数据点ok
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationController.java
index b20d12e..c1245a5 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationController.java
@@ -23,21 +23,26 @@
import com.qianwen.core.tenant.annotation.NonDS;
import com.qianwen.core.tool.api.R;
import com.qianwen.smartman.modules.cps.dto.WorkstationRealTimeStatusDTO;
+import com.qianwen.smartman.modules.cps.entity.WorkstationDatapoints;
import com.qianwen.smartman.modules.cps.excel.WorkstationImport;
import com.qianwen.smartman.modules.cps.service.IDmpVariablesService;
import com.qianwen.smartman.modules.cps.service.IWorkstationService;
+import com.qianwen.smartman.modules.cps.service.WorkstationDatapointsService;
import com.qianwen.smartman.modules.cps.vo.DmpVariablesVO;
import com.qianwen.smartman.modules.cps.vo.FmsWorkstationGroupVO;
import com.qianwen.smartman.modules.cps.vo.FmsWorkstationQueryVO;
import com.qianwen.smartman.modules.cps.vo.MachineDmpVariablesVO;
import com.qianwen.smartman.modules.cps.vo.WorkMachineEasyVO;
import com.qianwen.smartman.modules.cps.vo.WorkstationChangeCalendarVO;
+import com.qianwen.smartman.modules.cps.vo.WorkstationDatapointsVO;
import com.qianwen.smartman.modules.cps.vo.WorkstationPageQueryVO;
import com.qianwen.smartman.modules.cps.vo.WorkstationRealTimeStatusVO;
import com.qianwen.smartman.modules.cps.vo.WorkstationSubmitVO;
import com.qianwen.smartman.modules.cps.vo.WorkstationVO;
import com.qianwen.smartman.modules.resource.enums.TemplateEnum;
import com.qianwen.smartman.modules.resource.service.ISystemResourceService;
+
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -52,15 +57,19 @@
@NonDS
@Validated
public class WorkstationController extends BladeController {
- private final IWorkstationService workstationService;
- private final IDmpVariablesService dmpVariablesService;
- private final ISystemResourceService systemResourceService;
+ @Autowired
+ private IWorkstationService workstationService;
+ @Autowired
+ private IDmpVariablesService dmpVariablesService;
+ @Autowired
+ private ISystemResourceService systemResourceService;
+ /*
public WorkstationController(final IWorkstationService workstationService, final IDmpVariablesService dmpVariablesService, final ISystemResourceService systemResourceService) {
this.workstationService = workstationService;
this.dmpVariablesService = dmpVariablesService;
this.systemResourceService = systemResourceService;
- }
+ }*/
@PreAuth
@PostResource({"/submit"})
@@ -82,6 +91,8 @@
return R.data(this.dmpVariablesService.listByWorkstationId(workstationId));
}
+
+
@GetMapping({"/get"})
@ApiOperation("鑾峰彇宸ヤ綅淇℃伅")
public R<WorkstationVO> get(@RequestParam Long workstationId) {
--
Gitblit v1.9.3