|
|
@@ -31,6 +31,7 @@ import com.sckw.system.api.model.dto.res.UserCacheResDto;
|
|
|
import com.sckw.transport.api.dubbo.TransportDubboService;
|
|
|
import com.sckw.transport.api.model.dto.RWaybillOrderDto;
|
|
|
import com.sckw.transport.api.model.vo.RWaybillOrderVo;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
@@ -47,6 +48,7 @@ import java.util.stream.Collectors;
|
|
|
* @desc 车辆
|
|
|
* @date 2023/7/6 0006
|
|
|
*/
|
|
|
+@Slf4j
|
|
|
@Service
|
|
|
@SuppressWarnings("all")
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@@ -638,6 +640,7 @@ public class KwfTruckService {
|
|
|
* @date 2023/9/5
|
|
|
**/
|
|
|
public List<KwfTruckMonitorVo> findTruck(Map params){
|
|
|
+ long begTime = System.currentTimeMillis();
|
|
|
/**车辆查询**/
|
|
|
Map queryParams = new HashMap<>(Global.NUMERICAL_SIXTEEN){{ put("truckNo", params.get("truckNo"));}};
|
|
|
List<KwfTruckMonitorVo> truckList = findTruckMonitor(queryParams);
|
|
|
@@ -652,12 +655,15 @@ public class KwfTruckService {
|
|
|
entIds.add(truck.getEntId());
|
|
|
truckNos.add(truck.getTruckNo());
|
|
|
}
|
|
|
-
|
|
|
+ long begTime1 = System.currentTimeMillis();
|
|
|
+ log.info("获取数据="+(begTime1 - begTime));
|
|
|
//企业数据集
|
|
|
entIds = entIds.stream().distinct().collect(Collectors.toList());
|
|
|
Map<Long, EntCacheResDto> ents = remoteSystemService.queryEntCacheMapByIds(entIds);
|
|
|
//车辆定位数据集
|
|
|
Map<String, KwfTruckGpsVo> truckGpsMap = findTruckLocateHandle(truckNos);
|
|
|
+ long begTime2 = System.currentTimeMillis();
|
|
|
+ log.info("获取GPS="+(begTime2 - begTime1));
|
|
|
|
|
|
/**数据组装**/
|
|
|
for (KwfTruckMonitorVo truck:truckList) {
|
|
|
@@ -666,7 +672,8 @@ public class KwfTruckService {
|
|
|
truck.setFirmName(ent != null ? ent.getFirmName() : null);
|
|
|
truck.setRunStatus(truckGps != null ? truckGps.getRunStatus() : null);
|
|
|
}
|
|
|
-
|
|
|
+ long begTime3 = System.currentTimeMillis();
|
|
|
+ log.info("数据组装="+(begTime3 - begTime2));
|
|
|
return truckList;
|
|
|
}
|
|
|
|
|
|
@@ -964,7 +971,11 @@ public class KwfTruckService {
|
|
|
Map<String, Object> params = new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
put("vehicleNoList", truckNos);
|
|
|
}};
|
|
|
+
|
|
|
+ long begTime = System.currentTimeMillis();
|
|
|
String httpResult = HttpClientUtil.post(queryLocate, JSON.toJSONString(params));
|
|
|
+ System.out.println(httpResult);
|
|
|
+ long entTime = System.currentTimeMillis();
|
|
|
if (StringUtils.isNotBlank(httpResult)) {
|
|
|
JSONObject result = JSONObject.parseObject(httpResult);
|
|
|
if (result.getInteger("code") != null && result.getInteger("code") != 200) {
|
|
|
@@ -973,7 +984,7 @@ public class KwfTruckService {
|
|
|
|
|
|
}
|
|
|
JSONArray trucks = result.getJSONArray("data");
|
|
|
- System.out.println((trucks != null ? trucks.size() : 0) + "==="+ truckNos.size() + "===" + truckNos);
|
|
|
+ log.info("车牌号数量="+ truckNos.size() + " GPS数量=" + (trucks != null ? trucks.size() : 0) + " 响应时间="+(entTime - begTime));
|
|
|
for (int i=0; trucks != null && i < trucks.size(); i++) {
|
|
|
JSONObject truck = trucks.getJSONObject(i);
|
|
|
JSONObject locateInfo = truck.getJSONObject("locateInfo");
|