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/opcuaconfig/controller/DaOpcuaConfigController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 46 insertions(+), 10 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 b94f8f4..8578039 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,14 +1,20 @@ package com.jcdm.main.da.opcuaconfig.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.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.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; @@ -42,7 +48,12 @@ { @Autowired private IDaOpcuaConfigService daOpcuaConfigService; + @Autowired private IDaParamCollectionService daParamCollectionService; + @Autowired + private IDaTileMatchRulesService daTileMatchRulesService; + @Autowired + private IDaTileMatchMiddlewareService daTileMatchMiddlewareService; /** * 鏌ヨ浜や簰淇″彿閰嶇疆鍒楄〃 @@ -132,28 +143,53 @@ * 閰嶇摝鎵爜 */ @PreAuthorize("@ss.hasPermi('da:opcuaconfig:query')") - @GetMapping(value = "/barcode/{barcode}/{locationCode}") - public AjaxResult setBarcode(@PathVariable("barcode") String barcode,@PathVariable("locationCode") String locationCode) { - Boolean out= true; + @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(); + Object SNCodeObject = miloService.readFromOpcUa("CFL4HX." + locationCode + ".Code1").getValue(); + if (null == SNCodeObject) { + SNCodeObject = miloService.readFromOpcUa("CFL4HX." + locationCode + ".Code").getValue(); } - if (null != SNCodeObject){ + if (null != SNCodeObject) { String SNCode = SNCodeObject.toString(); //鎻掑叆鏁版嵁 DaParamCollection saveData = new DaParamCollection(); saveData.setSfcCode(SNCode); saveData.setParamValue(barcode); saveData.setLocationCode(locationCode); - saveData.setParamCode("XTM"); - saveData.setParamName("鏇茶酱鐮�"); + saveData.setParamCode("CZM"); + saveData.setParamName("鏇茶酱"); daParamCollectionService.insertDaParamCollection(saveData); + + 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 toAjax(out); + return xParamCollection; } } -- Gitblit v1.9.3