异味处理

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSensorServiceImpl.java

@@ -113,13 +113,6 @@ public class LabSensorServiceImpl implements ILabSensorService {
             labSensorMapper.updateStateBySenorNotIds(senorIdList,subjectId,SenseStateEnum.OFFLINE.getCode());
         }
         List<LabSensorVO> data = labSensorMapper.selectLabSensorList(labSensor);
-        /*data.stream().forEach(d -> {
-            if(d.getGatewayId()!= null && redisService.hasKey(CacheConstants.SENSOR_KEY + d.getGatewayId())){
-                d.setSenseState(SenseStateEnum.TURN_ON);
-            }else {
-                d.setSenseState(SenseStateEnum.OFFLINE);
-            }
-        });*/
         return data;
     }
 
@@ -151,37 +144,6 @@ public class LabSensorServiceImpl implements ILabSensorService {
             subId=Long.parseLong(subjectStr.toString());
         }
 
-        // 当前单机部署不需要考虑， 否则要放开下部分代码
-//        if(subId==null)
-//        {
-        //这里存在分布式问题
-//            //超时时间设置为20秒
-//            if(redisService.redisTemplate.opsForValue().setIfAbsent(getKey(GatewayNum+":cacheset"),true,20,TimeUnit.SECONDS))
-//            {
-//
-//                LabSensor labSensor = new LabSensor();
-//                labSensor.setGatewayId(GatewayNum);
-//                List<LabSensorVO> labSensorVOS = selectLabSensorList(labSensor);
-//                Long aLong = Optional.ofNullable(labSensorVOS)
-//                        .filter(a -> a.size() > 0)
-//                        .map(a -> a.get(0))
-//                        .map(a -> a.getSubjectId())
-//                        .orElse(null);
-//                if(aLong!=null)
-//                {
-//                    redisService.setCacheObject(getKey(GatewayNum),aLong);
-//                }
-//                return aLong;
-//            }
-//            else
-//            {
-//                //随眠50毫秒
-//                Thread.sleep(100);
-//                getCacheSubByGateway(GatewayNum);
-//            }
-//
-//
-//        }
         //后来仔细想了一下， socket 可能存在并行， 这里还是最好改造下
         if(subId==null)
         {

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectManagerService.java

@@ -932,10 +932,8 @@ public class LabSubjectManagerService {
 
         List<SensorFunctionStatus> list = getSensorFunctionOldStatuses(labSensors, isInitVal);
         JSONObject jsonObject = redisService.getCacheObject(CacheConstants.SENSOR_DATA_KEY + subId);
-        //logger.info("传感器合并：云盒设备："+ JSONUtil.toJsonStr(list));
         if(jsonObject != null){
             list = getSensorFunctionNewStatusesTwo(list, subId);
-            //logger.info("传感器合并：采集器设备："+ JSONUtil.toJsonStr(list));
         }
         return list;
     }
@@ -1265,7 +1263,6 @@ public class LabSubjectManagerService {
             if (flag) {
                 // 实验权限覆盖后面做(已完成)
                 LabSubject subject = new LabSubject();
-//                subject.setAdminId(SecurityUtils.getUserIdEx());
                 //获取我的实验室
                 labSubjectsDataScope = subjectService.selectLabSubjectListDataScope(subject);
             }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabTimedExhaustServiceImpl.java

@@ -223,7 +223,6 @@ public class LabTimedExhaustServiceImpl implements ILabTimedExhaustService {
     public void executionFun(final Long subId,List <LabExhaustPeriodVo> exhaustPeriodVoList,Calendar calendar){
         log.info("执行过滤后的数据："+JSON.toJSON(exhaustPeriodVoList)+"===实验室id："+subId);
         Predicate<LabExhaustPeriodVo> predicate = a->{
-//            Integer[] weekDays = { 7, 1, 2, 3, 4, 5, 6 };
             int w = calendar.get(Calendar.DAY_OF_WEEK) - 1;
             if (w < 0)
                 w = 0;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabViolationScoreSiteServiceImpl.java

@@ -125,7 +125,7 @@ public class LabViolationScoreSiteServiceImpl implements ILabViolationScoreSiteS
     @Override
     public ResultData getSiteCount() {
         List<LabViolationSite> violationSites = siteMapper.selectLabViolationSite();
-        if (violationSites.size()> 0 && violationSites!=null)
+        if (violationSites!=null && !violationSites.isEmpty())
             return ResultData.success(violationSites.get(0).getRemake());
         return ResultData.fail();
     }