From dd44823b3c6cc003de21ea023cea7ea8d85a873c Mon Sep 17 00:00:00 2001 From: yyt <306727702@qq.com> Date: 星期三, 26 六月 2024 12:56:17 +0800 Subject: [PATCH] 配瓦 --- jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 1 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 f6e8baf..6c300bd 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 @@ -1,10 +1,25 @@ package com.jcdm.main.da.opcuaconfig.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.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.da.tileMatchCollection.domain.DaTileMatchCollection; +import com.jcdm.main.da.tileMatchCollection.service.IDaTileMatchCollectionService; +import com.jcdm.main.da.tileMatchMiddleware.domain.DaTileMatchMiddleware; +import com.jcdm.main.da.tileMatchMiddleware.service.IDaTileMatchMiddlewareService; +import com.jcdm.main.da.tileMatchRules.domain.DaTileMatchRules; +import com.jcdm.main.da.tileMatchRules.service.IDaTileMatchRulesService; +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; @@ -22,11 +37,13 @@ import com.jcdm.common.utils.poi.ExcelUtil; import com.jcdm.common.core.page.TableDataInfo; +import static com.jcdm.main.plcserver.sub.OPCUaSubscription.miloService; + /** * 浜や簰淇″彿閰嶇疆Controller * * @author yyt - * @date 2024-01-22 + * @date 2024-01-23 */ @RestController @RequestMapping("/da/opcuaconfig") @@ -34,6 +51,14 @@ { @Autowired private IDaOpcuaConfigService daOpcuaConfigService; + @Autowired + private IDaParamCollectionService daParamCollectionService; + @Autowired + private IDaTileMatchRulesService daTileMatchRulesService; + @Autowired + private IDaTileMatchMiddlewareService daTileMatchMiddlewareService; + @Resource + private IDaTileMatchCollectionService daTileMatchCollectionService; /** * 鏌ヨ浜や簰淇″彿閰嶇疆鍒楄〃 @@ -102,4 +127,82 @@ { return toAjax(daOpcuaConfigService.deleteDaOpcuaConfigByIds(ids)); } + + /** + * 鑾峰彇浜や簰淇″彿閰嶇疆璇︾粏淇℃伅 + */ + @PreAuthorize("@ss.hasPermi('da:opcuaconfig:query')") + @GetMapping(value = "/SNCode/{SNCode}/{locationCode}") + public AjaxResult setSNCode(@PathVariable("SNCode") String SNCode,@PathVariable("locationCode") String locationCode) { + ReadWriteEntity entity = new ReadWriteEntity("CFL4HX."+locationCode+".SNCode", SNCode); + Boolean out= true; + try { + miloService.writeToOpcUa(entity);//鍐橲N + } catch (Exception e) { + throw new RuntimeException(e); + } + return toAjax(out); + } + + /** + * 閰嶇摝鎵爜 + */ + @PreAuthorize("@ss.hasPermi('da:opcuaconfig:query')") + @GetMapping(value = "/barcode1") + public DaParamCollection setBarcode1(String barcode,String locationCode) { + Boolean out = true; + DaParamCollection xParamCollection = null; + 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("CZM"); + saveData.setParamName("鏇茶酱"); + daParamCollectionService.insertDaParamCollection(saveData); + + DaTileMatchCollection MatchCollection = new DaTileMatchCollection(); + MatchCollection.setSfcCode(SNCode); + MatchCollection.setParamValue(barcode); + MatchCollection.setLocationCode(locationCode); + MatchCollection.setParamCode("CZM"); + MatchCollection.setParamName("鏇茶酱"); + daTileMatchCollectionService.insertDaTileMatchCollection(MatchCollection); + + DaTileMatchRules TileMatchRules = new DaTileMatchRules(); + TileMatchRules.setProductSeries("380Y"); + TileMatchRules.setScanObject1("杩炴潌"); + TileMatchRules.setScanObject2("鏇茶酱"); + daTileMatchRulesService.selectDaTileMatchRulesList(TileMatchRules); + + for (int i = 1; i <= 3; i++) { + DaTileMatchMiddleware TileMatchMiddleware = new DaTileMatchMiddleware(); + TileMatchMiddleware.setSfcCode(SNCode); + TileMatchMiddleware.setCrankshaftNo(barcode); + TileMatchMiddleware.setCylinder((long) i); + TileMatchMiddleware.setState(1L); + daTileMatchMiddlewareService.insertDaTileMatchMiddleware(TileMatchMiddleware); + } + + DaParamCollection ParamCollection = new DaParamCollection(); + ParamCollection.setSfcCode(SNCode); + ParamCollection.setParamName("绠变綋"); + List<DaParamCollection> DaParamCollectionlist = daParamCollectionService.selectDaParamCollectionList(ParamCollection); + List<DaParamCollection> XTParamCollection = DaParamCollectionlist.stream().filter(x -> "绠变綋".equals(x.getParamName())).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(XTParamCollection)) { + xParamCollection = XTParamCollection.get(0); + } + } + } catch (Exception e) { + throw new RuntimeException(e); + } + return xParamCollection; + } } -- Gitblit v1.9.3