Explorar o código

新增验证接口

zhangqiankun %!s(int64=3) %!d(string=hai) anos
pai
achega
6fa3ab602a

+ 7 - 0
src/main/java/com/persagy/controller/HelloWorld.java

@@ -18,6 +18,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.persagy.cache.AlarmInfoCache;
 import com.persagy.constant.CommonConst;
 import com.persagy.entity.AlarmDefine;
+import com.persagy.entity.AlarmState;
 import com.persagy.entity.NettyMessage;
 import com.persagy.entity.ZktAlarmRecordDO;
 import com.persagy.netty.client.NettyClient;
@@ -136,6 +137,12 @@ public class HelloWorld {
         }
         return new HashMap<>();
     }
+    
+    @PostMapping("/test5")
+    public AlarmState getAlarmState(@RequestBody JSONObject jsonObject) throws Exception {
+    	String defineId = AlarmInfoCache.getAlarmDefineId(jsonObject);
+    	return AlarmInfoCache.getAlarmState(defineId);
+    }
 
 }
 

+ 0 - 1
src/main/java/com/persagy/netty/client/CenterClientHandler.java

@@ -187,7 +187,6 @@ public class CenterClientHandler extends SimpleChannelInboundHandler<NettyMessag
 
     }
 
-
     @Override
     public void channelUnregistered(final ChannelHandlerContext ctx) throws Exception {
         log.info("channelUnregistered and reconnecting to: {}:{} ", RECONNECT_DELAY, CommonConst.alarmHost, CommonConst.alarmPort);

+ 1 - 1
src/main/java/com/persagy/service/impl/AlarmHandleServiceImpl.java

@@ -400,7 +400,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
             zktAlarmRecordDO.setObjId(alarmDefine.getObjId());
             zktAlarmRecordDO.setItemCode(alarmDefine.getItemCode());
             zktAlarmRecordDO.setItemId(alarmDefine.getItemId());
-            zktAlarmRecordDO.setState("1");
+            zktAlarmRecordDO.setState(AlarmState.State.NOT_DEAL.getType());
             zktAlarmRecordDO.setAlarmTime(alarmState.getAlarmStartTime());
             zktAlarmRecordDO.setProjectId(alarmDefine.getProjectId());
             alarmRecordRepository.save(zktAlarmRecordDO);

+ 2 - 2
src/main/resources/application-XGPj5001120003.yml

@@ -12,9 +12,9 @@ remote:
     # 推送消息时,是否会开启压缩,true-压缩 false-不压缩
     compress: false
     # 需要更改
-    host: 192.168.100.102
+    host: 192.168.0.27
     # 需要更改
-    port: 30050
+    port: 8836
 
   # IOT程序
   iot: