From e71795cf778f35614150b852566929501d5e5bf2 Mon Sep 17 00:00:00 2001 From: wenjy Date: Fri, 10 Feb 2023 14:29:53 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=AE=B1=E5=A3=B3=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=9C=8B=E6=9D=BFOEE=E6=95=B0=E6=8D=AE=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/productionboard/config/InterceptorConfig.java | 2 +- .../service/impl/TankShellDeviceInfoServiceImpl.java | 2 +- productionboard/src/main/resources/application.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/productionboard/src/main/java/com/productionboard/config/InterceptorConfig.java b/productionboard/src/main/java/com/productionboard/config/InterceptorConfig.java index 2f44efc..58b20bb 100644 --- a/productionboard/src/main/java/com/productionboard/config/InterceptorConfig.java +++ b/productionboard/src/main/java/com/productionboard/config/InterceptorConfig.java @@ -10,6 +10,6 @@ public class InterceptorConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(new AInterceptor()).addPathPatterns("/**"); + //registry.addInterceptor(new AInterceptor()).addPathPatterns("/**"); } } diff --git a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java index b974e2c..b33adb7 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java +++ b/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java @@ -127,7 +127,7 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi if(tankShellDeviceDataInformation != null){ result[4] = tankShellDeviceDataInformation.getRunTime(); result[5] = tankShellDeviceDataInformation.getStopTime(); - result[6] = tankShellDeviceDataInformation.getDeviceOee() + "%"; + result[6] = tankShellDeviceDataInformation.getDeviceOee() == null ?"0": tankShellDeviceDataInformation.getDeviceOee()+ "%"; result[7] = tankShellDeviceDataInformation.getCount()+""; result[8] = tankShellDeviceDataInformation.getLossTime(); result[9] = tankShellDeviceDataInformation.getDeviceTakt(); diff --git a/productionboard/src/main/resources/application.yml b/productionboard/src/main/resources/application.yml index bea2bcb..142f6dd 100644 --- a/productionboard/src/main/resources/application.yml +++ b/productionboard/src/main/resources/application.yml @@ -12,6 +12,6 @@ mybatis-plus: mapper-locations: classpath*:/mapper/**Mapper.xml server: - port: 6069 + port: 6070 -in_id: 1 \ No newline at end of file +in_id: 2 \ No newline at end of file