修改配置

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/RedissonConfig.java

 package com.yeejoin.amos.boot.biz.config;
 
+import com.sun.org.apache.regexp.internal.RE;
 import org.apache.commons.lang.StringUtils;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
@@ -24,7 +25,8 @@ public class RedissonConfig {
     @Autowired
     private RedisConfigProperties redisConfigProperties;
 
-    private volatile  static RedissonClient redissonClient;
+
+    private  volatile  static RedissonClient redissonClient;
     /**
      * 集群模式的 redisson 客户端
      *
@@ -33,6 +35,7 @@ public class RedissonConfig {
     @Bean
     @ConditionalOnProperty(name = "spring.redis.mode", havingValue = "cluster")
     public RedissonClient redissonClient() {
+
         //redisson版本是3.5，集群的ip前面要加上“redis://”，不然会报错，3.2版本可不加
         if(redissonClient==null){
             synchronized (RedissonConfig.class){
@@ -66,7 +69,6 @@ public class RedissonConfig {
             }
 
         }
-
         return redissonClient;
     }
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -246,7 +246,7 @@
         and ps.shift_id = ds.sequence_nbr
         and ps.duty_date = #{dutyDate}
         <if test="shiftId != null and shiftId != ''">
-            and ps.shift_id in (#{shiftId})
+            and ps.shift_id in (${shiftId})
         </if>
         order by instanceId desc
     </select>

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/controller/TimeLineController.java

@@ -97,7 +97,9 @@ public class TimeLineController extends AbstractBaseController{
         map.put("stepState",stepState);
         map.put("token",getToken());
         map.put("product",getProduct());
-        FireScheduled.getFireQueue().addLast(map);
+        map.put("appKey",getAppKey());
+        //fireScheduled.getFireQueue().addLast(map);
+        fireScheduled.runFireQueue(map);
         return CommonResponseUtil.success("SUCCESS");
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/scheduled/FireScheduled.java

@@ -13,16 +13,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
 @Component
 public class FireScheduled {
 
 	private static final Logger log = LoggerFactory.getLogger(FireScheduled.class);
-	
-	private static LinkedList<Map<String, String>> fireQueue = new LinkedList<>();
+
+//	private static LinkedList<Map<String, String>> fireQueue = new LinkedList<>();
     @Autowired
     IContingencyInstance iContingencyInstance;
 
@@ -33,87 +36,119 @@ public class FireScheduled {
 	@Value("${spring.redis.mode}")
 	private String cluster;
 
-	@Scheduled(cron = "*/2 * * * * ?")
-	public void runFireQueue() throws Exception {
-
-        if("cluster".equals(cluster)){
-
-		DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-		String time=format.format(new Date());
-		String jobName = "fas-1" + time;
-
-
-		RLock lock = redisson.getLock(jobName);
-		try {
-			//拿锁失败10停止尝试， 任务执行超时默认续30s 每个10秒续到30
-			lock.tryLock(10, TimeUnit.SECONDS);
-			System.out.println("获取锁成功============");
-			//为了防止重复
-			if (!redisUtils.hasKey(jobName + "_redisson_key")) {
-				redisUtils.set(jobName + "_redisson_key", "1");//
-
-
-				if (fireQueue.size() == 0)
-					return;
-
-				Map<String, String> map = fireQueue.getFirst();
-				String batchNo = map.get("batchNo");
-				String stepCode = map.get("stepCode");
-				String buttonCode = map.get("buttonCode");
-				String confirm = map.get("confirm");
-				String contingencyPlanId = map.get("contingencyPlanId");
-				String stepState = map.get("stepState");
-//		String token = map.get("token");
-//		String product = map.get("product");
-
-				log.info("fireQueue-size:" + fireQueue.size());
-				log.info("stepCode:" + map.get("stepCode"));
-				log.info("buttonCode:" + map.get("buttonCode"));
-				log.info("confirm:" + map.get("confirm"));
-				log.info("stepState:" + map.get("stepState"));
-//			RequestContext.setToken(token);
-//			RequestContext.setProduct(product);
-				iContingencyInstance.setButtonExecuted(batchNo, contingencyPlanId, buttonCode, confirm);
-				iContingencyInstance.fire(batchNo, stepCode, contingencyPlanId, buttonCode, confirm, stepState);
-			}
-		} catch (Exception e) {
-			throw e;
-		} finally {
-			fireQueue.removeFirst();
-			lock.unlock(); //释放锁
-
-		}
-		}else{
-
-			if (fireQueue.size() == 0)
-				return;
-
-			Map<String, String> map = fireQueue.getFirst();
+//	@Scheduled(cron = "*/2 * * * * ?")
+//	public void runFireQueue() throws Exception {
+//
+//        if("cluster".equals(cluster)){
+//
+//		DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+//		String time=format.format(new Date());
+//		String jobName = "fas-1" + time;
+//
+//
+//		RLock lock = redisson.getLock(jobName);
+//		try {
+//			//拿锁失败10停止尝试， 任务执行超时默认续30s 每个10秒续到30
+//			lock.tryLock(10, TimeUnit.SECONDS);
+//			System.out.println("获取锁成功============");
+//			//为了防止重复
+//			if (!redisUtils.hasKey(jobName + "_redisson_key")) {
+//				redisUtils.set(jobName + "_redisson_key", "1");//
+//
+//
+//				if (fireQueue.size() == 0)
+//					return;
+//
+//				Map<String, String> map = fireQueue.getFirst();
+//				String batchNo = map.get("batchNo");
+//				String stepCode = map.get("stepCode");
+//				String buttonCode = map.get("buttonCode");
+//				String confirm = map.get("confirm");
+//				String contingencyPlanId = map.get("contingencyPlanId");
+//				String stepState = map.get("stepState");
+////		String token = map.get("token");
+////		String product = map.get("product");
+//
+//				log.info("fireQueue-size:" + fireQueue.size());
+//				log.info("stepCode:" + map.get("stepCode"));
+//				log.info("buttonCode:" + map.get("buttonCode"));
+//				log.info("confirm:" + map.get("confirm"));
+//				log.info("stepState:" + map.get("stepState"));
+////			RequestContext.setToken(token);
+////			RequestContext.setProduct(product);
+//				iContingencyInstance.setButtonExecuted(batchNo, contingencyPlanId, buttonCode, confirm);
+//				iContingencyInstance.fire(batchNo, stepCode, contingencyPlanId, buttonCode, confirm, stepState);
+//			}
+//		} catch (Exception e) {
+//			throw e;
+//		} finally {
+//			fireQueue.removeFirst();
+//			lock.unlock(); //释放锁
+//
+//		}
+//		}else{
+//
+//			if (fireQueue.size() == 0)
+//				return;
+//
+//			Map<String, String> map = fireQueue.getFirst();
+//			String batchNo = map.get("batchNo");
+//			String stepCode = map.get("stepCode");
+//			String buttonCode = map.get("buttonCode");
+//			String confirm = map.get("confirm");
+//			String contingencyPlanId = map.get("contingencyPlanId");
+//			String stepState = map.get("stepState");
+////		String token = map.get("token");
+////		String product = map.get("product");
+//
+//			log.info("fireQueue-size:" + fireQueue.size());
+//			log.info("stepCode:" + map.get("stepCode"));
+//			log.info("buttonCode:" + map.get("buttonCode"));
+//			log.info("confirm:" + map.get("confirm"));
+//			log.info("stepState:" + map.get("stepState"));
+////			RequestContext.setToken(token);
+////			RequestContext.setProduct(product);
+//			iContingencyInstance.setButtonExecuted(batchNo, contingencyPlanId, buttonCode, confirm);
+//			iContingencyInstance.fire(batchNo, stepCode, contingencyPlanId, buttonCode, confirm, stepState);
+//		}
+//	}
+//	public static LinkedList<Map<String, String>> getFireQueue() {
+//		return fireQueue;
+//	}
+//	public static void setFireQueue(LinkedList<Map<String, String>> fireQueue) {
+//		FireScheduled.fireQueue = fireQueue;
+//	}
+
+
+
+
+
+    @Async
+	public void runFireQueue(Map<String, String> map) throws Exception {
 			String batchNo = map.get("batchNo");
 			String stepCode = map.get("stepCode");
 			String buttonCode = map.get("buttonCode");
 			String confirm = map.get("confirm");
 			String contingencyPlanId = map.get("contingencyPlanId");
 			String stepState = map.get("stepState");
-//		String token = map.get("token");
-//		String product = map.get("product");
-
-			log.info("fireQueue-size:" + fireQueue.size());
+		    String token = map.get("token");
+		    String product = map.get("product");
+		    String appKey = map.get("appKey");
 			log.info("stepCode:" + map.get("stepCode"));
 			log.info("buttonCode:" + map.get("buttonCode"));
 			log.info("confirm:" + map.get("confirm"));
 			log.info("stepState:" + map.get("stepState"));
-//			RequestContext.setToken(token);
-//			RequestContext.setProduct(product);
+			RequestContext.setToken(token);
+			RequestContext.setProduct(product);
+		    RequestContext.setProduct(appKey);
 			iContingencyInstance.setButtonExecuted(batchNo, contingencyPlanId, buttonCode, confirm);
 			iContingencyInstance.fire(batchNo, stepCode, contingencyPlanId, buttonCode, confirm, stepState);
-		}
-	}
-	public static LinkedList<Map<String, String>> getFireQueue() {
-		return fireQueue;
-	}
-	public static void setFireQueue(LinkedList<Map<String, String>> fireQueue) {
-		FireScheduled.fireQueue = fireQueue;
+
 	}
 
+
+
+
+
+
 }