feat:修改mongo查询条件

src/main/java/com/aoyang/tms/controller/TestController.java

@@ -79,7 +79,7 @@ public class TestController {
             lon[i] = Double.valueOf(split[0]);
             lat[i] = Double.valueOf(split[1]);
         }
-        Criteria criteria = Criteria.where("clientId").is(clientId);
+        Criteria criteria = Criteria.where("clientId").is(clientId).and("messageId").is("512");
         criteria.andOperator(Criteria.where("createTime").gt(LocalDateTime.now().minusDays(1)));
         Query query = new Query(criteria);
         List<TmsMongoDoc> tmsMongoDocs = mongoTemplate.find(query, TmsMongoDoc.class);

src/main/java/com/aoyang/tms/controller/TruckMongoInfoController.java

@@ -79,7 +79,7 @@ public class TruckMongoInfoController {
         if (truckSimCard == null) {
             return new Result<>(ErrCodeEnum.INVALID_TRUCK.getCode(), "卡车无simcard信息");
         }
-        Query query = new Query(Criteria.where("clientId").is(truckSimCard.getSimCard()));
+        Query query = new Query(Criteria.where("clientId").is(truckSimCard.getSimCard()).and("messageId").is("512"));
         query.with(new Sort(Sort.Direction.DESC, "dateTime"));
         TmsMongoDoc tmsMongoDoc = mongoTemplate.findOne(query, TmsMongoDoc.class);
         log.info("查询位置信息 truck:{}, location:{}", truckSimCard.getCarNumber(), JSON.toJSONString(tmsMongoDoc));
@@ -116,7 +116,7 @@ public class TruckMongoInfoController {
             return new Result<>(ErrCodeEnum.INVALID_TRUCK.getCode(), "卡车无simcard信息");
         }
 
-        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard());
+        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard()).and("messageId").is("512");
         criteria.andOperator(Criteria.where("createTime").gt(format.format(param.getStartTime())),
                 Criteria.where("createTime").lt(format.format(param.getEndTime())));
         Query query = new Query(criteria);
@@ -156,7 +156,7 @@ public class TruckMongoInfoController {
         }
         Date queryDate = param.getLocalDate();
         String dateStr = format.format(queryDate);
-        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard());
+        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard()).and("messageId").is("512");
         criteria.andOperator(Criteria.where("createTime").gt(dateStr));
         Query query = new Query(criteria);
         query.with(new Sort(Sort.Direction.ASC, "dateTime"));

src/main/java/com/aoyang/tms/job/SpotCheckJob.java

@@ -104,7 +104,7 @@ public class SpotCheckJob {
                     }
                     if (workOrder.getEnterTime() == null) {
                         // 未进入围栏
-                        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard());
+                        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard()).and("messageId").is("512");
                         criteria.andOperator(Criteria.where("createTime").gt(workStartTime));
                         Query query = new Query(criteria);
                         List<TmsMongoDoc> tmsMongoDocs = mongoTemplate.find(query, TmsMongoDoc.class);
@@ -127,7 +127,7 @@ public class SpotCheckJob {
 
                     } else if (workOrder.getLeaveTime() == null) {
                         // 已进入围栏 无进入围栏标识，则无需判断离开围栏
-                        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard());
+                        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard()).and("messageId").is("512");
                         criteria.andOperator(Criteria.where("createTime").gt(workOrder.getEnterTime()));
                         Query query = new Query(criteria);
                         List<TmsMongoDoc> tmsMongoDocs = mongoTemplate.find(query, TmsMongoDoc.class);

src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -256,7 +256,7 @@ public class CommonServiceImpl implements CommonService {
             log.error("绑定信息不存在 truckId:{}", truckId);
             return location;
         }
-        Query query = new Query(Criteria.where("clientId").is(truckSimCard.getSimCard()));
+        Query query = new Query(Criteria.where("clientId").is(truckSimCard.getSimCard()).and("messageId").is("512"));
         query.with(new Sort(Sort.Direction.DESC, "dateTime"));
         TmsMongoDoc tmsMongoDoc = mongoTemplate.findOne(query, TmsMongoDoc.class);
         if (tmsMongoDoc != null) {
@@ -280,7 +280,7 @@ public class CommonServiceImpl implements CommonService {
             log.error("绑定信息不存在 truckId:{}", truckId);
             return location;
         }
-        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard());
+        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard()).and("messageId").is("512");
         criteria.andOperator(Criteria.where("createTime").gt(date));
         Query query = new Query(criteria);
         query.with(new Sort(Sort.Direction.ASC, "dateTime"));
@@ -308,7 +308,7 @@ public class CommonServiceImpl implements CommonService {
         if (truckSimCard == null) {
             return Collections.EMPTY_LIST;
         }
-        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard());
+        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard()).and("messageId").is("512");
         criteria.andOperator(Criteria.where("createTime").gt(startDate), Criteria.where("createTime").lt(endDate));
         Query query = new Query(criteria);
         List<TmsMongoDoc> tmsMongoDocs = mongoTemplate.find(query, TmsMongoDoc.class);