1. 根据mac修改sn

2. 还车时保存手机定位

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

@@ -838,6 +838,23 @@ public class AppVerifyController extends BaseController
         return toAjax(asDeviceService.bandSn(asDevice));
     }
 
+    /**
+     * 根据mac修改sn
+     */
+    @Log(title = "根据mac修改sn", businessType = BusinessType.UPDATESN)
+    @PostMapping("/updateSn")
+    public AjaxResult updateSn(String sn,String mac,Long hardwareVersionId)
+    {
+        logger.info("根据mac修改sn：【sn="+sn+"】，【mac="+mac+"】,【hardwareVersionId="+hardwareVersionId+"】");
+        AsDevice asDevice = new AsDevice();
+        asDevice.setSn(sn);
+        asDevice.setMac(mac);
+        asDevice.setHardwareVersionId(hardwareVersionId);
+        asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NOT_BAND);
+        asDevice.setCreateTime(DateUtils.getNowDate());
+        return toAjax(asDeviceService.updateSn(asDevice));
+    }
+
     /**
      * 根据userId获取areaId(管理员属于哪个运营区)
      */

electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java

@@ -177,6 +177,11 @@ public enum BusinessType
      * 绑定
      */
     BAND,
+
+    /**
+     * 根据mac修改sn
+     */
+    UPDATESN,
     /**
      * 实名认证
      */

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

@@ -50,6 +50,14 @@ public class EtCommandLog extends BaseEntity
     @Excel(name = "纬度")
     private String latitude;
 
+    /** 手机经度 */
+    @Excel(name = "经度")
+    private String lon;
+
+    /** 手机纬度 */
+    @Excel(name = "纬度")
+    private String lat;
+
     /** 回调状态 */
     @Excel(name = "回调状态")
     private String callStatus;

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

@@ -90,6 +90,14 @@ public interface AsDeviceMapper extends BaseMapper<AsDevice>
      */
     public int updateAsDeviceBySn(AsDevice asDevice);
 
+    /**
+     * 根据MAC修改设备
+     *
+     * @param asDevice 设备
+     * @return 结果
+     */
+    public int updateAsDeviceByMac(AsDevice asDevice);
+
     /**
      * 删除设备
      *

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

@@ -195,6 +195,11 @@ public interface IAsDeviceService extends IService<AsDevice>
      */
     public ResponseVo sendCommandWithResp(String mac, String token, String command, String type,String orderNo);
 
+    /**
+     * 发送命令(带响应)
+     */
+    public ResponseVo sendCommandWithResp(String mac, String token, String command, String type,String orderNo,String lon,String lat);
+
     /**
      * 查询数据点
      */
@@ -370,6 +375,11 @@ public interface IAsDeviceService extends IService<AsDevice>
      */
     int bandSn(AsDevice asDevice);
 
+    /**
+     * 根据mac修改sn
+     */
+    int updateSn(AsDevice asDevice);
+
     /**
      * 根据mac号判断是否有绑定过
      */

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

@@ -1247,6 +1247,35 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         }, 0, TimeUnit.SECONDS);
     }
 
+    /* 异步保存发送命令日志*/
+    private void asynchronousSaveLogWithLocation(String url,String command,String mac,String result,String type,String orderNo,String userName,String lon,String lat) {
+        //异步保存发送命令日志
+        scheduledExecutorService.schedule(() -> {
+            EtCommandLog etCommandLog = new EtCommandLog();
+            etCommandLog.setUrl(url);
+            etCommandLog.setCommand(command);
+            etCommandLog.setType(type);
+            etCommandLog.setMac(mac);
+            AsDevice device = asDeviceMapper.selectAsDeviceByMac(mac);
+            etCommandLog.setSn(device.getSn());
+            etCommandLog.setResult(result);
+            etCommandLog.setLongitude(device.getLongitude());
+            etCommandLog.setLatitude(device.getLatitude());
+            etCommandLog.setLon(lon);
+            etCommandLog.setLat(lat);
+            etCommandLog.setCreateTime(DateUtils.getNowDate());
+            JSONObject paramsObj = JSON.parseObject(result);
+            String code = paramsObj.getString("code");
+            etCommandLog.setCallStatus(code);
+            etCommandLog.setOrderNo(orderNo);
+            etCommandLog.setCreateBy(userName);
+            int i = etCommandLogMapper.insertEtCommandLog(etCommandLog);
+            if(i>0){
+                log.info("【发送命令】异步保存发送命令日志");
+            }
+        }, 0, TimeUnit.SECONDS);
+    }
+
     @Override
     /** 发送命令*/
     public ResponseVo sendCommandWithResp(String mac, String token,String command,String type,String orderNo) {
@@ -1270,6 +1299,29 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         return JSON.parseObject(result,ResponseVo.class);
     }
 
