1. 联调

electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java

@@ -99,16 +99,16 @@ public class AppController extends BaseController
 
 
     /**
-     * 根据定位获取运营区详细信息
+     * 根据定位获取运营区详细信息  device not subscribed
      */
     @GetMapping(value = "/area/info")
-    public AjaxResult areaInfo(String longitude,String latitude)
+    public AjaxResult areaInfo(String longitude,String latitude, String deptId)
     {
         if(StrUtil.isBlank(longitude) || StrUtil.isBlank(latitude)){
             logger.info("没有经纬度参数：【longitude={}】，【latitude={}】",longitude,latitude);
             return error("请传经纬度参数"+"【longitude="+longitude+"】，【latitude="+latitude+"】");
         }
-        EtOperatingArea area = etOperatingAreaService.getAreaInfoByLocation(longitude,latitude);
+        EtOperatingArea area = etOperatingAreaService.getAreaInfoByLocation(longitude,latitude,deptId);
         return success(area);
     }
 

electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java

@@ -5,8 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.ruoyi.common.constant.IotConstants;
 import com.ruoyi.common.constant.ServiceConstants;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -37,7 +35,6 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -77,6 +74,8 @@ public class ReceiveController {
     @Autowired
     private ScheduledExecutorService scheduledExecutorService;
 
+    private final Object lock = new Object();
+
 
     /**
      * 功能描述：第三方平台数据接收。<p>
@@ -97,16 +96,37 @@ public class ReceiveController {
         log.info("receive方法接收到参数:  body String --- " +body);
         /************************************************
          *  解析数据推送请求，非加密模式。
-         *  如果是明文模式使用以下代码
+         *  如果是明文模式使用以下代码 hangdleBody(body, false);  ChatGPT is under heavy load
          **************************************************/
         /*************明文模式  start****************/
         BodyObj obj = Util.resolveBody(body, false);
         log.info("receive方法解析对象:  body Object --- " + JSON.toJSONString(obj));
+        // 起一个异步线程处理数据
+        scheduledExecutorService.schedule(() -> {
+            new Thread(() -> {
+                synchronized (lock) {
+                    try {
+                        handleBody(obj);
+                    } catch (UnsupportedEncodingException e) {
+                        e.printStackTrace();
+                    } catch (NoSuchAlgorithmException e) {
+                        e.printStackTrace();
+                    } catch (InvalidKeyException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        }, 0, TimeUnit.SECONDS);
+        /*************明文模式  end****************/
+        return "ok";
+    }
+
+    private void handleBody(BodyObj obj) throws UnsupportedEncodingException, NoSuchAlgorithmException, InvalidKeyException {
         if (obj != null){
             boolean dataRight = Util.checkSignature(obj, token);
             if (dataRight){
                 log.info("receive方法验证签名正确: content" + JSON.toJSONString(obj));
-                String msg = (String)obj.getMsg();
+                String msg = (String) obj.getMsg();
                 log.info("receive方法-获取到消息体: msg---" +msg);
                 JSONObject jsonObject = JSONObject.parseObject(msg, JSONObject.class);
                 if(IotConstants.ONENET_LOCATION.equals(jsonObject.get("ds_id")) && ObjectUtil.isNotNull(jsonObject.get("value"))){
@@ -161,17 +181,52 @@ public class ReceiveController {
                                     String noRidingOutage = area.getNoRidingOutage();
                                     if (noRidingOutage.equals("1") && value.getStatus() != 3) { // 禁行区内断电
                                         log.info("禁行区内断电命令--SN：" + device.getSn());
-                                        asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE, "禁行区内断电");
+                                        asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE+IotConstants.COMMAND_FREQUENCY_5, "禁行区内断电");
+                                        device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);
+                                        int updateAsDevice = asDeviceService.updateAsDevice(device);
+                                        if (updateAsDevice > 0) {
+                                            log.info("禁行区内断电--更新设备锁状态成功SN：" + device.getSn());
+                                        }
                                     }
                                 }
                                 /** 3.超出运营区外断电*/
                                 boolean isAreaZone = asDeviceService.isAreaZone(device.getSn(), area);
                                 if(!isAreaZone){
-                                    String isAdminUnlocking = device.getIsAdminUnlocking();// 是否管理员开锁
-                                    String areaOutOutage = area.getAreaOutOutage();
-                                    if (areaOutOutage.equals("1") && value.getStatus() != 3 && !isAdminUnlocking.equals("1")) { // 超出营运区断电
-                                        log.info("超出营运区断电命令--SN：" + device.getSn());
-                                        asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE, "超出营运区断电");
+                                    //是否在30米范围内
+                                    boolean inPolygon = GeoUtils.isInPolygonWithTolerance(lon.toString(), lat.toString(), GeoUtils.fromWkt(area.getBoundary()), 60);
+                                    if(inPolygon){
+                                        //在20米范围内，发报警
+                                        log.info("超出运营区30米内发送警告命令--SN：" + device.getSn());
+                                        asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY3, "超出运营区30米内");
+                                    }else{
+                                        //超出运营区外断电
+                                        String isAdminUnlocking = device.getIsAdminUnlocking();// 是否管理员开锁
+                                        String areaOutOutage = area.getAreaOutOutage();
+                                        if (areaOutOutage.equals("1") && value.getStatus() != 3 && !isAdminUnlocking.equals("1")) { // 超出营运区断电
+                                            log.info("超出营运区断电命令--SN：" + device.getSn());
+                                            asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE+IotConstants.COMMAND_FREQUENCY_5, "超出营运区断电");
+                                            device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);
+                                            int updateAsDevice = asDeviceService.updateAsDevice(device);
+                                            if (updateAsDevice > 0) {
+                                                log.info("禁行区内断电--更新设备锁状态成功SN：" + device.getSn());
+                                            }
+                                        }
+                                    }
+                                }else{
+                                    // 判断该车辆是否在进行中的订单,并且车辆的锁状态是关，状态是骑行中
+                                    Boolean inOrderBySn = etOrderService.isInOrderBySn(device.getSn());
+                                    if (inOrderBySn && ServiceConstants.VEHICLE_STATUS_IN_USING.equals(device.getStatus()) && ServiceConstants.LOCK_STATUS_CLOSE.equals(device.getLockStatus())) { // 有正在骑行的订单，给车辆上电
+                                        log.info("返回营运区上电，有正在骑行的订单，给车辆上电--SN：" + device.getSn());
+                                        asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5, "返回营运区上电");
+                                        // 更新车辆状态和锁状态
+                                        /** 3.更新车辆状态*/
+                                        device.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN);
+                                        device.setStatus(ServiceConstants.VEHICLE_STATUS_IN_USING);
+                                        device.setIsAdminUnlocking("0");
+                                        int i1 = asDeviceService.updateAsDevice(device);
+                                        if(i1>1){
+                                            log.info("【返回营运区上电】更新车辆状态成功");
+                                        }
                                     }
                                 }
                                 /** 4.行程线路添加，更新订单中的trip_route字段 */
