xushili 1 rok pred
rodič
commit
dae3fa24df

+ 0 - 1
src/main/java/com/gyee/frame/common/cache/RedisConfig.java

@@ -67,7 +67,6 @@ public class RedisConfig {
         redisStandaloneConfiguration.setDatabase(database);
         redisStandaloneConfiguration.setPassword(pwd);
         redisStandaloneConfiguration.setPort(port);
-        redisStandaloneConfiguration.setDatabase(1);
 
         JedisClientConfiguration.JedisPoolingClientConfigurationBuilder jpcb = (JedisClientConfiguration.JedisPoolingClientConfigurationBuilder) JedisClientConfiguration.builder();
         jpcb.poolConfig(jedisPoolConfig);

+ 2 - 2
src/main/resources/mybatis/auto/WindTurbineInfoDayMapper.xml

@@ -1392,8 +1392,8 @@
   ,sum(Faulthours)   gzxs,sum(Maintainhours)   jxxs
   ,sum(Stophours)   tjxs,sum(Interrupthours)   zdxs
   ,sum(Daycalendarhours)   rlxs,avg(Speed)   fs
-  ,avg(Daysbklyl)   sbklyl,avg(Daysbklyl)   dxklyxs
-  ,avg(Daylyxs)   sbklyl,avg(dayLYXS)  lyxs
+  ,avg(Daysbklyl)   sbklyl,avg(Daydxkyxs)   dxklyxs
+  ,avg(dayLYXS)  lyxs
   ,avg(Windhours)   yxfss
   from WindTurbineInfoDay
   where   Windpowerstationid = #{wpId} and Recorddate >= #{beginDate} and Recorddate < #{endDate}