From ea3c33c8561df39d4f123d1424fda99dd0f0c51d Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期四, 14 十一月 2024 08:15:41 +0800
Subject: [PATCH] add - panel
---
jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/controller/DaTileMatchRulesController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 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 8b410f7..4c2563d 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
@@ -2,12 +2,18 @@
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 cn.hutool.core.util.ObjectUtil;
+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;
@@ -44,14 +50,15 @@
@Autowired
public IDaParamCollectionService daParamCollectionService;
+ @Resource
+ private IDaTileMatchCollectionService daTileMatchCollectionService;
/**
* 鏌ヨ閰嶇摝瑙勫垯鍒楄〃()
*/
@PreAuthorize("@ss.hasPermi('da:tileMatchRules:list')")
@GetMapping("/list")
- public TableDataInfo list(DaTileMatchRules daTileMatchRules)
- {
+ public TableDataInfo list(DaTileMatchRules daTileMatchRules) {
startPage();
List<DaTileMatchRules> list = daTileMatchRulesService.selectDaTileMatchRulesList(daTileMatchRules);
return getDataTable(list);
@@ -60,12 +67,31 @@
/**
* 鏇茶酱閰嶇摝
*/
- @PreAuthorize("@ss.hasPermi('da:tileMatchRules:list')")
@GetMapping("/list2")
- public TableDataInfo list2(DaTileMatchRules daTileMatchRules)
+ public TableDataInfo list2(DaTileMatchRules daTileMatchRules) throws Exception
{
startPage();
List<DaTileMatchRules> list = daTileMatchRulesService.selectDaTileMatchRulesList(daTileMatchRules);
+ //杩欓噷鍙栫涓�琛岀殑鏁版嵁鍙戦�侀鑹蹭俊鍙�
+ if (CollUtil.isNotEmpty(list)){
+ DaTileMatchRules daTileMatchRules1 = list.get(0);
+ String tileColor = daTileMatchRules1.getTileColor();
+ //1缁胯壊 2榛戣壊 3绾㈣壊 4钃濊壊
+ Integer colorInt = null;
+ if ("#008000".equals(tileColor)){
+ colorInt = 1;
+ } else if ("#000000".equals(tileColor)){
+ colorInt = 2;
+ } else if ("#FF0000".equals(tileColor)){
+ colorInt = 3;
+ } else if ("#0000FF".equals(tileColor)){
+ colorInt = 4;
+ }
+ if (ObjectUtil.isNotEmpty(colorInt)){
+ ReadWriteEntity entity = new ReadWriteEntity("CFL4LJ.OP001.Color", colorInt);
+ miloService.writeToOpcByte(entity);
+ }
+ }
return getDataTable(list);
}
@@ -168,9 +194,17 @@
saveData.setSfcCode(SNCode);
saveData.setParamValue(barcode);
saveData.setLocationCode(locationCode);
- saveData.setParamCode("CZM");
- saveData.setParamName("鏇茶酱");
+ 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);
@@ -180,10 +214,20 @@
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