[update] 修改海康平台配置

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

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author Kent HAN
@@ -45,6 +46,10 @@ public class HkRunningStatusServiceImpl implements HkRunningStatusService {
                 String strResult = ArtemisHttpUtil.doPostStringArtemis(artemisConfig, runningPath, jsonBody.toJSONString(),
                         null, null, "application/json", null);
                 JSONObject object = JSON.parseObject(strResult);
+                Object o = object.get("code");
+                if (!Objects.equals(o, 0)) {
+                    continue;
+                }
                 if (Constants.HK_SUCCESS_CODE.equals(object.getInteger(Constants.HK_CODE_KEY))) {
                     JSONArray data = object.getJSONArray("data");
                     for (int i = 0; i < data.size(); i++) {

signal-utc-service/src/main/java/net/wanji/utc/task/SignalStatusTask.java

@@ -3,7 +3,6 @@ package net.wanji.utc.task;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import lombok.extern.slf4j.Slf4j;
-import net.wanji.utc.entity.SignalRunring;
 import net.wanji.utc.po.SignalStatusLogPO;
 import net.wanji.utc.service.runninginfo.SignalStatusService;
 import net.wanji.utc.vo.LightsStatusVO;
@@ -12,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -31,13 +29,13 @@ public class SignalStatusTask {
     SignalStatusService signalStatusService;
 
     // 运行状态、告警，5分钟一次
-    @Scheduled(fixedRate = 5 * 60 * 1000)
+    @Scheduled(fixedRate = 1 * 60 * 1000)
     public void runningStatusAlarm() {
         List<SignalStatusLogPO> signalStatusLogPOS = signalStatusService.runningStatusAlarm();
     }
 
     // 灯态，5秒一次
-    @Scheduled(fixedRate = 5 * 1000)
+    @Scheduled(fixedRate = 1 * 60 * 1000)
     public void lightStatus() {
         try {
 
@@ -46,21 +44,20 @@ public class SignalStatusTask {
                 for (Map.Entry<String, RealTimeDataWebSocket> entry : evenWarnWebSocketMap.entrySet()) {
                     String crossId = entry.getKey();
                     RealTimeDataWebSocket webSocket = entry.getValue();
+                    List<LightsStatusVO> lightsStatusVOS = signalStatusService.lightStatus();
 
-                    List<LightsStatusVO> lightsStatusVOS = new ArrayList<>();
-//                    signalStatusService.lightStatus();
-
-                    LightsStatusVO lightsStatusVO = new LightsStatusVO();
-                    lightsStatusVO.setRunMode("4");
-                    lightsStatusVO.setControlMode("22"); // 闪光
-
-                    List<SignalRunring> runrings = new ArrayList<>();
-                    SignalRunring signalRunring = new SignalRunring();
-                    signalRunring.setLampStatus(22);
-                    runrings.add(signalRunring);
-
-                    lightsStatusVO.setRunrings(runrings);
-                    lightsStatusVOS.add(lightsStatusVO);
+//                    List<LightsStatusVO> lightsStatusVOS = new ArrayList<>();
+//                    LightsStatusVO lightsStatusVO = new LightsStatusVO();
+//                    lightsStatusVO.setRunMode("4");
+//                    lightsStatusVO.setControlMode("22"); // 闪光
+//
+//                    List<SignalRunring> runrings = new ArrayList<>();
+//                    SignalRunring signalRunring = new SignalRunring();
+//                    signalRunring.setLampStatus(22);
+//                    runrings.add(signalRunring);
+//
+//                    lightsStatusVO.setRunrings(runrings);
+//                    lightsStatusVOS.add(lightsStatusVO);
 
                     webSocket.sendInfo(JSONObject.toJSONString(lightsStatusVOS, SerializerFeature.WriteMapNullValue), crossId);
                 }

signal-utc-service/src/main/resources/application-dev.yml

@@ -40,10 +40,10 @@ signal:
   manufacturer:
     hk:
       # 服务地址
-      artemisHost: 10.100.1.101
+      artemisHost: 10.100.4.30
       # 接口服务验证用户名
-      artemisAppKey: 21560443
+      artemisAppKey: 21882146
       # 接口服务验证密钥
-      artemisAppSecret: 5z0O0DRKALWyIxdQU4kp
+      artemisAppSecret: iYwMHJSo7CAX62TjyGEb
       # 海康能力开放平台的网站路径
       artemisPath: /artemis