补充流程fix

yangys

2025-08-22 95e63522959ff8c21381ee2a5dc85b9d44cf2949

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/config/InitBean.java

@@ -8,7 +8,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.commons.contants.ParamContants;
import org.springblade.mdm.commons.contants.ParamConstants;
import org.springblade.mdm.machineback.filewatch.DirectorLockService;
import org.springblade.mdm.machineback.filewatch.DynamicDirectoryWatcher;
import org.springblade.mdm.machineback.filewatch.FileWatcherService;
@@ -16,7 +16,6 @@
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.system.feign.ISysClient;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;

import java.nio.file.Path;
@@ -31,25 +30,30 @@
   private final DirectorLockService directorLockService;
   private final MachineService machineService;
   private final FileWatcherService fileWatcherService;
   private final ISysClient sysClient;

   private final DynamicDirectoryWatcher directoryWatcher;
   private final MachineBackFileService machineBackFileService;
   private final NcProgramService ncProgramService;
   private final OssTemplate ossTemplate;
   private final ISysClient sysClient;
   //private final FileWatcherService.FileChangeListener listener;
   @PostConstruct
   public void init() {
      System.out.println("应用启动时执行初始化操作 @PostConstruct");
      log.info("应用启动时执行初始化操作 @PostConstruct");

      // 初始化逻辑
      R<String> networkTypeR = sysClient.getParamValue(ParamContants.NETWORK_TYPE_KEY);
      String networkType = networkTypeR.getData() == null ? ParamContants.NETWORK_TYPE_SHEMI : networkTypeR.getData();
      if (networkType.equals(ParamContants.NETWORK_TYPE_GONGKONG)) {

      R<String> networkTypeR = sysClient.getParamValue(ParamConstants.NETWORK_TYPE_KEY);
      String networkType = networkTypeR.getData() == null ? ParamConstants.NETWORK_TYPE_SHEMI : networkTypeR.getData();
      if (networkType.equals(ParamConstants.NETWORK_TYPE_GONGKONG)) {
         initMachineDirMonitor();
      }


   }

   /**
    * 初始化监控目录
    * 初始化机床监控目录
    */
   void initMachineDirMonitor() {
      boolean locked = directorLockService.acquireLock();
@@ -57,7 +61,7 @@
         log.info("回传接收目录已经被其他部署点位锁定，直接返回");
         return;
      }
      List<Machine> machineList = machineService.list();
      List<Machine> machineList = machineService.lambdaQuery().eq(Machine::getStatus,Machine.STATUS_ENABLE).list();
      List<String> monitorDirList = new ArrayList<String>();
      machineList.forEach(m -> {
         if (StringUtils.isNotEmpty(m.getProgReceiveDir())) {