fixbugs

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceServiceImpl.java

@@ -377,6 +377,7 @@ public  class DeviceServiceImpl implements DeviceService {
         device.setWaterMeterFileNo(deviceDataDto.getWaterMeterFileNo());
         device.setCustomerId(deviceDataDto.getCustomerId());
         device.setWaterMeterNo(deviceDataDto.getWaterMeterNo());
+        device.setRegisterStatus(0);
         //device.setUdipId(udipId);
         int result = this.insert(device);
 
@@ -1104,6 +1105,7 @@ public  class DeviceServiceImpl implements DeviceService {
         device.setYCoordinates(gatewayDataDto.getYCoordinates());
         device.setIsTag(gatewayDataDto.getXCoordinates() != null && gatewayDataDto.getYCoordinates() != null ? 1 : 0);
         device.setPlanId(gatewayDataDto.getPlanId());
+        device.setRegisterStatus(1);
         int result = this.insert(device);
         log.info("end addDevice,result = " + result);
         log.info("end addGateway");

smart-city-platform/src/main/java/com/bz/smart_city/service/importfile/AsyncTaskImportService.java

@@ -365,6 +365,7 @@ public class AsyncTaskImportService {
 
             } catch (Exception e) {
                 e.printStackTrace();
+                invalidTemplate = true;
                 log.error("read excel error,{}", e.getMessage());
                 messageContent.append("导入失败，读取文件错误。");
             } finally {
@@ -684,6 +685,7 @@ public class AsyncTaskImportService {
 
             } catch (Exception e) {
                 e.printStackTrace();
+                invalidTemplate = true;
                 log.error("read excel error" + e.getMessage());
                 messageContent.append("导入失败，读取文件错误。");
             } finally {

smart-city-platform/src/main/resources/application-sit.properties

@@ -9,20 +9,20 @@ spring.thymeleaf.prefix=classpath:/templates/
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 #使用druid数据源
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.url=jdbc:mysql://10.0.0.161:3306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.0.0.161:3306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false
 #spring.datasource.url=jdbc:mysql://114.135.61.188:23305/smart_city?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=100Zone@123
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.min-idle=5
-spring.datasource.druid.max-active=20
+spring.datasource.druid.max-active=100
 spring.datasource.druid.max-wait=60000
 spring.datasource.druid.time-between-eviction-runs-millis=60000
 spring.datasource.druid.min-evictable-idle-time-millis=300000
 spring.datasource.druid.validation-query=SELECT 1
 spring.datasource.druid.test-while-idle=true
 spring.datasource.druid.test-on-borrow=true
-spring.datasource.druid.test-on-return=false
+spring.datasource.druid.test-on-return=true
 spring.datasource.druid.pool-prepared-statements=true
 spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
 spring.datasource.druid.filters=stat,wall