dengsixing před 10 měsíci
rodič
revize
356fac4e77

+ 6 - 1
src/main/java/com/fdkankan/job/job/SceneCallCountHandler.java

@@ -5,6 +5,7 @@ import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.CommonOperStatus;
+import com.fdkankan.common.constant.SceneSource;
 import com.fdkankan.common.util.DateExtUtil;
 import com.fdkankan.dingtalk.DingTalkSendUtils;
 import com.fdkankan.job.entity.SceneBuildProcessLog;
@@ -78,7 +79,11 @@ public class SceneCallCountHandler {
         int v4CountKJ = 0,v4successKJ = 0,v4FailKJ = 0,v4WaitingKJ = 0;//看见
         int v4CountSS = 0,v4successSS = 0,v4FailSS = 0,v4WaitingSS = 0;//深时
         int v4CountSG = 0,v4successSG = 0,v4FailSG = 0,v4WaitingSG = 0;//深光
-        List<ScenePlus> scenePluses = scenePlusService.list(new LambdaQueryWrapper<ScenePlus>().ge(ScenePlus::getCreateTime, dateStart).le(ScenePlus::getCreateTime, dateEnd).isNotNull(ScenePlus::getCameraId));
+        List<ScenePlus> scenePluses = scenePlusService.list(
+                new LambdaQueryWrapper<ScenePlus>()
+                        .ge(ScenePlus::getCreateTime, dateStart)
+                        .le(ScenePlus::getCreateTime, dateEnd)
+                        .isNotNull(ScenePlus::getCameraId).in(ScenePlus::getSceneSource, 1,3,4,5));
 
         List<String> numList = new ArrayList<>();
         if(CollUtil.isNotEmpty(scenePluses)){