From 8069b5176a358fd4c730e34a4f30a781f1241c23 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期一, 08 七月 2024 16:00:30 +0800
Subject: [PATCH] cvt更新
---
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java | 86 +++++++++++++++++++++++++++----------------
1 files changed, 54 insertions(+), 32 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
index 8405255..029e9f8 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
@@ -1,30 +1,28 @@
package com.jcdm.main.da.passingStationCollection.controller;
+import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.jcdm.common.core.domain.R;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
+import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.da.passingStationCollection.vo.DaPassingStationVO;
+import com.kangaroohy.milo.model.ReadWriteEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.jcdm.common.annotation.Log;
import com.jcdm.common.core.controller.BaseController;
import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.common.enums.BusinessType;
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.common.core.page.TableDataInfo;
+
+import static com.jcdm.main.plcserver.callback.InitCallback.miloService;
/**
* 浜у搧杩囩珯閲囬泦Controller
@@ -34,8 +32,7 @@
*/
@RestController
@RequestMapping("/da/passingStationCollection")
-public class DaPassingStationCollectionController extends BaseController
-{
+public class DaPassingStationCollectionController extends BaseController {
@Autowired
private IDaPassingStationCollectionService daPassingStationCollectionService;
@@ -44,8 +41,7 @@
*/
@PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
@GetMapping("/list")
- public TableDataInfo list(DaPassingStationCollection daPassingStationCollection)
- {
+ public TableDataInfo list(DaPassingStationCollection daPassingStationCollection) {
startPage();
List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
return getDataTable(list);
@@ -53,27 +49,25 @@
@PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
@GetMapping("/getTopProcess")
- public TableDataInfo getTopProcess()
- {
+ public TableDataInfo getTopProcess() {
DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
List<DaPassingStationVO> list = daPassingStationCollectionService.getTopProcess(daPassingStationCollection);
return getDataTable(list);
}
+
/**
* 鏌ヨ浜у搧杩囩珯閲囬泦鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
@GetMapping("/noPageList")
- public TableDataInfo noPageList(DaPassingStationCollection daPassingStationCollection)
- {
+ public TableDataInfo noPageList(DaPassingStationCollection daPassingStationCollection) {
List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
return getDataTable(list);
}
@PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
@GetMapping("/getProduceNumToday")
- public R getProduceNumToday(String fieldName)
- {
+ public R getProduceNumToday(String fieldName) {
Integer num = daPassingStationCollectionService.getProduceNumToday(fieldName);
return R.ok(num);
}
@@ -82,8 +76,7 @@
* 鏌ヨ浜у搧杩囩珯閲囬泦鍒楄〃
*/
@GetMapping("/insertRepairRecordByIds")
- public AjaxResult insertRepairRecordByIds(DaPassingStationCollection daPassingStationCollection)
- {
+ public AjaxResult insertRepairRecordByIds(DaPassingStationCollection daPassingStationCollection) {
daPassingStationCollectionService.insertRepairRecordByIds(daPassingStationCollection);
return AjaxResult.success();
}
@@ -94,8 +87,7 @@
@PreAuthorize("@ss.hasPermi('da:passingStationCollection:export')")
@Log(title = "浜у搧杩囩珯閲囬泦", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, DaPassingStationCollection daPassingStationCollection)
- {
+ public void export(HttpServletResponse response, DaPassingStationCollection daPassingStationCollection) {
List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
ExcelUtil<DaPassingStationCollection> util = new ExcelUtil<DaPassingStationCollection>(DaPassingStationCollection.class);
util.exportExcel(response, list, "浜у搧杩囩珯閲囬泦鏁版嵁");
@@ -106,8 +98,7 @@
*/
@PreAuthorize("@ss.hasPermi('da:passingStationCollection:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(daPassingStationCollectionService.selectDaPassingStationCollectionById(id));
}
@@ -117,8 +108,7 @@
@PreAuthorize("@ss.hasPermi('da:passingStationCollection:add')")
@Log(title = "浜у搧杩囩珯閲囬泦", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody DaPassingStationCollection daPassingStationCollection)
- {
+ public AjaxResult add(@RequestBody DaPassingStationCollection daPassingStationCollection) {
daPassingStationCollection.setCreateBy(getUsername());
daPassingStationCollection.setCreateTime(DateUtils.getNowDate());
return toAjax(daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection));
@@ -130,8 +120,7 @@
@PreAuthorize("@ss.hasPermi('da:passingStationCollection:edit')")
@Log(title = "浜у搧杩囩珯閲囬泦", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody DaPassingStationCollection daPassingStationCollection)
- {
+ public AjaxResult edit(@RequestBody DaPassingStationCollection daPassingStationCollection) {
daPassingStationCollection.setUpdateBy(getUsername());
daPassingStationCollection.setUpdateTime(DateUtils.getNowDate());
return toAjax(daPassingStationCollectionService.updateDaPassingStationCollection(daPassingStationCollection));
@@ -142,9 +131,42 @@
*/
@PreAuthorize("@ss.hasPermi('da:passingStationCollection:remove')")
@Log(title = "浜у搧杩囩珯閲囬泦", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(daPassingStationCollectionService.deleteDaPassingStationCollectionByIds(ids));
}
-}
+
+
+// @PreAuthorize("@ss.hasPermi('da:passingStationCollection:query')")
+// @Log(title = "浜у搧杩囩珯閲囬泦", businessType = BusinessType.INSERT)
+// @GetMapping(value = "/addPassing")
+// public R addPassing(String sfcCode,String locationCode) {
+//
+// DaPassingStationCollection saveData = new DaPassingStationCollection();
+// saveData.setSfcCode(sfcCode);
+// saveData.setLocationCode(locationCode);
+// saveData.setCollectionTime(new Date());
+// daPassingStationCollectionService.insertDaPassingStationCollection(saveData);
+//
+// return R.ok();
+//
+// }
+
+
+ @GetMapping("/initializedData")
+ public AjaxResult initializedData(@RequestParam String sfcCode, @RequestParam String locationCode) {
+
+ try {
+ String nodeId = "CFL4CVT." + locationCode + ".MesSNCode";
+ ReadWriteEntity entity = new ReadWriteEntity(nodeId, sfcCode);
+ miloService.writeToOpcUa(entity);
+ String SaveSNCode ="CFL4CVT." + locationCode + ".SaveSNCode";
+ ReadWriteEntity SaveSNCodeEntity = new ReadWriteEntity(SaveSNCode, 11);
+ miloService.writeToOpcUa(SaveSNCodeEntity);
+ return AjaxResult.success("SFC Code updated successfully");
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to update SFC Code in OPC UA", e);
+ }
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.9.3