380新产品,优化

yyt

2024-05-23 04b8eff075a04db23e6f908855699b4d2954588c

 jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java

@@ -6,6 +6,9 @@
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.plcserver.sub.OPCUaSubscription;
import com.kangaroohy.milo.model.ReadWriteEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +28,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
 * 
@@ -37,6 +42,7 @@
{
    @Autowired
    private IDaOpcuaConfigService daOpcuaConfigService;
    private IDaParamCollectionService daParamCollectionService;

    /**
     * 查询交互信号配置列表
@@ -115,7 +121,36 @@
        ReadWriteEntity entity = new ReadWriteEntity("CFL4HX."+locationCode+".SNCode", SNCode);
        Boolean out= true;
        try {
            OPCUaSubscription.miloService.writeToOpcUa(entity);//写SN
            miloService.writeToOpcUa(entity);//写SN
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        return toAjax(out);
    }

    /**
     * 配瓦扫码
     */
    @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;
        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("XTM");
                saveData.setParamName("曲轴码");
                daParamCollectionService.insertDaParamCollection(saveData);
            }
        } catch (Exception e) {
            throw new RuntimeException(e);
        }