现场编制功能适配

yangys

2025-09-17 ee6af8dff591418168d5104d281a6f0bf3c961e8

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

@@ -7,12 +7,13 @@
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.machinefile.entity.MachineFile;
import org.springblade.mdm.machinefile.filewatch.*;
import org.springblade.mdm.machinefile.service.MachineFileScanService;
import org.springblade.mdm.machinefile.service.MachineFileService;
import org.springblade.mdm.program.service.ProgramAnnotationService;
import org.springblade.system.feign.ISysClient;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Component;

import java.nio.file.Path;
@@ -23,6 +24,7 @@
@Slf4j
@AllArgsConstructor
@Component
@EnableAsync
public class InitBean {
   private final DirectorLockService directorLockService;
   private final DynamicDirectoryWatcher directoryWatcher;
@@ -31,17 +33,28 @@
   private final ParamService paramService;
   private final ProgramAnnotationService annotationService;
   private final MachineFileScanService machineFileScanService;
   private final ISysClient sysClient;
   private final TaskDispatchService taskDispatchService;

   //@Value("${task.file_scan_on_start:true}")
   //@Value("${task.fileScanOnStart:true}")
   //public boolean fileScanOnStart;
   private final TaskPropertieBean taskPropertieBean;
   @PostConstruct
   public void init() {
      log.info("应用启动时执行初始化操作 @PostConstruct");
      String networkType = paramService.networkType();
      if(!ParamService.NETWORK_TYPE_SHEMI.equals(networkType)) {
         machineFileScanService.scanMachineFile();//启动执行一次扫描
         if(taskPropertieBean.isFileScanOnStart()) {
            machineFileScanService.scanMachineFile();
         }

         //工控网才启动文件监控
         log.info("工控网启动文件监控");
         initMachineDirMonitor();
      }else{

         //涉密网
         taskDispatchService.resetDrawingNos();
      }
   }

@@ -61,8 +74,8 @@
         addToWatchDirList(monitorInfoList,m);
      });
      for (WatchInfo info : monitorInfoList) {
         Path dirPath = Paths.get(info.getPath());
         try {
            Path dirPath = Paths.get(info.getPath());
            if(!dirPath.toFile().exists()) {
               dirPath.toFile().mkdirs();
            }