实时模拟量和开关量优化

fiveep-service/src/main/java/com/bizmatics/service/RtAnalogDataService.java

@@ -41,4 +41,5 @@ public interface RtAnalogDataService extends CrudService<RtAnalogData> {
 
 
     List<Map<String,Object>> getDataReport(Integer siteId,Date startTime, Date endTime,String queryType);
+
 }

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

@@ -76,12 +76,14 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
     public List<Map<String, Object>> getOne(Integer siteId) {
         List<Map<String, Object>> list = new ArrayList<>();
         Map<String, Object> radMap = baseMapper.getOneMap(siteId);
-        for (String name:radMap.keySet()) {
-            Map<String,Object> map = new HashMap<>();
-            map.put("name",name);
-            map.put("value",addUnit(name,radMap.get(name).toString()));
-            list.add(map);
-        }
+        Optional.ofNullable(radMap).ifPresent(rad -> {
+            for (String name:rad.keySet()) {
+                Map<String,Object> map = new HashMap<>();
+                map.put("name",name);
+                map.put("value",rad.get(name));
+                list.add(map);
+            }
+        });
         return list;
     }
 

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

@@ -25,13 +25,15 @@ public class RtSwitchDataServiceImpl extends AbstractCrudService<RtSwitchDataMap
     @Override
     public List<Map<String, Object>> getOne(Integer siteId) {
         List<Map<String, Object>> list = new ArrayList<>();
-        Map<String, Object> radMap = baseMapper.getOneMap(siteId);
-        for (String name:radMap.keySet()) {
-            Map<String,Object> map = new HashMap<>();
-            map.put("name",name);
-            map.put("value",radMap.get(name));
-            list.add(map);
-        }
+        Map<String, Object> rsdMap = baseMapper.getOneMap(siteId);
+        Optional.ofNullable(rsdMap).ifPresent(rad -> {
+            for (String name:rad.keySet()) {
+                Map<String,Object> map = new HashMap<>();
+                map.put("name",name);
+                map.put("value",rad.get(name));
+                list.add(map);
+            }
+        });
         return list;
     }
 

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

@@ -56,7 +56,9 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     public List<SiteVO> siteAndStatusList(String name) {
         List<SiteVO> list = new ArrayList<>();
         Integer userId = SessionLocal.getUserId();
-        baseMapper.list(SessionLocal.getUserId(), name).forEach(site -> list.add(enhanceSite(site,userId)));
+        List<Site> sites = baseMapper.list(SessionLocal.getUserId(), name);
+        System.out.println(sites.size());
+        sites.forEach(site -> list.add(enhanceSite(site,userId)));
         return list;
     }
 
@@ -68,9 +70,16 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
 
 
     public SiteVO enhanceSite(Site site,Integer userId){
+        long l = System.currentTimeMillis();
         SiteVO siteVo = BeanMapperUtils.map(site, SiteVO.class);
+        long change = System.currentTimeMillis();
+        log.info("转换时间"+(change-l));
         siteVo.setDeviceCount(deviceMapper.selectCount(userId,siteVo.getId(),null,null,null,null));
+        long device = System.currentTimeMillis();
+        log.info("获取设备数时间"+(device-change));
         int deviceCount = baseMapper.selectCount(userId,siteVo.getId(),DeviceStatusCode.DEVICE.getValue());
+        long count = System.currentTimeMillis();
+        log.info("获取状态时间"+(count-change));
         int offLineCount = baseMapper.selectCount(userId,siteVo.getId(),DeviceStatusCode.OFFLINE.getValue());
         int faultCount = baseMapper.selectCount(userId,siteVo.getId(),DeviceStatusCode.FAULT.getValue());
         siteVo.setAlarmPowerCount(deviceCount);
@@ -83,6 +92,8 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         }else {
             siteVo.setStatus(DeviceStatusCode.NORMAL.getDescribe());
         }
+        long e = System.currentTimeMillis();
+        log.info("结束"+ (e-l));
         return siteVo;
     }
 }