feat:新增测试接口

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

@@ -56,8 +56,8 @@ public class TestController {
 
     @ApiOperation(value = "mongo查询测试接口", notes = "判断车辆否在围栏内")
     @PostMapping("/mongoCheck")
-    public Result testMongo(@RequestParam String clientId,
-                            @RequestParam Long spotId) {
+    public Result mongoCheck(@RequestParam String clientId,
+                             @RequestParam Long spotId) {
         log.info("测试接口 /tms/test/mongo，参数:{}", spotId);
         WorkSpot spot = workSpotService.getById(spotId);
 //        Point point = new Point(Double.valueOf(spot.getLongitude()), Double.valueOf(spot.getLatitude()));
@@ -95,7 +95,7 @@ public class TestController {
 
     @ApiOperation(value = "工具类测试", notes = "")
     @PostMapping("/testUtil")
-    public Result testMongo(@RequestParam Float lon, @RequestParam Float lat,
+    public Result testUtil(@RequestParam Float lon, @RequestParam Float lat,
                             @RequestParam Long spotId){
         log.info("测试接口 /tms/test/testUtil，参数:{},{}", lon, lat);
         WorkSpot spot = workSpotService.getById(spotId);

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.getClientId()));
+        Query query = new Query(Criteria.where("clientId").is(truckSimCard.getSimCard()));
         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.getClientId());
+        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard());
         criteria.andOperator(Criteria.where("createTime").gt(format.format(param.getStartTime())));
         criteria.andOperator(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.getClientId());
+        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard());
         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.getClientId());
+                        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard());
                         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.getClientId());
+                        Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard());
                         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

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