From 5030f3d30ccc1bd16db371c6970a48103aff9191 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期一, 03 六月 2024 13:56:57 +0800
Subject: [PATCH] 380新产品,优化
---
jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/controller/DaTileMatchRulesController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/controller/DaTileMatchRulesController.java b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/controller/DaTileMatchRulesController.java
index 5b2b18a..8b410f7 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/controller/DaTileMatchRulesController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/controller/DaTileMatchRulesController.java
@@ -1,7 +1,13 @@
package com.jcdm.main.da.tileMatchRules.controller;
import java.util.List;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.collection.CollUtil;
+import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
+import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
+import com.jcdm.main.da.tileMatchMiddleware.domain.DaTileMatchMiddleware;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -21,6 +27,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
*
@@ -33,6 +41,9 @@
{
@Autowired
private IDaTileMatchRulesService daTileMatchRulesService;
+
+ @Autowired
+ public IDaParamCollectionService daParamCollectionService;
/**
* 鏌ヨ閰嶇摝瑙勫垯鍒楄〃()
@@ -137,4 +148,42 @@
{
return toAjax(daTileMatchRulesService.deleteDaTileMatchRulesByIds(ids));
}
+
+ @PreAuthorize("@ss.hasPermi('da:tileMatchRules:query')")
+ @GetMapping(value = "/barcode")
+ public String setBarcode(String barcode,String locationCode) {
+ String XT="";
+ try {
+ //Object SNCodeObject = miloService.readFromOpcUa("CFL4HX."+locationCode+".Code1").getValue();
+ Object SNCodeObject = miloService.readFromOpcUa("CFL4HX.HOP040.Code1").getValue();
+ if (null == SNCodeObject){
+ //SNCodeObject = miloService.readFromOpcUa("CFL4HX."+locationCode+ ".Code").getValue();
+ SNCodeObject = miloService.readFromOpcUa("CFL4HX.HOP040.Code").getValue();
+ }
+ if (null != SNCodeObject){
+ String SNCode = SNCodeObject.toString();
+
+ //鎻掑叆鏁版嵁
+ DaParamCollection saveData = new DaParamCollection();
+ saveData.setSfcCode(SNCode);
+ saveData.setParamValue(barcode);
+ saveData.setLocationCode(locationCode);
+ saveData.setParamCode("CZM");
+ saveData.setParamName("鏇茶酱");
+ daParamCollectionService.insertDaParamCollection(saveData);
+
+ DaParamCollection ParamCollection = new DaParamCollection();
+ ParamCollection.setSfcCode(SNCode);
+ List<DaParamCollection> DaParamCollectionlist=daParamCollectionService.selectDaParamCollectionList(ParamCollection);
+ List<DaParamCollection> XTParamCollection = DaParamCollectionlist.stream().filter(x -> "绠变綋".equals(x.getParamName())).collect(Collectors.toList());
+ if (CollUtil.isNotEmpty(XTParamCollection)){
+ DaParamCollection lastOne = XTParamCollection.get(0);
+ XT = lastOne.getParamValue();
+ }
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return XT;
+ }
}
--
Gitblit v1.9.3