bug修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -9,6 +9,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.Result;
@@ -19,7 +21,11 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import com.yeejoin.amos.patrol.business.service.intfc.*;
+import com.yeejoin.amos.patrol.business.util.*;
+import com.yeejoin.amos.patrol.core.async.TaskExecutorPoolConfig;
 import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
+import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,18 +48,6 @@ import com.yeejoin.amos.patrol.business.dto.CheckDto;
 import com.yeejoin.amos.patrol.business.param.CheckInfoPageParam;
 import com.yeejoin.amos.patrol.business.param.CheckRecordParam;
 import com.yeejoin.amos.patrol.business.param.CheckStatisticalParam;
-import com.yeejoin.amos.patrol.business.service.intfc.ICheckService;
-import com.yeejoin.amos.patrol.business.service.intfc.IPlanTaskService;
-import com.yeejoin.amos.patrol.business.service.intfc.IPointService;
-import com.yeejoin.amos.patrol.business.service.intfc.ISafety3DDataSendService;
-import com.yeejoin.amos.patrol.business.util.CheckPageParamUtil;
-import com.yeejoin.amos.patrol.business.util.CheckParamUtil;
-import com.yeejoin.amos.patrol.business.util.CommonResponse;
-import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
-import com.yeejoin.amos.patrol.business.util.DaoCriteria;
-import com.yeejoin.amos.patrol.business.util.FileHelper;
-import com.yeejoin.amos.patrol.business.util.Toke;
-import com.yeejoin.amos.patrol.business.util.ToolUtils;
 import com.yeejoin.amos.patrol.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.patrol.business.vo.CheckInfoVo;
 import com.yeejoin.amos.patrol.common.enums.PlanTaskFinishStatusEnum;
@@ -62,6 +56,8 @@ import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
 import com.yeejoin.amos.patrol.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.patrol.core.common.response.GraphInitDataResponse;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
 import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import com.yeejoin.amos.patrol.core.util.DateUtil;
 import com.yeejoin.amos.patrol.core.util.StringUtil;
@@ -93,6 +89,12 @@ public class CheckController extends AbstractBaseController {
     @Autowired
     private ISafety3DDataSendService is;
 
+    @Autowired
+    private RemoteSecurityService remoteSecurityService;
+
+    @Autowired
+    private IMessageService messageService;
+
     @Value("${windows.img.path}")
     private String winImgPath;
 
@@ -240,7 +242,21 @@ public class CheckController extends AbstractBaseController {
 
                 CheckDto checkDto = checkService.saveCheckRecordNew(requestParam,token);
                 if(StringUtil.isNotEmpty(checkDto)){
-                    asyncTaskf(checkDto.getCheckId());
+
+                    RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+                    CompletableFuture<Void> getAddressTask = CompletableFuture.runAsync(() -> {
+                        // 解决异步任务拿不到ThreadLocal里的数据
+                        RequestContextHolder.setRequestAttributes(requestAttributes);
+                        // asyncTaskf(checkDto.getCheckId());
+                        try {
+                            asyncTask.pushCheckInfoTo3D(checkDto.getCheckId());
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                        Toke  toke=  remoteSecurityService.getServerToken();
+                        messageService.pushCheckMessage(toke.getToke(),toke.getProduct(),toke.getAppKey(),checkDto.getCheckId());
+                    });
+
                 }
                 is.pointCheckInfoPushToB(checkDto.getCheckId());
                 //数字换流站页面刷新

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/FeignBasicAuthRequestInterceptor.java

@@ -28,11 +28,11 @@ public class FeignBasicAuthRequestInterceptor implements RequestInterceptor {
             token = request.getHeader("X-Access-Token");
         }
 
-        String product = request.getHeader("product");
-        String appKey = request.getHeader("appKey");
+        template.header("X-Access-Token", token);
         template.header("token", token);
-        template.header("product", product);
-        template.header("appKey", appKey);
+        template.header("appKey", request.getHeader("appKey"));
+        template.header("product", request.getHeader("product"));
+        template.header("clientType", "feignClient");
     }
 
 }

amos-boot-utils/amos-boot-utils-message/src/main/resources/application-dev.properties

 #注册中心地址
-eureka.client.service-url.defaultZone =http://172.16.11.201:10001/eureka/
+eureka.client.service-url.defaultZone =http://172.16.10.215:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
@@ -14,6 +14,7 @@ spring.kafka.bootstrap-servers=172.16.3.100:9092
 # 生产者配置
 # 设置大于0的值，则客户端会将发送失败的记录重新发送  # 重试次数
 spring.kafka.producer.retries=1
+spring.kafka.producer.bootstrap-servers=172.16.10.215:9092
 #16K
 spring.kafka.producer.batch-size=16384
 spring.kafka.producer.buffer-memory=33554432
@@ -41,6 +42,7 @@ spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.Str
 # latest:重置为分区中最新的offset(消费分区中新产生的数据)
 # none:只要有一个分区不存在已提交的offset,就抛出异常
 spring.kafka.consumer.group-id=zhTestGroup
+spring.kafka.consumer.bootstrap-servers=172.16.10.215:9092
 spring.kafka.consumer.enable-auto-commit=false
 # 当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，从头开始消费
 #      # 自动提交的频率 单位 ms
@@ -72,7 +74,7 @@ management.health.redis.enabled=false
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.11.201:1883
+emqx.broker=tcp://172.16.10.215:1883
 emqx.client-user-name=admin
 emqx.client-password=public
 emqx.max-inflight=1000
@@ -81,7 +83,7 @@ emqx.max-inflight=1000
 # 下面个配置默认站端  中心级系统的时候注释掉上边 放开下边
 #站端配置
 #需要监听得kafka消息主题 根据是否是中心极和站端选择需要监听得主题进行配置
-kafka.topics=null.topic
+kafka.topics=null
 
 #需要监听得eqm消息主题 根据是否是中心极和站端选择需要监听得主题进行配置 emq.iot.created,
 emq.topic=emq.xf.created,emq.iot.created,emq.patrol.created,emq.sign.created,emq.bussSign.created,emq.user.created