+    @Override
+    /** 发送命令*/
+    public ResponseVo sendCommandWithResp(String mac, String token,String command,String type,String orderNo,String lon,String lat) {
+        String param = "device_name=" + mac + "&product_id=" + productId +"&timeout=" + timeout;
+        String sendUrl = iotUrl+ IotConstants.ADDS_COMMAND + "?"+param;
+        String result = HttpUtils.sendPostWithToken(sendUrl, command, token);
+        log.info("【"+type+"】===>IOT请求调用结果:【{}】",result);
+        ResponseVo responseVo = JSON.parseObject(result, ResponseVo.class);
+
+        if (responseVo.getCode() == 10500) { // 超时
+            log.info("第一次请求超时，进行第二次请求...");
+            result = HttpUtils.sendPostWithToken(sendUrl, command, token);
+            log.info("【" + type + "】===>IOT第二次请求调用结果:【{}】", result);
+            responseVo = JSON.parseObject(result, ResponseVo.class);
+        }
+
+        if(responseVo.getCode() != 0){
+            asynchronousUpdateOnlineStatus(mac);
+        }
+        asynchronousSaveLogWithLocation(sendUrl,command,mac,result,type,orderNo,null,lon,lat);
+        return JSON.parseObject(result,ResponseVo.class);
+    }
+
     /** 查询数据点*/
     @Override
     public DataPointRes historyDatapoints(String mac, String token) {
@@ -1750,7 +1802,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
             if(ServiceConstants.RETURN_TYPE_NORMAL.equals(returnType)){
                 if(!"true".equals(isBluetooth)){
                     /** 2. 车辆远程关锁*/
-                    ResponseVo responseVo = sendCommandWithResp(device.getMac(), token, IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "还车关锁",orderNo);
+                    ResponseVo responseVo = sendCommandWithResp(device.getMac(), token, IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "还车关锁",orderNo,lon,lat);
                     if(responseVo.getCode()!=0){
                         log.info("【还车关锁】远程关锁失败");
                         throw new ServiceException("远程关锁失败");
@@ -2722,12 +2774,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
     public int bandSn(AsDevice asDevice) {
         AsDevice device = asDeviceMapper.selectAsDeviceByMac(asDevice.getMac());
         if(StringUtils.isNotNull(device)){
-            device.setSn(asDevice.getSn());
+            throw new ServiceException("该MAC号已经存在");
-            device.setHardwareVersionId(asDevice.getHardwareVersionId());
-            int i = asDeviceMapper.updateAsDeviceBySn(device);
-            if(i>0){
-                log.info("【sn和mac号绑定】===>mac【{}】已经绑定过:更新sn【{}】成功",device.getMac(),device.getSn());
-            }
         }else{
             // 调用onenet接口
             CreateDeviceVo createDeviceVo = new CreateDeviceVo();
@@ -2755,6 +2802,23 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         return 1;
     }
 
+    /**
+     * 根据mac修改sn
+     */
+    @SneakyThrows
+    @Override
+    public int updateSn(AsDevice asDevice) {
+        AsDevice device = new AsDevice();
+        device.setSn(asDevice.getSn());
+        device.setHardwareVersionId(asDevice.getHardwareVersionId());
+        device.setMac(asDevice.getMac());
+        int i = asDeviceMapper.updateAsDeviceByMac(device);
+        if(i>0){
+            log.info("【sn和mac号绑定】===>mac【{}】已经绑定过:更新sn【{}】成功",device.getMac(),device.getSn());
+        }
+        return 1;
+    }
+
 
     /**
      * 更新最新的位置信息

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

@@ -356,9 +356,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where sn = #{sn}
     </update>
-    <update id="batchDisable">
-        update
 
+    <update id="updateAsDeviceByMac">
+        update et_device
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sn != null">sn = #{sn},</if>
+            <if test="hardwareVersionId != null">hardware_version_id = #{hardwareVersionId},</if>
+        </trim>
+        where mac = #{mac}
     </update>
 
     <delete id="deleteAsDeviceByDeviceId" parameterType="Long">

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

@@ -14,6 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="result"    column="result"    />
         <result property="longitude"    column="longitude"    />
         <result property="latitude"    column="latitude"    />
+        <result property="lon"    column="lon"    />
+        <result property="lat"    column="lat"    />
         <result property="callStatus"    column="call_status"    />
         <result property="orderNo"    column="order_no"    />
         <result property="createTime"    column="create_time"    />
@@ -22,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEtCommandLogVo">
-        select id, url, command, type, mac, sn, result, longitude, latitude, call_status, create_by, create_time, order_no, msg from et_command_log
+        select id, url, command, type, mac, sn, result, longitude, latitude, lon, lat, call_status, create_by, create_time, order_no, msg from et_command_log
     </sql>
 
     <select id="selectEtCommandLogList" parameterType="EtCommandLog" resultMap="EtCommandLogResult">
@@ -56,6 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="result != null">result,</if>
             <if test="latitude != null">latitude,</if>
             <if test="longitude != null">longitude,</if>
+            <if test="lat != null">lat,</if>
+            <if test="lon != null">lon,</if>
             <if test="callStatus != null">call_status,</if>
             <if test="orderNo != null">order_no,</if>
             <if test="createBy != null">create_by,</if>
@@ -71,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="result != null">#{result},</if>
             <if test="latitude != null">#{latitude},</if>
             <if test="longitude != null">#{longitude},</if>
+            <if test="lat != null">#{lat},</if>
+            <if test="lon != null">#{lon},</if>
             <if test="callStatus != null">#{callStatus},</if>
             <if test="orderNo != null">#{orderNo},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -90,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="result != null">result = #{result},</if>
             <if test="latitude != null">latitude = #{latitude},</if>
             <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="lat != null">lat = #{lat},</if>
+            <if test="lon != null">lon = #{lon},</if>
             <if test="callStatus != null">call_status = #{callStatus},</if>
             <if test="orderNo != null">order_no = #{orderNo},</if>
             <if test="msg != null">msg = #{msg},</if>