模拟agv回调测试接口改成动态

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/externalApi/service/AgvHikOrderDetailInfoService.java

@@ -5,10 +5,6 @@ import com.github.zuihou.base.service.SuperCacheService;
 import com.github.zuihou.business.externalApi.entity.AgvHikOrderDetailInfo;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Future;
-
 /**
  * <p>
  * 业务接口
@@ -39,6 +35,6 @@ public interface AgvHikOrderDetailInfoService extends SuperCacheService<AgvHikOr
     /**
      * 异步调用，有返回值
      */
-    void asyncCallbackTask(String data);
+    void asyncCallbackTask(String data,String agvCallbackUrl);
 
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/externalApi/service/impl/AgvHikOrderDetailInfoServiceImpl.java

@@ -3,14 +3,12 @@ package com.github.zuihou.business.externalApi.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.zuihou.authority.dao.common.ParameterMapper;
 import com.github.zuihou.authority.service.common.ParameterService;
 import com.github.zuihou.base.service.SuperCacheServiceImpl;
 import com.github.zuihou.business.externalApi.dao.AgvHikOrderDetailInfoMapper;
 import com.github.zuihou.business.externalApi.entity.AgvHikOrderDetailInfo;
 import com.github.zuihou.business.externalApi.service.AgvHikOrderDetailInfoService;
 import com.github.zuihou.common.constant.CacheKey;
-import com.github.zuihou.common.constant.ParameterKey;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.injection.annonation.InjectionResult;
 import com.github.zuihou.utils.BeanPlusUtil;
@@ -25,10 +23,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Map;
-import java.util.Random;
-import java.util.concurrent.Future;
 
 /**
  * <p>
@@ -46,8 +40,6 @@ public class AgvHikOrderDetailInfoServiceImpl extends SuperCacheServiceImpl<AgvH
 
     @Resource
     private RestTemplate restTemplate;
-    @Autowired
-    private ParameterService parameterService;
 
     @Override
     protected String getRegion() {
@@ -78,7 +70,7 @@ public class AgvHikOrderDetailInfoServiceImpl extends SuperCacheServiceImpl<AgvH
 
     @Override
     @Async
-    public void asyncCallbackTask(String data){
+    public void asyncCallbackTask(String data,String agvCallbackUrl){
         // sleep10秒
         log.info("异步模拟agv回到参数data=",data);
         try {
@@ -103,7 +95,7 @@ public class AgvHikOrderDetailInfoServiceImpl extends SuperCacheServiceImpl<AgvH
 
             HttpEntity<String> formEntity = new HttpEntity<String>(jsonObject.toJSONString(),headers);
             log.info("agv模拟回到参数：{}", jsonObject.toJSONString());
-            String returnData = restTemplate.postForObject(parameterService.getValue("agvCallbackUrl", null),formEntity, String.class);
+            String returnData = restTemplate.postForObject(agvCallbackUrl,formEntity, String.class);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/externalApi/service/impl/AgvHikOrderInfoServiceImpl.java

@@ -10,14 +10,10 @@ import com.github.zuihou.authority.service.common.ParameterService;
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.service.SuperCacheServiceImpl;
 import com.github.zuihou.business.externalApi.dao.AgvHikOrderInfoMapper;
-import com.github.zuihou.business.externalApi.dao.AgvOrderInfoMapper;
 import com.github.zuihou.business.externalApi.entity.AgvHikOrderDetailInfo;
 import com.github.zuihou.business.externalApi.entity.AgvHikOrderInfo;
-import com.github.zuihou.business.externalApi.entity.AgvOrderDetailInfo;
-import com.github.zuihou.business.externalApi.entity.AgvOrderInfo;
 import com.github.zuihou.business.externalApi.service.AgvHikOrderDetailInfoService;
 import com.github.zuihou.business.externalApi.service.AgvHikOrderInfoService;
-import com.github.zuihou.business.externalApi.service.AgvOrderInfoService;
 import com.github.zuihou.common.constant.BizConstant;
 import com.github.zuihou.common.constant.CacheKey;
 import com.github.zuihou.common.constant.ParameterKey;
@@ -25,7 +21,6 @@ import com.github.zuihou.common.util.UniqueKeyGenerator;
 import com.github.zuihou.context.BaseContextHandler;
 import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
-import com.github.zuihou.injection.annonation.InjectionResult;
 import com.github.zuihou.utils.BeanPlusUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -34,7 +29,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
@@ -147,7 +141,11 @@ public class AgvHikOrderInfoServiceImpl extends SuperCacheServiceImpl<AgvHikOrde
         jsonObject.put("positionCodePath",positionCodePath.toJSONString());
         jsonObject.put("taskCode",taskCode);
         HttpEntity<String> addAgvTaskRequest = new HttpEntity<String>(jsonObject.toJSONString(), headers);
-        agvHikOrderDetailInfoService.asyncCallbackTask(jsonObject.toJSONString());
+
+        String agvCallbackUrl = parameterService.getValue(ParameterKey.AGVCALLBACKURL, null);
+
+
+        agvHikOrderDetailInfoService.asyncCallbackTask(jsonObject.toJSONString(),agvCallbackUrl);
 //        ResponseEntity<String> addAgvTaskEntity = restTemplate.postForEntity(addAgvTaskUrl, addAgvTaskRequest, String.class);
 
 //        String retData = addAgvTaskEntity.getBody();

imcs-admin-boot/imcs-common/src/main/java/com/github/zuihou/common/constant/ParameterKey.java

@@ -57,6 +57,7 @@ public interface ParameterKey {
     String STATION_GA_SWITCH_FLAG = "stationGaSwitchFlag";
     // AGV下达任务请求地址
     String PARAMETERS = "parameters";
+    String AGVCALLBACKURL = "agvCallbackUrl";
 
 
 }