Administrator
2023-10-26 d772fedd4df8eecb78085c112e4939d29ba1b665
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
@@ -16,6 +16,8 @@
import com.ruoyi.sy.domain.ArdAccessFence;
import com.ruoyi.sy.domain.ArdOilWall;
import com.ruoyi.sy.domain.ArdSyCarLock;
import com.ruoyi.sy.service.ArdAccessFenceService;
import com.ruoyi.sy.service.ArdOilWallService;
import com.ruoyi.sy.service.impl.*;
import com.ruoyi.utils.gps.GeoTools;
import org.apache.commons.logging.Log;
@@ -80,21 +82,21 @@
            Map<String,Object> result = ((ArdSyCarServiceImpl)SpringUtils.getBean("ardSyCarServiceImpl")).getArdSyCarAndDeptByCarId(carId);//查询车辆及部门
            if(result != null){
                //清淤入栏开始----------
                String lng = (String) gpsMap.get("lng");//获取经度
                String lat = (String) gpsMap.get("lat");//获取纬度
                String lng = (String) gpsMap.get("lng").toString();//获取经度
                String lat = (String) gpsMap.get("lat").toString();//获取纬度
                String carName = (String) gpsMap.get("carName");//获取车牌号
                String time = (String) gpsMap.get("result");//定位时间
                String deptNum = (String) result.get("deptId");//获取部门ID
                String deptNum = (String) result.get("deptId").toString();//获取部门ID
                String deptName = (String) result.get("deptName");//获取部门名称
                //定义2维空间
                Point2D.Double point = new Point2D.Double(Double.parseDouble(lng), Double.parseDouble(lat));
                List<Point2D.Double> pts = new ArrayList<Point2D.Double>();
                //查询定位油车表中是否有该车辆
                ArdAccessFence ardAccessFence = ((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).queryAccess(carId);
                ArdAccessFence ardAccessFence = SpringUtils.getBean(ArdAccessFenceService.class).queryAccess(carId);
                //如果没有说明车辆未进入装油点,需要匹配所有装油点围栏
                if(ardAccessFence==null){
                    //车辆未进入装油点
                    List<ArdOilWall> ardOilWalls = ((ArdOilWallServiceImpl)SpringUtils.getBean("ArdOilWallServiceImpl")).accessAll();
                    List<ArdOilWall> ardOilWalls = SpringUtils.getBean(ArdOilWallService.class).accessAll();
                    for (int i = 0; i < ardOilWalls.size(); i++) {
                        pts.clear();
                        ArdOilWall ardOilWall = ardOilWalls.get(i);
@@ -123,7 +125,7 @@
                    if(out == null){
                        //车辆未开出装油点
                        String into = ardAccessFence.getIntoShipmentId();
                        ArdOilWall ardOilWall = ((ArdOilWallServiceImpl) SpringUtils.getBean("ArdOilWallServiceImpl")).one(into);
                        ArdOilWall ardOilWall = SpringUtils.getBean(ArdOilWallService.class).one(into);
                        pts.clear();
                        String[] coord = ardOilWall.getCoord().split(",");
                        for (int j = 0; j < coord.length; j = j + 3) {
@@ -136,14 +138,14 @@
                        }
                        ardAccessFence.setLng(lng);
                        ardAccessFence.setLat(lat);
                        ((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
                        SpringUtils.getBean(ArdAccessFenceService.class).updAccess(ardAccessFence);
                    }else {
                        //车辆已经开出装油点,判断是否进入卸油点
                        String unload = ardAccessFence.getIntoUnloadId();
                        //如果unload为空,判断是否进入卸油点
                        if (unload == null) {
                            //车辆未进入卸油点
                            List<ArdOilWall> ardOilWalls = ((ArdOilWallServiceImpl) SpringUtils.getBean("ArdOilWallServiceImpl")).uploadAll();
                            List<ArdOilWall> ardOilWalls = SpringUtils.getBean(ArdOilWallService.class).uploadAll();
                            //是否在路上
                            Boolean isRoad = true;
                            for (int i = 0; i < ardOilWalls.size(); i++) {