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 | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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..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
@@ -2,12 +2,17 @@
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;
@@ -44,6 +49,8 @@
@Autowired
public IDaParamCollectionService daParamCollectionService;
+ @Resource
+ private IDaTileMatchCollectionService daTileMatchCollectionService;
/**
* 鏌ヨ閰嶇摝瑙勫垯鍒楄〃()
@@ -168,9 +175,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 +195,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