通过厂商ID获取厂商code

signal-utc-service/pom.xml

@@ -149,6 +149,12 @@
             <groupId>com.hikvision</groupId>
             <artifactId>artemis-sdk</artifactId>
         </dependency>
+        <!-- 配置类处理器 -->
+        <dependency>
+           <groupId>org.springframework.boot</groupId>
+           <artifactId>spring-boot-configuration-processor</artifactId>
+           <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -14,8 +14,11 @@ import net.wanji.utc.common.typeenum.BasicEnum;
 import net.wanji.utc.entity.SignalRunring;
 import net.wanji.utc.mapper.CrossInfoMapper;
 import net.wanji.utc.mapper.CrossPhaseMapper;
+import net.wanji.utc.mapper.ManufacturerApiInfoMapper;
+import net.wanji.utc.mapper.ManufacturerInfoMapper;
 import net.wanji.utc.po.CrossInfoPO;
 import net.wanji.utc.po.CrossPhasePO;
+import net.wanji.utc.po.ManufacturerInfoPO;
 import net.wanji.utc.service.control.ControlCommandService;
 import net.wanji.utc.service.runninginfo.HkLightsStatusService;
 import net.wanji.utc.util.FieldUtil;
@@ -60,6 +63,9 @@ public class HKControlCommandServiceImpl implements ControlCommandService {
     @Resource
     private CrossInfoMapper crossInfoMapper;
 
+    @Resource
+    private ManufacturerInfoMapper manufacturerInfoMapper;
+
     @Override
     public <T> Result<T> schemeSend() {
         return null;
@@ -298,7 +304,9 @@ public class HKControlCommandServiceImpl implements ControlCommandService {
             throw new ControlException(BODY_NOT_MATCH.getResultCode(), "参数错误，信号机ID不正确。");
         }
         Integer manufacturerId = crossInfoPo.getManufacturerId();
-        if (manufacturerId.equals(BasicEnum.ManufacturerEnum.HK.getCode())) {
+        ManufacturerInfoPO manufacturerInfoPO = manufacturerInfoMapper.selectById(manufacturerId);
+        String manufacturerCode = manufacturerInfoPO.getCode();
+        if (manufacturerCode.equals(BasicEnum.ManufacturerEnum.HK.getCode())) {
             Integer runningMode = command.equals(TRUE) ? commandType : NORMAL_RUNNING_CONTROL;
             return controlSignal(code, runningMode);
         } else {

signal-utc-service/src/main/java/net/wanji/utc/common/task/ApiInfoTask.java → signal-utc-service/src/main/java/net/wanji/utc/task/ApiInfoTask.java

-package net.wanji.utc.common.task;
+package net.wanji.utc.task;
 
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.utc.common.constant.Constants;