Browse Source

bug修复

Hu Jie 7 years ago
parent
commit
324cf48452

+ 11 - 20
src/main/java/com/uas/erp/schedular/init/ReplyInitializer.java

@@ -2,23 +2,12 @@ package com.uas.erp.schedular.init;
 
 import com.uas.erp.schedular.entity.MasterTaskConfigEntity;
 import com.uas.erp.schedular.repository.MasterTaskConfigRepository;
-import com.uas.erp.schedular.service.ScheduledTaskService;
-import com.uas.erp.schedular.task.support.TaskConfig;
-import com.uas.erp.schedular.task.support.TaskMapping;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import java.lang.reflect.Method;
+import org.springframework.util.CollectionUtils;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Created by Pro1 on 2017/7/26.
@@ -26,20 +15,22 @@ import java.util.Set;
 @Component
 public class ReplyInitializer implements CommandLineRunner {
 
-
-    @Autowired
-    private ScheduledTaskService scheduledTaskService;
-
     @Autowired
     private MasterTaskConfigRepository masterTaskConfigRepository;
 
     @Override
     public void run(String... strings) throws Exception {
-        MasterTaskConfigEntity entity = masterTaskConfigRepository
+        List<MasterTaskConfigEntity> entity = masterTaskConfigRepository
                 .findByBeanNameAndMethodName("purchaseTask", "uploadPurchaseReply");
-        if (!StringUtils.isEmpty(entity)) {
-            entity.setEnabled(false);
-            masterTaskConfigRepository.save(entity);
+        List<MasterTaskConfigEntity> entities = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(entity)) {
+            for (MasterTaskConfigEntity configEntity : entity) {
+                configEntity.setEnabled(false);
+                entities.add(configEntity);
+            }
+        }
+        if (!CollectionUtils.isEmpty(entities)) {
+            masterTaskConfigRepository.save(entities);
         }
     }
 }

+ 1 - 1
src/main/java/com/uas/erp/schedular/repository/MasterTaskConfigRepository.java

@@ -34,6 +34,6 @@ public interface MasterTaskConfigRepository extends JpaRepository<MasterTaskConf
 
     List<MasterTaskConfigEntity> findByMasterNameAndModule(String masterName, String module);
 
-    MasterTaskConfigEntity findByBeanNameAndMethodName(String beanName, String methodName);
+    List<MasterTaskConfigEntity> findByBeanNameAndMethodName(String beanName, String methodName);
 
 }