上传接口调整

yangys

5 天以前 44fda5fa3787c78e74d62f9713dd36abdeadcac8

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

@@ -4,6 +4,7 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
@@ -13,6 +14,7 @@
import org.springblade.mdm.machineback.filewatch.FileWatcherService;
import org.springblade.mdm.machineback.filewatch.MachineFileBackListener;
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.program.filewatch.ProgramBackMonitor;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.system.feign.ISysClient;
import org.springframework.context.annotation.Bean;
@@ -30,20 +32,28 @@
   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 ProgramBackMonitor programBackMonitor;
   //private final FileWatcherService.FileChangeListener listener;
   @PostConstruct
   public void init() {
      System.out.println("应用启动时执行初始化操作 @PostConstruct");
      log.info("应用启动时执行初始化操作 @PostConstruct");

      programBackMonitor.monitorDir();
      // 初始化逻辑
      /*
      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)) {
         initMachineDirMonitor();
      }
      */

   }

   /**
@@ -82,7 +92,7 @@


   FileWatcherService.FileChangeListener getListener() {
      return new MachineFileBackListener(machineBackFileService,ncProgramService);
      return new MachineFileBackListener(machineBackFileService,ncProgramService,ossTemplate);
   }