From 2b3b9fbdd5eb112062e6a6720afbafc5fb596185 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 18 Jun 2024 15:19:09 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=A2=84=E6=B5=8B?= =?UTF-8?q?=E5=87=BA=E7=8E=B0null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HistoryDataPreServiceImpl.java | 3 +++ .../src/main/resources/application-prod.yml | 20 +++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/user-service/src/main/java/com/mh/user/service/impl/HistoryDataPreServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/HistoryDataPreServiceImpl.java index 4072c97..24446a4 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/HistoryDataPreServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/HistoryDataPreServiceImpl.java @@ -74,6 +74,9 @@ public class HistoryDataPreServiceImpl implements HistoryDataPreService { @Override public void startTrainData(String buildingId) throws Exception { List trainData = historyDataPreMapper.getTrainData(buildingId); + if (trainData == null || trainData.size() == 0) { + return; + } List historyDataPreList = new ArrayList<>(); for (HistoryDataPre dataPre : trainData) { historyDataPreList.add(convert(dataPre)); diff --git a/user-service/src/main/resources/application-prod.yml b/user-service/src/main/resources/application-prod.yml index b8b46cf..f013158 100644 --- a/user-service/src/main/resources/application-prod.yml +++ b/user-service/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 8762 #8761创新、8762广商、8763华厦、广州理工 + port: 8763 #8761创新、8762广商、8763华厦、广州理工 spring: application: name: user-service @@ -14,10 +14,10 @@ spring: # password: mh@803 ## url: jdbc:sqlserver://120.25.220.177:32012;DatabaseName=M_CHWS;allowMultiQueries=true #阿里云服务器-广州理工 -# url: jdbc:sqlserver://120.25.220.177:32012;DatabaseName=CHWS;allowMultiQueries=true -# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -# username: test -# password: minghan123456@ + url: jdbc:sqlserver://111.230.50.186:32012;DatabaseName=CHWS;allowMultiQueries=true + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + username: test + password: minghan123456@ #华厦云服务器 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=CHWS;allowMultiQueries=true # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver @@ -28,11 +28,11 @@ spring: # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # username: chws # password: mh@803 - #广商服务器 - url: jdbc:sqlserver://119.29.33.133:2008;DatabaseName=chws_gsh;allowMultiQueries=true - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - username: chws - password: mh@803 +# #广商服务器 +# url: jdbc:sqlserver://119.29.33.133:2008;DatabaseName=chws_gsh;allowMultiQueries=true +# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +# username: chws +# password: mh@803 #本机 # url: jdbc:sqlserver://127.0.0.1:9956;DatabaseName=CHWS;allowMultiQueries=true # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver