From 04b8eff075a04db23e6f908855699b4d2954588c Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期四, 23 五月 2024 18:47:01 +0800
Subject: [PATCH] 380新产品,优化
---
jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java
index 23d2e95..b94f8f4 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java
@@ -3,10 +3,14 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
-import com.jcdm.main.da.opcuaconfig.client.ClientHandler;
import com.jcdm.main.da.opcuaconfig.domain.DaOpcuaConfig;
import com.jcdm.main.da.opcuaconfig.domain.NodeEntity;
import com.jcdm.main.da.opcuaconfig.service.IDaOpcuaConfigService;
+import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
+import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
+import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
+import com.jcdm.main.plcserver.sub.OPCUaSubscription;
+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;
@@ -24,6 +28,8 @@
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.common.core.page.TableDataInfo;
+import static com.jcdm.main.plcserver.sub.OPCUaSubscription.miloService;
+
/**
* 浜や簰淇″彿閰嶇疆Controller
*
@@ -36,6 +42,7 @@
{
@Autowired
private IDaOpcuaConfigService daOpcuaConfigService;
+ private IDaParamCollectionService daParamCollectionService;
/**
* 鏌ヨ浜や簰淇″彿閰嶇疆鍒楄〃
@@ -111,14 +118,42 @@
@PreAuthorize("@ss.hasPermi('da:opcuaconfig:query')")
@GetMapping(value = "/SNCode/{SNCode}/{locationCode}")
public AjaxResult setSNCode(@PathVariable("SNCode") String SNCode,@PathVariable("locationCode") String locationCode) {
- NodeEntity node= NodeEntity.builder().index(2).identifier("CFL4CVT"+"."+locationCode+".SNCode").value(SNCode).type("string").build();
- Boolean out= null;
+ ReadWriteEntity entity = new ReadWriteEntity("CFL4HX."+locationCode+".SNCode", SNCode);
+ Boolean out= true;
try {
- out = ClientHandler.write(node);
+ miloService.writeToOpcUa(entity);//鍐橲N
} catch (Exception e) {
throw new RuntimeException(e);
}
+ return toAjax(out);
+ }
+ /**
+ * 閰嶇摝鎵爜
+ */
+ @PreAuthorize("@ss.hasPermi('da:opcuaconfig:query')")
+ @GetMapping(value = "/barcode/{barcode}/{locationCode}")
+ public AjaxResult setBarcode(@PathVariable("barcode") String barcode,@PathVariable("locationCode") String locationCode) {
+ Boolean out= true;
+ try {
+ Object SNCodeObject = miloService.readFromOpcUa("CFL4HX."+locationCode+".Code1").getValue();
+ if (null == SNCodeObject){
+ SNCodeObject = miloService.readFromOpcUa("CFL4HX."+locationCode+ ".Code").getValue();
+ }
+ if (null != SNCodeObject){
+ String SNCode = SNCodeObject.toString();
+ //鎻掑叆鏁版嵁
+ DaParamCollection saveData = new DaParamCollection();
+ saveData.setSfcCode(SNCode);
+ saveData.setParamValue(barcode);
+ saveData.setLocationCode(locationCode);
+ saveData.setParamCode("XTM");
+ saveData.setParamName("鏇茶酱鐮�");
+ daParamCollectionService.insertDaParamCollection(saveData);
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
return toAjax(out);
}
}
--
Gitblit v1.9.3