数据库更改2

fiveep-controller/src/main/resources/application-dev.properties

@@ -17,9 +17,9 @@ mybatis.refresh.sleep-seconds=20
 # datasource
 spring.autoconfigure.exclude=com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
 spring.datasource.dynamic.primary=fiveep
-spring.datasource.dynamic.datasource.fiveep.url=jdbc:mysql://124.71.145.219:3306/smart_electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
+spring.datasource.dynamic.datasource.fiveep.url=jdbc:mysql://124.70.160.158:3306/smart_electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
 spring.datasource.dynamic.datasource.fiveep.username=root
-spring.datasource.dynamic.datasource.fiveep.password=Wjzn2021Db
+spring.datasource.dynamic.datasource.fiveep.password=Y48hD&Eg
 spring.datasource.dynamic.druid.initial-size=5                                                                       
 spring.datasource.dynamic.druid.min-idle=5
 spring.datasource.dynamic.druid.max-active=30

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -646,7 +646,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         Date startTime;
         Date endTime;
         try {
-           startTime = formatter.parse(date1);
+            startTime = formatter.parse(date1);
             endTime = formatter.parse(date2);
         } catch (Exception e) {
             throw new BusinessException("时间错误");
@@ -655,7 +655,8 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         LambdaQueryWrapper<HtAnalogData> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(HtAnalogData::getDemand,HtAnalogData::getFreezingTime)
                 .eq(HtAnalogData::getDeviceName,deviceCode)
-                .between(HtAnalogData::getFreezingTime,startTime,endTime).groupBy(HtAnalogData::getFreezingTime);
+                .between(HtAnalogData::getFreezingTime,startTime,endTime)
+                .groupBy(HtAnalogData::getFreezingTime);
         List<HtAnalogData> list1 = this.list(queryWrapper);
         List<Object> demandList = new ArrayList<>();
         List<Object> freezingTimesList = new ArrayList<>();