-打印bug修改

admin

2024-10-15 6d313a4a6f9f9d7ea65ec50ab0d4491e595edb97

 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java

@@ -2,12 +2,10 @@


import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jcdm.common.utils.StringUtils;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.constant.Constants;
@@ -17,11 +15,9 @@
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.da.testDeviceInterface.domain.DaTestDeviceInterface;
import com.jcdm.main.da.testDeviceInterface.service.IDaTestDeviceInterfaceService;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.conf.OPCElement;
import com.jcdm.main.plcserver.util.TimeUtil;
import com.jcdm.main.restful.factoryMes.service.RestfulService;
import com.kangaroohy.milo.model.ReadWriteEntity;
@@ -30,12 +26,12 @@
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.websocket.Session;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;

@Slf4j
@@ -45,29 +41,36 @@
    private static final Logger logger = LoggerFactory.getLogger("sys-user");

    public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

    //新自动工站
    public List<String> automaticList = Arrays.asList("OP280","OP310A","OP310B", "OP300A","OP300B", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470");
    public List<String> automaticList = Arrays.asList("POP270", "POP281", "POP283", "POP285", "POP286", "POP290","OP365","POP300", "POP320", "POP400");

    //采集模组工位 ModuleCode
    public List<String> moduleCodeList = Arrays.asList("OP300A","OP310A","OP310B","OP300B","OP320A","OP320B","OP340A","OP340B","OP365", "OP350A", "OP350B", "OP330");

    //区分模组型号工位
    public List<String> distinguishingModules = Arrays.asList("OP300","OP310", "OP340", "OP350", "OP330");
    public List<String> moduleCodeList = Arrays.asList("POP281","POP282","POP283","POP285","OP365", "POP286", "POP284");

    //区分小车码
    public List<String> agvId = Arrays.asList("OP360", "OP390", "OP470","OP280");


    //区分pack型号的工位
    public List<String> packIdList = Arrays.asList("OP280","OP360","OP390","OP470");
    public List<String> agvId = Arrays.asList("POP290", "POP320", "POP400","POP270");

    //测试设备手动工位
    public List<String> testList = Arrays.asList("OP430-1","OP430-2","OP430-3","OP430-4","OP480-1","OP480-2","OP480-3","OP440");

    public List<String> testList = Arrays.asList("POP360-1","POP360-2","POP360-3","POP360-4","POP410-1","POP410-2","POP410-3","POP370","POP420-1","POP420-2","POP420-3","POP420-4","POP420-5","POP420-6","POP282");

    //空的
    public List<String> nullList = Arrays.asList("OP250","OP260");

//    //新自动工站
//    public List<String> automaticList = Arrays.asList("OP280","OP310A","OP310B", "OP300A","OP300B", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470");
//
//    //采集模组工位 ModuleCode
//    public List<String> moduleCodeList = Arrays.asList("OP300A","OP310A","OP310B","OP300B","OP320A","OP320B","OP340A","OP340B","OP365", "OP350A", "OP350B", "OP330");
//
//    //区分小车码
//    public List<String> agvId = Arrays.asList("OP360", "OP390", "OP470","OP280");
//
//    //测试设备手动工位
//    public List<String> testList = Arrays.asList("OP430-1","OP430-2","OP430-3","OP430-4","OP480-1","OP480-2","OP480-3","OP440");
//
//
//    //空的
//    public List<String> nullList = Arrays.asList("OP250","OP260");


    public static MiloService miloService;
@@ -112,148 +115,134 @@
                String tab = nodes[2];//标记
                String tabVlaue = value.toString();//地址值

                if (("RecordData").equals(tab)) {
                    String recordDataDoneValue = "";

                    if("1".equals(tabVlaue)){

                        //请求工单
//                        if(device.equals("OP230")){
//                            getFactoryOrder("OP230");
//                        }

                        //自动工位
                        if(automaticList.stream().anyMatch(s -> s.equals(device))){
                            //plc给我们一个模组码，拿模组码校验出型号
                            if(moduleCodeList.stream().anyMatch(s -> s.equals(device))) {
                                String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                                //读模组码
                                Object moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
                                if(device.equals("OP365")){
                                    Object moduleCodeA = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCodeA").getValue();
                                    Object moduleCodeB = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCodeB").getValue();
                                    if(moduleCodeA!=null && moduleCodeB!=null){
                                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
                                    }else {
                                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
                                    }
                                    return;
                                }

                                if(moduleCode!=null){
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
                                }else {
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
                                }
                            }else {
                                if(agvId.stream().anyMatch(s -> s.equals(device))){
                                    Object agvIdObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".AGVID").getValue();
                                    //agvId 小车码是否为空
                                    if(agvIdObject!=null){
                                        String PACKCode = thoroughfare + "." + device + ".MPACKCode";
                                        OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getTrolleyYard, agvIdObject.toString()));
                                        //小车码查找工单是否为空
                                        if(one!=null){
                                            String packId = one.getProductNum();
                                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(PACKCode).value(packId).build());
                                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                                        }else {
                                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                                        }
                                    }else {
                                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                                    }

                                }else {
                                    String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                                    Object packCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".PACKCode").getValue();
                                    if(packCodeObject!=null){
                                        //pack 如果区分型号的话就要处理
                                        //记录数据完成
                                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
                                    }else {
                                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
                                    }
                                }
                            }
                        }else {
                            //手动工位处理逻辑
//                            if (map.containsKey(device)){
                                WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
                                String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
//                            }
                        }


                    }else if("2".equals(tabVlaue)){
                        if(automaticList.stream().anyMatch(s -> s.equals(device))){
                            //自动工位
                            //出站保存数据
                            recordDataDoneValue = outSaveDate(thoroughfare,device);
                            //记录数据完成
                            String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(recordDataDoneValue)).build());
                        }else {
                            //手动工位
//                            if(device.contains("OP330")){
//                                String str = device.substring(0,5);
//                                WebSocketUsers.sendMessageToUserByText(map.get(str), "END");
//                            }else {
                                WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
//                            }
                            if(testList.stream().anyMatch(s -> s.equals(device))){
                                String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
//                                Object packCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
//                                DaTestDeviceInterface deviceInterfaceOne = null;
//
//                                if (ObjectUtil.isNotNull(packCodeObject)) {
//                                    String modelCode = packCodeObject.toString();
//                                    deviceInterfaceOne = daTestDeviceInterfaceService.getOne(new LambdaQueryWrapper<DaTestDeviceInterface>()
//                                            .eq(DaTestDeviceInterface::getProductNum, modelCode)
//                                            .eq(DaTestDeviceInterface::getStationCode, device));
//                                }
//
//                                if (deviceInterfaceOne != null && "1".equals(deviceInterfaceOne.getTotalResult())) {
//                                    writeToOpc(RecordDataDoneAddress, (short) 21);
//                                } else {
//                                    writeToOpc(RecordDataDoneAddress, (short) 22);
//                                }
//                                writeToOpc(RecordDataDoneAddress, (short) 21);
                            }


                        }
                    }else {
                        System.out.println("^");
                    }
                }
                //保存拧紧数据
                else if (("AngleResult").equals(tab)) {
                    if("1".equals(tabVlaue)||"2".equals(tabVlaue)){
                        List<String> list = new ArrayList<>();
                        String[] suffixes = {"Torque", "Angle", "TorqueResult", "AngleResult"};

                        for (String suffix : suffixes) {
                            String string = thoroughfare + "." + device + "." + suffix;
                            list.add(string);
                        }
                        List<ReadWriteEntity> list1 = miloService.readFromOpcUa(list);
                        List<Object> collect = list1.stream().map(ReadWriteEntity::getValue).collect(Collectors.toList());
                        String joinedString = String.join(",", collect.toString());
                        WebSocketUsers.sendMessageToUserByText(map.get(device), TightenTheConversionOkNg(joinedString));
                        if(device.contains("270") || device.contains("260")){
                            logger.info("读取到工位{}的Scaner数据：{}",device,TightenTheConversionOkNg(joinedString));
                        }
                    }
                }
                CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                    subHandle(thoroughfare,device,tab,tabVlaue);
                });
            }
        } catch (Exception e) {
            logger.info("订阅方法报错:{}"+e.getMessage());
            logger.error("订阅方法报错",e);
        }
    }

    public void subHandle(String thoroughfare,String device,String tab,String tabVlaue){
        try {
            String prefix = thoroughfare + "." + device + ".";
            if (("RecordData").equals(tab)) {
                String recordDataDoneValue = "";

                if("1".equals(tabVlaue)){
                    //自动工位
                    if(automaticList.stream().anyMatch(s -> s.equals(device))){
                        //plc给我们一个模组码，拿模组码校验出型号
                        if(moduleCodeList.stream().anyMatch(s -> s.equals(device))) {
                            String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                            //读模组码
                            Object moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
                            if(device.equals("OP365")){
//                                Object moduleCodeA = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCodeA").getValue();
//                                Object moduleCodeB = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCodeB").getValue();
//                                if(moduleCodeA!=null && moduleCodeB!=null){
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
//                                }else {
//                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
//                                }
                            }else {
                                if(moduleCode!=null){
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
                                }else {
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
                                }
                            }
                        }else {
                            if(agvId.stream().anyMatch(s -> s.equals(device))){
                                Object agvIdObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".AGVID").getValue();
                                //agvId 小车码是否为空
                                if(agvIdObject!=null){
                                    String PACKCode = thoroughfare + "." + device + ".MPACKCode";
                                    OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getTrolleyYard, agvIdObject.toString()));
                                    //小车码查找工单是否为空
                                    if(one!=null){
                                        String packId = one.getProductNum();
                                        String workOrderNo = one.getWorkOrderNo();
                                        if(!one.getSoftwareVersionCode().equals("") &&one.getSoftwareVersionCode()!=null){
                                            Integer packModel = Integer.valueOf(one.getSoftwareVersionCode());
                                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(prefix + "MProductType").value(packModel).build());
                                        }
                                        miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(PACKCode).value(packId).build());
                                        miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(prefix + "MWorkOrderNumber").value(workOrderNo).build());
                                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                                    }else {
                                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                                    }
                                }else {
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                                }

                            }else {
                                String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                                Object packCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".PACKCode").getValue();
                                if(packCodeObject!=null){
                                    //pack 如果区分型号的话就要处理
                                    //记录数据完成
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
                                }else {
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
                                }
                            }
                        }
                    }else {
                        //手动工位处理逻辑
                        WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
                        String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
                    }


                }else if("2".equals(tabVlaue)){
                    if(automaticList.stream().anyMatch(s -> s.equals(device))){
                        //自动工位
                        //出站保存数据
                        outSaveDate(thoroughfare,device);
                        //记录数据完成
                            /*String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(recordDataDoneValue)).build());*/
                    }else {
                        //手动工位测试工位出站
                        WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
                        if(testList.stream().anyMatch(s -> s.equals(device))){
                            String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
                        }


                    }
                }else {
                    System.out.println("^");
                }
            }
            //保存拧紧数据
            else if (("TighteningFrequency").equals(tab)) {
                if(!"0".equals(tabVlaue)){
                    List<String> list = new ArrayList<>();
                    String[] suffixes = {"Torque", "Angle", "TorqueResult", "AngleResult"};

                    for (String suffix : suffixes) {
                        String string = thoroughfare + "." + device + "." + suffix;
                        list.add(string);
                    }
                    List<ReadWriteEntity> list1 = miloService.readFromOpcUa(list);
                    List<Object> collect = list1.stream().map(ReadWriteEntity::getValue).collect(Collectors.toList());
                    String joinedString = String.join(",", collect.toString());
                    WebSocketUsers.sendMessageToUserByText(map.get(device), TightenTheConversionOkNg(joinedString));
                    logger.info("读取到工位{}的Scaner数据：{}",device,TightenTheConversionOkNg(joinedString));
                }
            }
        }catch (Exception e){
            logger.error("订阅方法报错",e);
        }
    }




