From 62614e21d35b35c2972c503413b8982078648364 Mon Sep 17 00:00:00 2001 From: qiushui Date: Tue, 4 Jan 2022 19:37:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=89=88=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/main/java/com/zhehekeji/web/service/PlcService.java | 6 +++++- web/src/main/resources/application-dev.yml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index d953c75..4575181 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -64,7 +64,11 @@ public class PlcService { private static String originalPoint = "C6"; public Integer plcStatus() { - Integer count = streetMapper.selectCount(new QueryWrapper<>()); + Integer count = 1; + if(configProperties.getServerMode() == 0){ + count = streetMapper.selectCount(new QueryWrapper<>()); + } + List connIds = StreetConn.connList(); return (count - connIds.size()); } diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index 589c81c..e2e057e 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -27,7 +27,7 @@ userUrl: http://115.236.65.98:11001 # ----默认摄像头的连接信息 cameraConfig: # ------------球機選擇--- 0:中威 1：海康 - cameraType: 1 + cameraType: 0 cameraPassword: a1234567 cameraUser: admin cameraPort: 37777