Merge branch '20210204' into 20210223

smart-city-platform/src/main/java/com/bz/smart_city/excel/resolver/InstallPlanResolverExcelService.java

@@ -266,7 +266,9 @@ public class InstallPlanResolverExcelService implements ResolverExcelService {
                         InstallPlanDataUnit.setStatus(1);
                         installPlanDataList.add(InstallPlanDataUnit);
                         unitMap.put(unitKey,InstallPlanDataUnit);
-                        unitNum++;
+                        if(!StringUtils.equals("",unitCell.getStringCellValue().trim())){
+                            unitNum++;
+                        }
                     }
 
 

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

@@ -386,7 +386,7 @@ public class GdServiceImpl implements GdService {
         redisTemplate.opsForHash().putAll("GdReadingTask:"+id,redisMap);
         redisTemplate.expire("GdReadingTask:"+id,86400, TimeUnit.SECONDS);
 
-        ScRabbitConfig config = scRabbitConfigMapper.findByCode("gd-read-meter");
+        ScRabbitConfig config = scRabbitConfigMapper.findByCode("platform");
 
         for (Map<String, List<String>> stringListMap : list) {