@@ -254,8 +309,6 @@ public class ReceiveController {
         }else {
             log.info("receive方法参数为空: body empty error");
         }
-        /*************明文模式  end****************/
-        return "ok";
     }
 
     private boolean isLastPointSame(JSONArray jsonArray, BigDecimal lon, BigDecimal lat) {

electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -138,6 +138,7 @@ public class SysLoginController
             log.info("没有传入areaId参数：【areaId={}】",areaId);
             return AjaxResult.error("请传areaId参数"+"【areaId="+areaId+"】");
         }
+        log.info("【微信登录/wxlogin】areaId参数：【areaId={}】",areaId);
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.wxloing(mobileCode,jsCode,areaId);

electripper-common/src/main/java/com/ruoyi/common/constant/IotConstants.java

@@ -116,6 +116,22 @@ public class IotConstants {
      */
     public static final String COMMAND_PLAY8 = "play8@";
 
+    /**
+     * 命令  频率：5秒
+     */
+    public static final String COMMAND_FREQUENCY_5 = "sub5@";
+
+    /**
+     * 命令  频率：20秒
+     */
+    public static final String COMMAND_FREQUENCY_20 = "sub20@";
+
+    /**
+     * 命令  频率：一个小时
+     */
+    public static final String COMMAND_FREQUENCY_3600 = "sub3600@";
+
+
     /**----------------------------命令end----------------------------*/
 
 

electripper-common/src/main/java/com/ruoyi/common/utils/map/GeoUtils.java

@@ -232,7 +232,7 @@ public class GeoUtils {
     /**
      * 判断一个点是否在一个圆形区域内（考虑误差距离）
      * */
-    public static boolean isInPolygonWithTolerance (String longitude, String latitude, Geometry polygon, double tolerance) {
+    public static boolean isInPolygonWithTolerance(String longitude, String latitude, Geometry polygon, double tolerance) {
         double lon = Double.parseDouble(longitude);
         double lat = Double.parseDouble(latitude);
 
@@ -247,6 +247,7 @@ public class GeoUtils {
             Coordinate[] coordinates = polygon.getCoordinates();
             for (Coordinate coord : coordinates) {
                 double distance = calculateDistance(lat, lon, coord.y, coord.x);
+                log.info("距离----distance:{}",distance);
                 if (distance <= tolerance) {
                     return true;
                 }

electripper-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -4,6 +4,7 @@ import javax.annotation.Resource;
 
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.domain.entity.AsUser;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -13,6 +14,7 @@ import com.ruoyi.common.utils.wx.AccessTokenUtil;
 import com.ruoyi.common.utils.wx.vo.WeChatMiniAuthorizeVo;
 import com.ruoyi.system.service.IAsUserService;
 import com.ruoyi.system.service.IWxPayService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -47,6 +49,7 @@ import com.ruoyi.system.service.ISysUserService;
  *
  * @author ruoyi
  */
+@Slf4j
 @Component
 public class SysLoginService
 {
@@ -206,13 +209,15 @@ public class SysLoginService
      */
     public String wxloing(String mobileCode,String jsCode,String areaId) {
         //根据jsCode换取openid
-        String openId = getOpenId(jsCode);
+        SysDept dept = wxPayService.getDeptObjByAreaId(Long.parseLong(areaId));
+        log.info("【微信登录/wxlogin】获取到运营商对象：【{}】", JSON.toJSON(dept));
+        String openId = getOpenId(jsCode,dept.getAppid(),dept.getAppSecret());
         String url = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=";
         String phoneNumber = null;
         AsUser user = null;
 
         /** 根据手机号获取到用户名*/
-        SysDept dept = wxPayService.getDeptObjByAreaId(Long.parseLong(areaId));
+
         String token = AccessTokenUtil.getToken(dept.getAppid(), dept.getAppSecret());
         url = url+token;
         JSONObject jsonObject = new JSONObject();
@@ -286,8 +291,10 @@ public class SysLoginService
      */
     public String loginByopenid(String jsCode,String areaId) {
         //根据jsCode换取openid
-        String openid = getOpenId(jsCode);
-        AsUser user = asUserService.selectUserByWxopenid(openid);
+        SysDept dept = wxPayService.getDeptObjByAreaId(Long.parseLong(areaId));
+        log.info("【微信登录/wxlogin】获取到运营商对象：【{}】", JSON.toJSON(dept));
+        String openId = getOpenId(jsCode,dept.getAppid(),dept.getAppSecret());
+        AsUser user = asUserService.selectUserByWxopenid(openId);
         if(ObjectUtils.isEmpty(user)){
            throw new ServiceException("未查询到用户信息");
         }else{
@@ -318,10 +325,8 @@ public class SysLoginService
         return tokenService.createToken(loginUser);
     }
 
-    private String getOpenId(String jsCode) {
+    private String getOpenId(String jsCode,String appId,String secret) {
         //根据jsCode换取openid
-        String appId = SpringUtils.getRequiredProperty("wx.appid");
-        String secret = SpringUtils.getRequiredProperty("wx.appSecret");
         String url = StrUtil.format("https://api.weixin.qq.com/sns/jscode2session?appid={}&secret={}&js_code={}&grant_type=authorization_code", appId, secret, jsCode);
         String s = HttpUtils.sendGet(url);
         WeChatMiniAuthorizeVo authorizeVo = JSONObject.parseObject(s, WeChatMiniAuthorizeVo.class);

electripper-system/src/main/java/com/ruoyi/system/domain/EtOperatingArea.java

@@ -30,6 +30,10 @@ public class EtOperatingArea extends BaseEntityPlus implements Serializable
     @TableId(value = "area_id", type = IdType.AUTO)
     private Long areaId;
 
+    /** 运营商id */
+    @TableField(exist = false)
+    private Long deptId;
+
     /** 区域名称 */
     @Excel(name = "区域名称")
     private String areaName;

electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java

@@ -94,6 +94,14 @@ public interface EtOrderMapper
      */
     public List<EtOrder> isInOrder(@Param("userId") Long userId,@Param("orderNo") String orderNo);
 
+    /**
+     * 查询当前车辆是否有正在进行中的订单
+     *
+     * @param sn 用户id
+     * @return 结果
+     */
+    public List<EtOrder> isInOrderBySn(@Param("sn") String sn);
+
     /**
      * 检验预约订单只能有一个
      *

electripper-system/src/main/java/com/ruoyi/system/service/IEtOperatingAreaService.java

@@ -92,9 +92,10 @@ public interface IEtOperatingAreaService extends IService<EtOperatingArea>
      *
      * @param longitude 经度
      * @param latitude 纬度
+     * @param deptId 运营商id
      * @return 结果
      */
-    EtOperatingArea getAreaInfoByLocation(String longitude, String latitude);
+    EtOperatingArea getAreaInfoByLocation(String longitude, String latitude,String deptId);
 
     /**
      * 根据部门ID获取运营区选择框列表

electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java

@@ -110,6 +110,11 @@ public interface IEtOrderService
      */
     List<EtOrder> isInOrder(Long userId,String orderNo);
 
+    /**
+     * 查询当前车辆是否有正在进行中的订单
+     */
+    Boolean isInOrderBySn(String sn);
+
     /**
      * 创建订单
      * @param order 订单信息

electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java

@@ -437,7 +437,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         String token = Token.getToken();
         String finalOrderNo = orderNo;
         /** 2.发送命令*/
-        ResponseVo responseVo = sendCommandWithResp(asDevice.getMac(), token, IotConstants.COMMAND_OPEN, "编号开锁");
+        ResponseVo responseVo = sendCommandWithResp(asDevice.getMac(), token, IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5, "编号开锁");
         if(responseVo.getCode() != 0){
             throw new ServiceException("【扫码/编号开锁骑行】更新车辆状态失败");
         }
@@ -501,7 +501,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         String token = Token.getToken();
         Boolean execute = transactionTemplate.execute(e -> {
             /** 2.发送命令*/
-            sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_OPEN,"管理员开锁");
+            sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_20,"管理员开锁");
             asDevice.setIsAdminUnlocking("1");
             asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN);
             int i = asDeviceMapper.updateAsDevice(asDevice);
@@ -689,7 +689,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         /** 1.获取token*/
         String token = Token.getToken();
         /** 2.发送命令*/
-        sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_LLOSE,"临时锁车");
+        sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_LLOSE+IotConstants.COMMAND_FREQUENCY_3600,"临时锁车");
         asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);
         if(StrUtil.isNotBlank(orderNo)){//有订单号，则是用户临时锁车
             /**  改变车辆状态：4-临时锁车 */
@@ -721,7 +721,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         if(StrUtil.isBlank(sn))throw new ServiceException("sn不能为空");
         AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn);
         /** 2.发送命令*/
-        sendCommand(asDevice.getMac(), Token.getToken(),IotConstants.COMMAND_CLOSE,"管理员锁车");
+        sendCommand(asDevice.getMac(), Token.getToken(),IotConstants.COMMAND_CLOSE+IotConstants.COMMAND_FREQUENCY_3600,"管理员锁车");
         asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);
         asDevice.setIsAdminUnlocking("0");
         int device = asDeviceMapper.updateAsDevice(asDevice);
@@ -750,7 +750,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         Boolean execute = transactionTemplate.execute(e -> {
             /** TODO  临时解锁*/
             /** 2.发送命令*/
-            sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_OPEN,"临时解锁");
+            sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5,"临时解锁");
             //间隔1秒
 //            try {
 //                Thread.sleep(500);
@@ -960,7 +960,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
             String token = Token.getToken();
             AsDevice device = asDeviceMapper.selectAsDeviceBySn(order.getSn());
             /** 2. 车辆远程关锁*/
-            sendCommand(device.getMac(), token,IotConstants.COMMAND_CLOSE,"还车关锁");
+            sendCommand(device.getMac(), token,IotConstants.COMMAND_CLOSE+IotConstants.COMMAND_FREQUENCY_3600,"还车关锁");
             /** 4. 更新车辆状态*/
             device.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);
             device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);
@@ -1260,7 +1260,8 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         List<EtParkingArea> parkingAreas = parkingAreaService.selectEtParkingAreaList(parkingArea);
         if(ObjectUtil.isNull(parkingAreas) || parkingAreas.size() == 0){
             log.info("运营区【{}】没有禁停区,",areaId);
-            throw new ServiceException("运营区【{}】没有禁停区"+areaId.toString());
+            return false;
+//            throw new ServiceException("运营区【{}】没有禁停区"+areaId.toString());
         }
         for (EtParkingArea etParkingArea : parkingAreas) {
             if(etParkingArea.getType().equals(ServiceConstants.PARKING_AREA_TYPE_NO_PARKFING)){

electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.AsUser;
 import com.ruoyi.common.core.domain.entity.SysDictType;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.map.GeoUtils;
@@ -243,13 +244,16 @@ public class EtOperatingAreaServiceImpl extends ServiceImpl<EtOperatingAreaMappe
      *
      * @param longitude 经度
      * @param latitude 纬度
+     * @param deptId 运营商
      * @return 结果
      */
     @Override
-    public EtOperatingArea getAreaInfoByLocation(String longitude, String latitude) {
+    public EtOperatingArea getAreaInfoByLocation(String longitude, String latitude,String deptId) {
         double lon = Double.parseDouble(longitude);
         double lat = Double.parseDouble(latitude);
-        List<EtOperatingArea> etOperatingAreas = etOperatingAreaService.selectEtOperatingAreaList(new EtOperatingArea());
+        EtOperatingArea area1 = new EtOperatingArea();
+        area1.setDeptId(Long.parseLong(deptId));
+        List<EtOperatingArea> etOperatingAreas = etOperatingAreaService.selectEtOperatingAreaList(area1);
         EtOperatingArea area = null;
         for(EtOperatingArea etOperatingArea:etOperatingAreas){
             String boundary = etOperatingArea.getBoundary();
@@ -274,21 +278,25 @@ public class EtOperatingAreaServiceImpl extends ServiceImpl<EtOperatingAreaMappe
             GeometryFactory geometryFactory = new GeometryFactory();
             Coordinate coordinate = new Coordinate(lon, lat);
             Point point = geometryFactory.createPoint(coordinate);
-            for(EtOperatingArea etOperatingArea:etOperatingAreas){
-                Geometry geometry = GeoUtils.fromWkt(etOperatingArea.getBoundary());
-                if (geometry.contains(point)) {
-                   return etOperatingArea;
-                }else{
-                    // 获取多边形的外边界
-                    Coordinate[] coordinates = geometry.getCoordinates();
-                    for (Coordinate coord : coordinates) {
-                        double distance = GeoUtils.calculateDistance(lat, lon, coord.y, coord.x);
-                        if (distance < minDistance) {
-                            minDistance = distance;
-                            closestArea = etOperatingArea;
+            if(ObjectUtil.isNotNull(etOperatingAreas) && etOperatingAreas.size()>0){
+                for(EtOperatingArea etOperatingArea:etOperatingAreas){
+                    Geometry geometry = GeoUtils.fromWkt(etOperatingArea.getBoundary());
+                    if (geometry.contains(point)) {
+                        return etOperatingArea;
+                    }else{
+                        // 获取多边形的外边界
+                        Coordinate[] coordinates = geometry.getCoordinates();
+                        for (Coordinate coord : coordinates) {
+                            double distance = GeoUtils.calculateDistance(lat, lon, coord.y, coord.x);
+                            if (distance < minDistance) {
+                                minDistance = distance;
+                                closestArea = etOperatingArea;
+                            }
                         }
                     }
                 }
+            }else{
+                throw new ServiceException("没有找到任何运营区");
             }
             return closestArea;
         }

electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java

@@ -812,4 +812,12 @@ public class EtOrderServiceImpl implements IEtOrderService
         }
         return inOrder;
     }
+    /**
+     * 查询当前车辆是否有正在进行中的订单
+     */
+    @Override
+    public Boolean isInOrderBySn(String sn) {
+        List<EtOrder> inOrder = etOrderMapper.isInOrderBySn(sn);
+        return inOrder.size() > 0;
+    }
 }

electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml

@@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_dept d on d.dept_id = ad.dept_id
         where 1 = 1
         <if test="areaName != null  and areaName != ''"> and a.area_name like concat('%', #{areaName}, '%')</if>
+        <if test="deptId != null "> and d.dept_id = #{deptId}</if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>

electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml

@@ -146,6 +146,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="isInOrderBySn" resultMap="EtOrderResult" parameterType="String">
+        <include refid="selectEtOrderVo"/>
+            where sn = #{sn} and status =2  and type = 1
+    </select>
+
     <select id="checkIsUnique" resultType="Integer" parameterType="Long">
         select count(1) from et_order
         where user_id = #{userId} and status = 0 and type=1

electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectEtOperatingAreaBySerialNumber" resultMap="SysDeptResult">
 		<include refid="selectDeptVo"/>
-		where merchant_serial_number = #{merchantSerialNumber}
+		where wechatpay_serial = #{wechatpaySerial}
 	</select>
 
 	<insert id="insertDept" parameterType="SysDept" useGeneratedKeys="true" keyProperty="deptId">