From 5b7fe884c1e128cd06a613acc62796d9d8d1c18b Mon Sep 17 00:00:00 2001 From: yiming Date: Tue, 19 Apr 2022 13:11:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=86=E8=A7=89=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E7=9A=84=E5=85=89=E6=BA=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhehekeji/web/controller/StreetController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java index d4ea78e..58e2e6b 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java @@ -12,6 +12,7 @@ import com.zhehekeji.web.service.LightSourceService; import com.zhehekeji.web.service.StreetService; import com.zhehekeji.web.service.damLightSource.JYDAMEquip; import com.zhehekeji.web.service.damLightSource.JYDamHelper; +import com.zhehekeji.web.service.hikLightSource.HikControlSocket; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -92,7 +93,7 @@ public class StreetController { equip.DisConnect(); }else if(configProperties.getLightSource().getType() == 2){ - + HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),1,1); } }); @@ -114,6 +115,8 @@ public class StreetController { JYDamHelper.closeDO(equip,obj.getInteger("index")); Integer status = JYDamHelper.ReadStatus(equip,obj.getInteger("num"),obj.getInteger("index")); log.info("ip:{},status:{}",lightSource.getIp(),status); + }else if(configProperties.getLightSource().getType() == 2){ + HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),1,0); } });