抽取获取接口地址方法到工具类

signal-utc-service/src/main/java/net/wanji/utc/config/ymldata/SignalManufacturerHkConfig.java

+package net.wanji.utc.config.ymldata;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Kent HAN
+ * @date 2022/11/29 15:30
+ */
+@ConfigurationProperties(prefix = "signal.manufacturer.hk")
+@Component
+@Data
+public class SignalManufacturerHkConfig {
+    private String artemisPath;
+}

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/impl/HkCrossInfoServiceImpl.java

@@ -8,7 +8,6 @@ import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import net.wanji.utc.common.commonentity.HttpRequest;
 import net.wanji.utc.common.constant.Constants;
 import net.wanji.utc.common.typeenum.BasicEnum;
 import net.wanji.utc.mapper.CrossInfoMapper;
@@ -16,12 +15,11 @@ import net.wanji.utc.mapper.ManufacturerInfoMapper;
 import net.wanji.utc.po.CrossInfoPO;
 import net.wanji.utc.po.ManufacturerInfoPO;
 import net.wanji.utc.service.staticinfo.HkCrossInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
+import net.wanji.utc.util.PathUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -32,8 +30,6 @@ import java.util.Map;
 @Service
 @RequiredArgsConstructor
 public class HkCrossInfoServiceImpl implements HkCrossInfoService {
-    @Value("${signal.manufacturer.hk.artemisPath}")
-    private String artemisPath;
 
     private final ArtemisConfig artemisConfig;
     private final CrossInfoMapper crossInfoMapper;
@@ -44,7 +40,7 @@ public class HkCrossInfoServiceImpl implements HkCrossInfoService {
         List<CrossInfoPO> res = new ArrayList<>();
         try{
             // key如"http://"，value如"/artemis/api/itscms-scms/v1/crossinfo/hkCrossBasicInfo"
-            Map<String, String> path = getPathMapByApiCode("crossBasicInfo");
+            Map<String, String> path = PathUtil.getPathMapByApiCode("crossBasicInfo");
             JSONObject requestContent = new JSONObject();
             // 海康固定入参字段名
             requestContent.put("pageNo", 1);
@@ -96,12 +92,4 @@ public class HkCrossInfoServiceImpl implements HkCrossInfoService {
         }
         return res;
     }
-
-    private Map<String, String> getPathMapByApiCode(String apiCode) {
-        Map<String, String> res = new HashMap<>();
-        HttpRequest httpRequest = new HttpRequest(BasicEnum.ManufacturerEnum.HK.getCode(), apiCode);
-        res.put("http://", artemisPath + httpRequest.getUrl());
-        return res;
-    }
-
 }

signal-utc-service/src/main/java/net/wanji/utc/util/PathUtil.java

+package net.wanji.utc.util;
+
+import net.wanji.utc.common.commonentity.HttpRequest;
+import net.wanji.utc.common.typeenum.BasicEnum;
+import net.wanji.utc.config.ymldata.SignalManufacturerHkConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Kent HAN
+ * @date 2022/11/29 15:26
+ */
+@Component
+public class PathUtil {
+    private static SignalManufacturerHkConfig signalManufacturerHkConfig;
+
+    @Autowired
+    public void setSignalManufacturerHkConfig(SignalManufacturerHkConfig signalManufacturerHkConfig) {
+        PathUtil.signalManufacturerHkConfig = signalManufacturerHkConfig;
+    }
+
+    public static Map<String, String> getPathMapByApiCode(String apiCode) {
+        Map<String, String> res = new HashMap<>();
+        HttpRequest httpRequest = new HttpRequest(BasicEnum.ManufacturerEnum.HK.getCode(), apiCode);
+        String artemisPath = signalManufacturerHkConfig.getArtemisPath();
+        res.put("http://", artemisPath + httpRequest.getUrl());
+        return res;
+    }
+}

signal-utc-service/src/main/java/net/wanji/utc/vo/systemadmin/CrossInfoListOutVO.java

@@ -30,8 +30,8 @@ public class CrossInfoListOutVO {
     /** 信号机端口 */
     @ApiModelProperty(value = "信号机端口",notes = "")
     private Integer port ;
-    /** 经纬度 */
-    @ApiModelProperty(value = "经纬度",notes = "")
+    /** 安装位置 */
+    @ApiModelProperty(value = "安装位置",notes = "")
     private String location ;
     /** 版本号 */
     @ApiModelProperty(value = "版本号",notes = "")