@@ -268,26 +257,22 @@
    /**
     * 出站保存数据
     */
    public String outSaveDate(String thoroughfare,String device) {
    public void outSaveDate(String thoroughfare,String device) {
        String snCode = "";
        String result = "";
        String read = thoroughfare + "." + device + ".";

        try {
            if(nullList.stream().noneMatch(s -> s.equals(device))){
            if(nullList.stream().noneMatch(s -> s.equals(device))){//删除……………………………………………………
                if(moduleCodeList.stream().anyMatch(s -> s.equals(device))){
                    read = read + "ModuleCode";

                }else {
                    read = read + "PACKCode";
                }
            }
            if(device.equals("OP365")){
                try {
                    result = saveStationInfo365(thoroughfare,device);
                    return result;
//                    return saveStationInfo365(thoroughfare,device);
//                    return result;
                   saveStationInfo365(thoroughfare,device);
                }catch (Exception e){
                    e.printStackTrace();
                }
@@ -295,7 +280,8 @@
                snCode = miloService.readFromOpcUa(read).getValue().toString();

                if(null == snCode || "".equals(snCode)){
                    result = "22";
                    String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf("22")).build());
                }else{

                    String workOrderNo = "";
@@ -313,64 +299,32 @@

                    saveStationInfo(snCode,thoroughfare,device,workOrderNo,productCode);
                    //3、保存参数采集数据
                    SaveParamData(snCode,thoroughfare,device,workOrderNo,productCode);
                    List<DaParamCollection> daParamCollectionList = SaveParamData(snCode,thoroughfare,device,workOrderNo,productCode);

                    //如果是末尾工站要报工
                    if(device.equals("OP500")){
                    if(device.equals("POP430")){
                        RestfulService.getWorkReportResultFeedback(snCode,device,format.format(new Date()));
                        //1、更新工单信息
                        updateOrderInfo(snCode);
                    }

                    try{
                        daParamCollectionService.pushGeelycvMesFeedback(snCode,device);
                        daParamCollectionService.automaticWorkstationPushGeelycvMesFeedback(snCode,device,daParamCollectionList);
                    }catch (Exception e){
                    }
                    result = "21";

                }

            }
        }catch (Exception e) {
            logger.error("出站保存数据异常："+e);
        }
        return result;
    }


//    /**
//     * 出站保存数据
//     */
//    public String outSaveDate(String thoroughfare,String device) {
//        String result = "";
//        try {
//            //读取SNCode
//            String PACKCode = thoroughfare + "." + device + ".PACKCode";
//            Object PACKCodeObject = miloService.readFromOpcUa(PACKCode).getValue();
//            if(null == PACKCodeObject || "".equals(PACKCodeObject)){
//               result = "22";
//            }else{
//                String PACKCodeParam = PACKCodeObject.toString();
//                //1、更新工单信息
//                //updateOrderInfo();
//                //2、保存过站采集数据
//                saveStationInfo(PACKCodeParam,thoroughfare,device);
//                //3、保存参数采集数据
//                SaveParamData(PACKCodeParam,thoroughfare,device,"","");
//
//                result = "21";
//
//            }
//
//        }catch (Exception e) {
//
//        }
//        return result;
//    }

    /**
     * 保存过站采集
     */
    public void saveStationInfo(String packCode,String thoroughfare,String device,String workOrderNo,String productCode) throws Exception {
        logger.info("进入工位{}-方法saveStationInfo",device);
        SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
        sdf.setTimeZone(TimeZone.getTimeZone("GMT+8")); // CST通常表示中国标准时间，即东八区
        String prefix = thoroughfare+"."+device+".";
@@ -389,13 +343,16 @@
        daPassingStationCollection.setOutboundTime(format.parse(TimeUtil.test(end)));//出站时间
        daPassingStationCollection.setOutRsSign(stationStatus);//出站是否合格
        daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection);
        logger.info("结束工位{}-方法saveStationInfo",device);
    }

    public static void SaveParamData(String packCode,String thoroughfare,String device,String workOrderNo,String productType) throws Exception {
    public static List<DaParamCollection> SaveParamData(String packCode,String thoroughfare,String device,String workOrderNo,String productType) throws Exception {
        logger.info("进入工位{}-方法SaveParamData",device);
        List<DaCollectionParamConf> list;
        DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
        daCollectionParamConf.setGatherAddress(thoroughfare+ "." + device);
        list = collectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf);
        List<DaParamCollection> daParamCollectionlist = new ArrayList<>();

        List<String> nodeIdList = list.stream().map(info -> {
            String nodeid = info.getGatherAddress();
@@ -404,53 +361,51 @@

        if(!nodeIdList.isEmpty()){
            List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(nodeIdList);
            for (int i = 0; i < readWriteEntityList.size(); i++) {
            for(int i=0;i<nodeIdList.size();i++){
                if(readWriteEntityList.get(i).getValue() == null){
                    readWriteEntityList.get(i).setValue(" ");
                }
            }
            List<DaParamCollection> daParamCollectionlist = new ArrayList<>();
            for(int i=0;i<nodeIdList.size();i++){
                if(!readWriteEntityList.get(i).getValue().toString().equals("0.0")){
                    String tt = readWriteEntityList.get(i).getValue().toString();
                    DaParamCollection ParamCollection = new DaParamCollection();
                    ParamCollection.setParamCode(list.get(i).getCollectParameterId());
                    ParamCollection.setLocationCode(device);
                    if(tt.contains("Time")){
//                        String str = TimeUtil.getTimestamp(TimeUtil.stringProcessing(tt));
//                        ParamCollection.setParamValue(str);
                        ParamCollection.setParamValue(TimeUtil.test(TimeUtil.stringProcessing(tt)));
                    }else {
                        ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
                    }
                    ParamCollection.setSfcCode(packCode);
                    if(device.contains("OP360")){
                        String node = nodeIdList.get(i);
                        Object value = miloService.readFromOpcUa("PACK.OP360.ModuleSNCode"+node.charAt(node.length()-1)).getValue();
                        if(value!=null){
                            ParamCollection.setModuleCode(value.toString());
                        }
                    }
                    ParamCollection.setParamName(list.get(i).getCollectParameterName());
                    ParamCollection.setParamUpper(list.get(i).getParamUpper());
                    ParamCollection.setParamLower(list.get(i).getParamLower());
                    ParamCollection.setUnit(list.get(i).getCollectParameterUnit());
                    //ParamCollection.setState("合格");
                    ParamCollection.setType(list.get(i).getCollectParameterType());
                    ParamCollection.setCollectionTime(new Date());
                    ParamCollection.setWorkOrderNo(workOrderNo);
                    ParamCollection.setProductCode(productType);
                    daParamCollectionlist.add(ParamCollection);
//                    daParamCollectionService.insertDaParamCollection(ParamCollection);
                String paramValue = readWriteEntityList.get(i).getValue().toString();
                DaParamCollection ParamCollection = new DaParamCollection();
                ParamCollection.setParamCode(list.get(i).getCollectParameterId());
                ParamCollection.setLocationCode(device);
                if(paramValue.contains("Time")){
                    ParamCollection.setParamValue(TimeUtil.test(TimeUtil.stringProcessing(paramValue)));
                }else {
                    ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
                }
                ParamCollection.setSfcCode(packCode);
                if(device.contains("POP290")){
                    String node = nodeIdList.get(i);
                    Object value = miloService.readFromOpcUa("PACK.POP290.ModuleSNCode"+node.charAt(node.length()-1)).getValue();
                    if(value!=null){
                        ParamCollection.setModuleCode(value.toString());
                    }
                }
                ParamCollection.setParamName(list.get(i).getCollectParameterName());
                ParamCollection.setParamUpper(list.get(i).getParamUpper());
                ParamCollection.setParamLower(list.get(i).getParamLower());
                ParamCollection.setUnit(list.get(i).getCollectParameterUnit());
                ParamCollection.setType(list.get(i).getCollectParameterType());
                ParamCollection.setCollectionTime(new Date());
                ParamCollection.setWorkOrderNo(workOrderNo);
                ParamCollection.setProductCode(productType);
                daParamCollectionlist.add(ParamCollection);
            }
            daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
        }
        addBaseData(workOrderNo,productType,device,packCode);

        String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf("21")).build());
        logger.info("给工位{}写了21",device);
        daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
        List<DaParamCollection> baseDataList = addBaseData(workOrderNo,productType,device,packCode);
        for (int i = 0; i < baseDataList.size(); i++){
            daParamCollectionlist.add(baseDataList.get(i));
        }
        logger.info("结束工位{}-方法SaveParamData",device);
        return daParamCollectionlist;
    }

    public static void addBaseData(String workOrderNo,String productCode,String locationCode,String packCode){
    public static List<DaParamCollection> addBaseData(String workOrderNo,String productCode,String locationCode,String packCode){
        Map<String, String> map = new HashMap<>();
        map.put("GC", "南浔工厂");
        map.put("CXBH", "Pack线");
@@ -473,6 +428,7 @@
            confList.add(saveData);
        });
        daParamCollectionService.insertBatch(confList);
        return confList;
    }

    public static void getFactoryOrder(String locationCode){
@@ -517,13 +473,22 @@
            try {
                value = Float.parseFloat(part); // 尝试将字符串转换为浮点数
                String replacement;
                if (value == 1f) {
                if(i<2){
                    replacement = part;
                }else{
                    if (value == 1f) {
                        replacement = "OK";
                    } else{
                        replacement = "NG";
                    }
                }
            /*    if (value == 1f) {
                    replacement = "OK";
                } else if (value == 2f) {
                    replacement = "NG";
                } else {
                    replacement = part; // 如果不是1或2，则保持不变
                }
                }*/
                sb.append(replacement);
                if (i < parts.length - 1) {
                    sb.append(','); // 添加逗号（除了最后一个元素）
@@ -556,52 +521,52 @@
    /**
     * 保存过站采集
     */
    public String saveStationInfo365(String thoroughfare,String device) throws Exception {
    public void saveStationInfo365(String thoroughfare,String device) throws Exception {
        String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
        String prefix = thoroughfare+"."+device+".";
        List<DaPassingStationCollection> passingStationCollections = new ArrayList<>();
        String ModuleCodeA = "";
        String ModuleCodeB = "";
        String StationStatusA = "";
        String StationStatusB = "";

        Object objectModuleCodeA = miloService.readFromOpcUa(prefix + "ModuleCodeA").getValue();
        Object objectModuleCodeB = miloService.readFromOpcUa(prefix + "ModuleCodeB").getValue();
        Object objectStationStatusA = miloService.readFromOpcUa(prefix + "StationStatusA").getValue();
        Object objectStationStatusB = miloService.readFromOpcUa(prefix + "StationStatusB").getValue();

        if(ObjectUtil.isNotNull(objectModuleCodeA) && ObjectUtil.isNotNull(objectStationStatusA) && ObjectUtil.isNotNull(objectModuleCodeB) && ObjectUtil.isNotNull(objectStationStatusB)){
            ModuleCodeA = objectModuleCodeA.toString();
            ModuleCodeB = objectModuleCodeB.toString();
            StationStatusA = objectStationStatusA.toString();
            StationStatusB = objectStationStatusB.toString();

            String[] modeles = {ModuleCodeA,ModuleCodeB};
            String[] StationStatus = {StationStatusA,StationStatusB};

            String startTime = miloService.readFromOpcUa(prefix + "StartTime").getValue().toString();
            String stopTime = miloService.readFromOpcUa(prefix + "StopTime").getValue().toString();
            for (int i = 0; i < 2; i++) {
                DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
                String strt = TimeUtil.stringProcessing(startTime);
                String end = TimeUtil.stringProcessing(stopTime);
                daPassingStationCollection.setInboundTime(format.parse(TimeUtil.test(strt)));//入站时间
                daPassingStationCollection.setOutboundTime(format.parse(TimeUtil.test(end)));//出站时间
                daPassingStationCollection.setSfcCode(modeles[i]);
                daPassingStationCollection.setLocationCode(device);
                daPassingStationCollection.setOutRsSign(StationStatus[i]);//出站是否合格
                passingStationCollections.add(daPassingStationCollection);
            }
            daPassingStationCollectionService.saveBeachDaPassingStationCollection(passingStationCollections);
//            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
            return "21";
        }else {
//        String prefix = thoroughfare+"."+device+".";
//        List<DaPassingStationCollection> passingStationCollections = new ArrayList<>();
//        String ModuleCodeA = "";
//        String ModuleCodeB = "";
//        String StationStatusA = "";
//        String StationStatusB = "";
//
//        Object objectModuleCodeA = miloService.readFromOpcUa(prefix + "ModuleCodeA").getValue();
//        Object objectModuleCodeB = miloService.readFromOpcUa(prefix + "ModuleCodeB").getValue();
//        Object objectStationStatusA = miloService.readFromOpcUa(prefix + "StationStatusA").getValue();
//        Object objectStationStatusB = miloService.readFromOpcUa(prefix + "StationStatusB").getValue();
//
//        if(ObjectUtil.isNotNull(objectModuleCodeA) && ObjectUtil.isNotNull(objectStationStatusA) && ObjectUtil.isNotNull(objectModuleCodeB) && ObjectUtil.isNotNull(objectStationStatusB)){
//            ModuleCodeA = objectModuleCodeA.toString();
//            ModuleCodeB = objectModuleCodeB.toString();
//            StationStatusA = objectStationStatusA.toString();
//            StationStatusB = objectStationStatusB.toString();
//
//            String[] modeles = {ModuleCodeA,ModuleCodeB};
//            String[] StationStatus = {StationStatusA,StationStatusB};
//
//            String startTime = miloService.readFromOpcUa(prefix + "StartTime").getValue().toString();
//            String stopTime = miloService.readFromOpcUa(prefix + "StopTime").getValue().toString();
//            for (int i = 0; i < 2; i++) {
//                DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
//                String strt = TimeUtil.stringProcessing(startTime);
//                String end = TimeUtil.stringProcessing(stopTime);
//                daPassingStationCollection.setInboundTime(format.parse(TimeUtil.test(strt)));//入站时间
//                daPassingStationCollection.setOutboundTime(format.parse(TimeUtil.test(end)));//出站时间
//                daPassingStationCollection.setSfcCode(modeles[i]);
//                daPassingStationCollection.setLocationCode(device);
//                daPassingStationCollection.setOutRsSign(StationStatus[i]);//出站是否合格
//                passingStationCollections.add(daPassingStationCollection);
//            }
//            daPassingStationCollectionService.saveBeachDaPassingStationCollection(passingStationCollections);
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
//            logger.info("工位{}回复21",device);
//
//        }else {
//            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build());
            return "22";
        }
//        }
    }

    private static void writeToOpc(String identifier, short value) {
    private static void writeToOpcShort(String identifier, short value) {
        try {
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(identifier).value(value).build());
        } catch (Exception e) {