|
|
|
|
@ -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);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|