From 34198da5c1d6e7a08ccf049cda540abbc139a1fe Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Mon, 17 Jun 2024 15:19:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/AppController.java | 2 + .../controller/system/AsDeviceController.java | 71 +++++++++++++++++++ .../src/main/resources/application.yml | 2 + .../common/utils/onenet/CreateDeviceVo.java | 11 +++ .../service/impl/AsDeviceServiceImpl.java | 30 +++++++- .../mapper/system/AsDeviceMapper.xml | 2 + 6 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 electripper-common/src/main/java/com/ruoyi/common/utils/onenet/CreateDeviceVo.java diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java index 7a1a2bd..38fc1ed 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java @@ -1,10 +1,12 @@ package com.ruoyi.web.controller.app; import cn.hutool.core.util.StrUtil; +import com.ruoyi.common.constant.ServiceConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.CommonUtil; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.system.domain.*; import com.ruoyi.system.service.*; import com.wechat.pay.java.service.payments.model.Transaction; diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java index 11b9d48..4faf95d 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java @@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.util.StrUtil; import com.ruoyi.system.domain.AsDevice; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -114,4 +115,74 @@ public class AsDeviceController extends BaseController { return toAjax(asDeviceService.deleteAsDeviceByDeviceIds(deviceIds)); } + + /** + * 响铃寻车 + */ + @PreAuthorize("@ss.hasPermi('system:device:ring')") + @PostMapping("/device/ring") + public AjaxResult ring(String sn) + { + if(StrUtil.isBlank(sn)){ + logger.info("没有sn号参数：【sn={}】",sn); + return error("请传sn号参数"+"【sn="+sn+"】"); + } + Boolean i =asDeviceService.ring(sn); + return success(i); + } + + /** + * 管理员开锁 + */ + @PreAuthorize("@ss.hasPermi('system:device:unlocking')") + @Log(title = "管理员开锁", businessType = BusinessType.UNLOCKING) + @PostMapping("/admin/unlocking") + public AjaxResult unlocking(String sn) + { + logger.info("【管理员开锁请求】：{}",sn); + Boolean aBoolean =asDeviceService.unlocking(sn); + return success(aBoolean); + } + + /** + * 管理员关锁 + */ + @PreAuthorize("@ss.hasPermi('system:device:unlocking')") + @Log(title = "管理员关锁", businessType = BusinessType.LOCK) + @PostMapping("/admin/lock") + public AjaxResult lock(String sn) + { + logger.info("【管理员关锁请求】：{}",sn); + Boolean aBoolean =asDeviceService.adminLock(sn); + return success(aBoolean); + } + + + /** + * 车辆上线 + */ + @PreAuthorize("@ss.hasPermi('system:device:online')") + @Log(title = "车辆上线", businessType = BusinessType.ONLINE) + @PostMapping("/device/online") + public AjaxResult online(String sn) + { + logger.info("【车辆上线请求】：{}",sn); + Boolean aBoolean =asDeviceService.online(sn); + return success(aBoolean); + } + + /** + * 车辆下线 + */ + @PreAuthorize("@ss.hasPermi('system:device:online')") + @Log(title = "车辆下线", businessType = BusinessType.OFFLINE) + @PostMapping("/device/offline") + public AjaxResult offline(String sn) + { + logger.info("【车辆下线请求】：{}",sn); + Boolean aBoolean =asDeviceService.offline(sn); + return success(aBoolean); + } + + } diff --git a/electripper-admin/src/main/resources/application.yml b/electripper-admin/src/main/resources/application.yml index 4b27b92..b866895 100644 --- a/electripper-admin/src/main/resources/application.yml +++ b/electripper-admin/src/main/resources/application.yml @@ -223,6 +223,8 @@ iot: daysToExpire: 100 # 推送消息token token: JZWgouXXNcgTbxCyRCLKbQkKQMhyUrfL + # 创建设备地址 + deviceUrl: https://iot-api.heclouds.com/device/create geo: # 高德地图key web服务 手续费 key: 834f1f029671d84272554528311ff0f1 diff --git a/electripper-common/src/main/java/com/ruoyi/common/utils/onenet/CreateDeviceVo.java b/electripper-common/src/main/java/com/ruoyi/common/utils/onenet/CreateDeviceVo.java new file mode 100644 index 0000000..55f0824 --- /dev/null +++ b/electripper-common/src/main/java/com/ruoyi/common/utils/onenet/CreateDeviceVo.java @@ -0,0 +1,11 @@ +package com.ruoyi.common.utils.onenet; + +import lombok.Data; + +@Data +public class CreateDeviceVo { + + private String device_name; + + private String product_id; +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java index 98afe94..b807a5c 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java @@ -20,6 +20,7 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.utils.map.GeoUtils; +import com.ruoyi.common.utils.onenet.CreateDeviceVo; import com.ruoyi.common.utils.onenet.IotUtil; import com.ruoyi.common.utils.onenet.ResponseVo; import com.ruoyi.common.utils.onenet.Token; @@ -104,6 +105,9 @@ public class AsDeviceServiceImpl extends ServiceImpl i @Value(value = "${iot.timeout}") private String timeout; + @Value(value = "${iot.deviceUrl}") + private String deviceUrl; + /** * 查询设备 * @@ -659,7 +663,6 @@ public class AsDeviceServiceImpl extends ServiceImpl i JSONObject paramsObj = JSON.parseObject(result); String code = paramsObj.getString("code"); //记录命令 - if (!HttpStatus.IOT_SUCCESS.equals(code)) { throw new ServiceException(code+"-----"+ IotUtil.formatMsg(code)); @@ -1442,9 +1445,32 @@ public class AsDeviceServiceImpl extends ServiceImpl i * sn和mac号绑定 * 注册onenet设备 */ + @SneakyThrows @Override public int bandSn(AsDevice asDevice) { - return asDeviceMapper.insert(asDevice); + // 调用onenet接口 + CreateDeviceVo createDeviceVo = new CreateDeviceVo(); + createDeviceVo.setDevice_name(asDevice.getMac()); + createDeviceVo.setProduct_id(productId); + String result = HttpUtils.sendPostWithToken(deviceUrl,JSON.toJSONString(createDeviceVo), Token.getToken()); + log.info("【sn和mac号绑定】===>IOT请求调用结果:【{}】",result); + JSONObject paramsObj = JSON.parseObject(result); + String code = paramsObj.getString("code"); + //记录命令 + if (!HttpStatus.IOT_SUCCESS.equals(code)) + { + throw new ServiceException(code+"-----"+ paramsObj.getString("msg")); + } + try{ + int insert = asDeviceMapper.insert(asDevice); + if(insert==0){ + throw new ServiceException("该SN已经存在，请勿重复绑定！"); + } + }catch (Exception e){ + log.error("该SN已经存在",e.getMessage()); + throw new ServiceException("该SN已经存在，请勿重复绑定！"); + } + return 1; } diff --git a/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml b/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml index 3e48466..4eb6766 100644 --- a/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml @@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and de.lock_status = #{lockStatus} ${params.dataScope} + order by de.create_time desc