From 778d3d8b387ca0a8d1b51ef68f783fb0b407ef20 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 26 七月 2024 11:52:34 +0800
Subject: [PATCH] fix6
---
jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/controller/DaTileMatchRulesController.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 111 insertions(+), 1 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 db6d3ad..97c2b11 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,18 @@
package com.jcdm.main.da.tileMatchRules.controller;
import java.util.List;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.collection.CollUtil;
+import com.jcdm.common.core.domain.R;
+import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
+import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
+import com.jcdm.main.da.tileMatchCollection.domain.DaTileMatchCollection;
+import com.jcdm.main.da.tileMatchCollection.service.IDaTileMatchCollectionService;
+import com.jcdm.main.da.tileMatchMiddleware.domain.DaTileMatchMiddleware;
+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;
@@ -21,6 +32,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
*
@@ -34,12 +47,53 @@
@Autowired
private IDaTileMatchRulesService daTileMatchRulesService;
+ @Autowired
+ public IDaParamCollectionService daParamCollectionService;
+ @Resource
+ private IDaTileMatchCollectionService daTileMatchCollectionService;
+
/**
- * 鏌ヨ閰嶇摝瑙勫垯鍒楄〃
+ * 鏌ヨ閰嶇摝瑙勫垯鍒楄〃()
*/
@PreAuthorize("@ss.hasPermi('da:tileMatchRules:list')")
@GetMapping("/list")
public TableDataInfo list(DaTileMatchRules daTileMatchRules)
+ {
+ startPage();
+ List<DaTileMatchRules> list = daTileMatchRulesService.selectDaTileMatchRulesList(daTileMatchRules);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鏇茶酱閰嶇摝
+ */
+ @PreAuthorize("@ss.hasPermi('da:tileMatchRules:list')")
+ @GetMapping("/list2")
+ public TableDataInfo list2(DaTileMatchRules daTileMatchRules)
+ {
+ startPage();
+ List<DaTileMatchRules> list = daTileMatchRulesService.selectDaTileMatchRulesList(daTileMatchRules);
+ return getDataTable(list);
+ }
+
+ /**
+ * 杩炴潌閰嶇摝
+ */
+ @PreAuthorize("@ss.hasPermi('da:tileMatchRules:list')")
+ @GetMapping("/list4")
+ public TableDataInfo list4(DaTileMatchRules daTileMatchRules)
+ {
+ startPage();
+ List<DaTileMatchRules> list = daTileMatchRulesService.selectDaTileMatchRulesList(daTileMatchRules);
+ return getDataTable(list);
+ }
+
+ /**
+ * 骞宠 杞撮厤鐡�
+ */
+ @PreAuthorize("@ss.hasPermi('da:tileMatchRules:list')")
+ @GetMapping("/list3")
+ public TableDataInfo list3(DaTileMatchRules daTileMatchRules)
{
startPage();
List<DaTileMatchRules> list = daTileMatchRulesService.selectDaTileMatchRulesList(daTileMatchRules);
@@ -101,4 +155,60 @@
{
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("PHZ");
+ saveData.setParamName("骞宠 杞�");
+ daParamCollectionService.insertDaParamCollection(saveData);
+
+ DaTileMatchCollection MatchCollection = new DaTileMatchCollection();
+ MatchCollection.setSfcCode(SNCode);
+ MatchCollection.setParamValue(barcode);
+ MatchCollection.setLocationCode(locationCode);
+ MatchCollection.setParamCode("PHZ");
+ MatchCollection.setParamName("骞宠 杞�");
+ daTileMatchCollectionService.insertDaTileMatchCollection(MatchCollection);
+
+ 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();
+ }
+
+ ReadWriteEntity entity6 = new ReadWriteEntity("CFL4HX.HOP040.Partcode", 1);
+ miloService.writeToOpcByte(entity6);
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return XT;
+ }
+
+
+ @GetMapping("/getCheckData")
+ public R getCheckData(String SNCode, String XT, String CZ){
+ List<DaTileMatchRules> daTileMatchRulesList = daTileMatchRulesService.checkData(SNCode, XT, CZ);
+ return R.ok(daTileMatchRulesList);
+ }
}
--
Gitblit v1.9.3