From f69073b835f1a0c66590130e1830edcdd75ebb8a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 十一月 2024 16:59:35 +0800
Subject: [PATCH] 去掉dmpvar
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/controller/WorkstationController.java | 53 ++++++++++++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/controller/WorkstationController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/controller/WorkstationController.java
index 3050928..99def29 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/controller/WorkstationController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/controller/WorkstationController.java
@@ -1,14 +1,21 @@
package com.qianwen.smartman.modules.smis.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import java.util.List;
+
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
+
+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;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.qianwen.core.boot.ctrl.BladeController;
import com.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.mp.support.Condition;
@@ -22,34 +29,25 @@
import com.qianwen.core.secure.annotation.PreAuth;
import com.qianwen.core.tenant.annotation.NonDS;
import com.qianwen.core.tool.api.R;
+import com.qianwen.smartman.common.cache.RegionCache;
+import com.qianwen.smartman.modules.resource.enums.TemplateEnum;
+import com.qianwen.smartman.modules.resource.service.ISystemResourceService;
import com.qianwen.smartman.modules.smis.dto.WorkstationRealTimeStatusDTO;
-import com.qianwen.smartman.modules.smis.entity.WorkstationDatapoints;
import com.qianwen.smartman.modules.smis.excel.WorkstationImport;
-import com.qianwen.smartman.modules.smis.service.IDmpVariablesService;
import com.qianwen.smartman.modules.smis.service.IWorkstationService;
-import com.qianwen.smartman.modules.smis.service.WorkstationDatapointsService;
import com.qianwen.smartman.modules.smis.vo.DmpVariablesVO;
import com.qianwen.smartman.modules.smis.vo.FmsWorkstationGroupVO;
import com.qianwen.smartman.modules.smis.vo.FmsWorkstationQueryVO;
-import com.qianwen.smartman.modules.smis.vo.MachineDmpVariablesVO;
import com.qianwen.smartman.modules.smis.vo.WorkMachineEasyVO;
import com.qianwen.smartman.modules.smis.vo.WorkstationChangeCalendarVO;
-import com.qianwen.smartman.modules.smis.vo.WorkstationDatapointsVO;
import com.qianwen.smartman.modules.smis.vo.WorkstationPageQueryVO;
import com.qianwen.smartman.modules.smis.vo.WorkstationRealTimeStatusVO;
import com.qianwen.smartman.modules.smis.vo.WorkstationSubmitVO;
import com.qianwen.smartman.modules.smis.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;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
@Api(value = "宸ヤ綅绠＄悊", tags = {"宸ヤ綅绠＄悊"})
@RestController
@@ -59,8 +57,8 @@
public class WorkstationController extends BladeController {
@Autowired
private IWorkstationService workstationService;
- @Autowired
- private IDmpVariablesService dmpVariablesService;
+ //@Autowired
+ //private IDmpVariablesService dmpVariablesService;
@Autowired
private ISystemResourceService systemResourceService;
@@ -71,7 +69,7 @@
public R<WorkstationVO> submit(@Valid @RequestBody WorkstationSubmitVO workstationSubmitVO) {
return R.data(this.workstationService.submit(workstationSubmitVO));
}
-
+ /*
@GetResource({"/listDmpVariablesByMachineId"})
@ApiOperation("鏍规嵁鏈哄櫒id鑾峰彇閲囬泦椤�")
public R<List<DmpVariablesVO>> listDmpVariablesByMachineId(@RequestParam Long machineId) {
@@ -84,7 +82,7 @@
public R<MachineDmpVariablesVO> listDmpVariablesByWorkstationId(@RequestParam Long workstationId) {
return R.data(this.dmpVariablesService.listByWorkstationId(workstationId));
}
-
+ */
@GetMapping({"/get"})
@@ -169,14 +167,15 @@
public R<IPage<WorkstationRealTimeStatusVO>> getRealTimeStatus(@RequestBody WorkstationRealTimeStatusDTO dto, Query query) {
return R.data(this.workstationService.getRealTimeStatus(dto, query));
}
-
+ /*
@PreAuth
@GetResource({"/get-dmp-variables"})
@ApiOperation(value = "鑾峰緱閲囬泦椤�", notes = "鑾峰緱閲囬泦椤�")
public R<List<DmpVariablesVO>> getDmpVariables(@RequestParam("workstationId") @ApiParam(value = "宸ヤ綅ID", required = true) String workstationId, @RequestParam("machineId") @ApiParam(value = "鏈哄櫒Id", required = false) String machineId) {
return R.data(this.workstationService.getDmpVariables(workstationId, machineId));
}
-
+ */
+
@PostResource({"/get-workstation-by-groupIds"})
@ApiOperation("澶氫釜宸ヤ綅缁勬煡璇㈠伐浣�")
public R<List<WorkstationVO>> getWorkstationByGroupIds(@RequestBody List<String> groupIds) {
--
Gitblit v1.9.3