Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java

@@ -43,7 +43,6 @@ import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 设备管理Service业务层处理
@@ -358,6 +357,11 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
 		return pileInfoVO;
 	}
 
+	/**
+	 * 根据桩编号查询桩信息
+	 * @param pileSn
+	 * @return
+	 */
 	@Override
 	public PileInfoVO selectPileInfoBySn(String pileSn) {
 		PileBasicInfo basicInfo = selectPileBasicInfoBySN(pileSn);

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java

@@ -118,7 +118,7 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService {
             result = selectPileConnectorInfoList(pileConnectorInfo);
             if (CollectionUtils.isNotEmpty(result)) {
                 // 查询数据库不为空，存redis 2分钟
-                redisCache.setCacheObject(redisKey, result, 15, TimeUnit.HOURS);
+                redisCache.setCacheObject(redisKey, result, 5, TimeUnit.MINUTES);
             }
         }
         return result;