asda

src/main/java/com/steerinfo/dil/service/impl/QmsQueueResultServiceImpl.java

@@ -16,6 +16,8 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.math.BigDecimal;
 
+import static sun.security.krb5.Confounder.intValue;
+
 /**
  * QmsQueueResult服务实现：
  * @author generator
@@ -99,7 +101,7 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
             judgeCancelSub(capacityNumber); //判断是否需要取消订阅
             return -1;
         }else{
-            if(DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() != 1){
+            if(DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() != 1 && DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() != 4){
                 judgeCancelSub(capacityNumber); //判断是否需要取消订阅
                 return -3; //非钢材订单不添加排队
             }

src/main/java/com/steerinfo/dil/service/impl/QueueDealWithAsync.java

@@ -5,6 +5,7 @@ import com.steerinfo.dil.mapper.QmsQueueSpellingListMapper;
 import com.steerinfo.dil.mapper.QueuingRulesMapper;
 import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
@@ -27,6 +28,7 @@ public class QueueDealWithAsync {
     @Autowired
     private QmsQueueListMapper qmsQueueListMapper;
 
+    @Lazy
     @Autowired
     private QmsQueueSpellingListMapper qmsQueueSpellingListMapper;
 
@@ -86,7 +88,6 @@ public class QueueDealWithAsync {
      */
     @Async("taskExecutor")
     public void dealWithThree(long nowTime){
-
         List<Map<String, Object>> listMap = queuingRulesMapper.getAllNotSureEnFactoryList();
         for (Map<String, Object> map : listMap) {
             if((nowTime - ((Date) map.get("insertTime")).getTime()) > 86400000){

src/main/resources/application-prod.yml

@@ -3,9 +3,7 @@ spring:
       url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
       password: Dil123789
       username: dil
-      driver-class-name: oracle.jdbc.
-      druid:
-        max-active: 20
+      driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-trick-queue-prod
 

src/main/resources/bootstrap.yml

@@ -39,10 +39,14 @@ redis:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
+
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
+    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
+    fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+
 
   instance:
-    prefer-ip-address: true
+    prefer-ip-address: false
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}