更新过站

yyt

2024-04-28 127f1bc6b4b204cb32462cc24ead9e7821afe095

更新过站

 jcdm-admin/src/main/resources/application-druid.yml

@@ -19,14 +19,14 @@
#                url: jdbc:sqlserver://192.168.0.189:1433;DataBaseName=Jcdm041-Mes
#                username: sa
#                password: JCDM@2023
            master:
                 url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm041-Mes
                 username: sa
                 password: sam@123456
#            master:
#                 url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm041-Mes
#                 username: dt
#                 password: dtroot
#                 username: sa
#                 password: sam@123456
            master:
                 url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm041-Mes
                 username: dt
                 password: dtroot
            # 从库数据源
#            master:
#                url: jdbc:sqlserver://183.134.244.158:1433;DataBaseName=Jcdm041-Mes

 jcdm-admin/src/main/resources/application.yml

@@ -136,7 +136,28 @@
    primary: default
    config:
      default:
        endpoint: opc.tcp://127.0.0.1:49320
        endpoint: opc.tcp://10.10.12.84:49320
        security-policy: none
websocketUrl: 'ws://10.10.12.100:8081/websocket/111122'
#websocketUrl: 'ws://127.0.0.1:8086/websocket/111122'

# mybatis-plus
#mybatis-plus:
#  configuration:
#    map-underscore-to-camel-case: false
#    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl

# 日志输出
#logging:
#  level:
#    root: INFO
#    com.baomidou.mybatisplus: DEBUG
#    com.cx.sasmerp.mapper: DEBUG
#  file:
#    name: D:\sasmceprlog\sasmcerp.log
#  logback:
#    rollingpolicy:
#      max-file-size: 100MB
#      file-name-pattern: D:\sasmceprlog\sasmcerp.log.%d{yyyy-MM-dd}.%i.zip
#      max-history: 3
#      total-size-cap: 500MB

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

@@ -21,7 +21,6 @@
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
import javafx.animation.Timeline;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

@@ -388,7 +387,7 @@
                List<DaParamCollection> daParamCollectionlist = new ArrayList<>();
                if (CollUtil.isNotEmpty(nodeIdList)){
                    for(int i=0;i<nodeIdList.size();i++){
                        if(!readWriteEntityList.get(i).getValue().toString().equals("0.0")){
                        if(ObjectUtil.isNotEmpty(readWriteEntityList.get(i).getValue()) && !readWriteEntityList.get(i).getValue().toString().equals("0.0")){
                            DaParamCollection ParamCollection = new DaParamCollection();
                            ParamCollection.setParamCode(readWriteEntityList.get(i).getIdentifier().toString().split("[.]")[2]);
                            ParamCollection.setLocationCode(parts[1]);
@@ -420,6 +419,17 @@
                String str = object.toString();
                beatTime = Float.valueOf(str).longValue();
            }
            Object ProductStatus = miloService.readFromOpcUa(parts[0] + "." + parts[1] + ".ProductStatus").getValue();
            log.info("ProductStatus,{}",ProductStatus.toString());
            String str1="合格" ;
            if (ObjectUtil.isNotEmpty(ProductStatus)){
                String productStatusString = ProductStatus.toString();
                if (productStatusString.contains("2") || productStatusString.contains("3")){
                    str1="不合格";
                }else {
                    str1="合格";
                }
            }
            DaPassingStationCollection PassingStationCollection=new DaPassingStationCollection();
            PassingStationCollection.setSfcCode(SNCode);
            PassingStationCollection.setLocationCode(parts[1]);
@@ -428,7 +438,7 @@
            PassingStationCollection.setCollectionTime(new Date());
            PassingStationCollection.setCreateTime(new Date());
            PassingStationCollection.setBeatTime(beatTime.toString());
            PassingStationCollection.setOutRsSign("合格");
            PassingStationCollection.setOutRsSign(str1);
            passingStationCollectionServiceImpl.insertDaPassingStationCollection(PassingStationCollection);
            log.info("-------保存过站记录数据完成---------");