Merge remote-tracking branch 'origin/master'

hdy

2024-01-08 60ebb5f4610ce79742a3781c71f7eda4043b7fac

 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/impl/ScStationConfServiceImpl.java

@@ -1,5 +1,6 @@
package com.jcdm.main.sc.stationConf.service.impl;

import java.net.InetAddress;
import java.util.List;
import com.jcdm.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -93,4 +94,16 @@
    {
        return scStationConfMapper.deleteScStationConfById(id);
    }

    @Override
    public String getIpv4() {
        String ipv4 = "";
        try {
            InetAddress localhost = InetAddress.getLocalHost();
            ipv4 = localhost.getHostAddress();
        } catch (Exception ex) {
            ex.printStackTrace();
        }
        return ipv4;
    }
}