From e84d807428519337afd924b3900bf35c11a7f42c Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Wed, 19 Jun 2024 21:54:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/AppController.java | 15 +++++ .../controller/system/AsDeviceController.java | 27 ++++++++ .../controller/system/AsUserController.java | 12 ---- .../web/service/SysLoginService.java | 2 +- .../com/ruoyi/system/domain/EtFeeRule.java | 4 ++ .../system/service/IAsDeviceService.java | 19 +++++- .../service/impl/AsDeviceServiceImpl.java | 66 +++++++++++++++++++ .../resources/mapper/system/AsUserMapper.xml | 5 +- .../mapper/system/EtFeeRuleMapper.xml | 4 +- 9 files changed, 136 insertions(+), 18 deletions(-) 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 38fc1ed..45ec0a7 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 @@ -230,6 +230,21 @@ public class AppController extends BaseController return success(i); } + /** + * 响铃寻车用mac + */ + @PostMapping("/device/ringByMac") + public AjaxResult ringByMac(String mac) + { + if(StrUtil.isBlank(mac)){ + logger.info("没有mac号参数：【mac={}】",mac); + return error("请传mac号参数"+"【mac="+mac+"】"); + } + Boolean i =asDeviceService.ringByMac(mac); + return success(i); + } + + /** * 根据sn号查询车辆实时信息 */ 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 4faf95d..6122657 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 @@ -144,6 +144,20 @@ public class AsDeviceController extends BaseController return success(aBoolean); } + + /** + * 管理员开锁 + */ + @PreAuthorize("@ss.hasPermi('system:device:unlocking')") + @Log(title = "管理员开锁", businessType = BusinessType.UNLOCKING) + @PostMapping("/admin/unlockingByMac") + public AjaxResult unlockingByMac(String mac) + { + logger.info("【管理员开锁请求】：{}",mac); + Boolean aBoolean =asDeviceService.unlockingByMac(mac); + return success(aBoolean); + } + /** * 管理员关锁 */ @@ -157,6 +171,19 @@ public class AsDeviceController extends BaseController return success(aBoolean); } + /** + * 管理员关锁 + */ + @PreAuthorize("@ss.hasPermi('system:device:unlocking')") + @Log(title = "管理员关锁", businessType = BusinessType.LOCK) + @PostMapping("/admin/lockByMac") + public AjaxResult lockByMac(String mac) + { + logger.info("【管理员关锁请求】：{}",mac); + Boolean aBoolean =asDeviceService.adminLockByMac(mac); + return success(aBoolean); + } + /** * 车辆上线 diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsUserController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsUserController.java index ae44cc6..82edd98 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsUserController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsUserController.java @@ -138,18 +138,6 @@ public class AsUserController extends BaseController @PutMapping("/bandSystemUser") public AjaxResult bandSystemUser(@RequestBody AsUser user) { - Long sysUserId = user.getSysUserId(); - if(sysUserId == null || sysUserId == 0){ - user.setRole("1"); - } - SysUser sysUser = sysUserService.selectUserById(sysUserId); - if(sysUser.getUserName().equals(SpringUtils.getRequiredProperty("et.repairAdmin"))){ - user.setRole("2"); - }else if(sysUser.getUserName().equals(SpringUtils.getRequiredProperty("et.operateAdmin"))){ - user.setRole("3"); - }else{ - user.setRole("1"); - } return toAjax(asUserService.bandSystemUser(user)); } diff --git a/electripper-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/electripper-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index bb91b72..7b757df 100644 --- a/electripper-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/electripper-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -243,7 +243,7 @@ public class SysLoginService asUser.setWxopenid(openId); asUser.setAreaId(Long.parseLong(areaId)); asUser.setAppName(dept.getAppName()); - asUser.setRemark(dept.getAppName()); + log.info("【微信登录/wxlogin】用户不存在，自动注册用户：【{}】", JSON.toJSON(asUser)); int i = asUserService.insertUser(asUser); user = asUser; }else{ diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtFeeRule.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtFeeRule.java index 67a4e54..28342ad 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtFeeRule.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtFeeRule.java @@ -28,6 +28,10 @@ public class EtFeeRule extends BaseEntity @Excel(name = "运营区id") private Long areaId; + /** 运营商 */ + @Excel(name = "运营商") + private String deptName; + /** 运营商id */ @Excel(name = "运营商id") private Long deptId; diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java b/electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java index 8735a9b..577e46b 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java @@ -135,7 +135,12 @@ public interface IAsDeviceService extends IService /** * 响铃寻车 */ - Boolean ring(String mac); + Boolean ring(String sn); + + /** + * 响铃寻车 + */ + Boolean ringByMac(String mac); /** * 临时锁车 @@ -145,7 +150,12 @@ public interface IAsDeviceService extends IService /** * 管理员锁车 */ - Boolean adminLock(String mac); + Boolean adminLock(String sn); + + /** + * 管理员锁车 + */ + Boolean adminLockByMac(String mac); /** * 临时解锁 @@ -172,6 +182,11 @@ public interface IAsDeviceService extends IService */ Boolean unlocking(String sn); + /** + * 管理员开锁 + */ + Boolean unlockingByMac(String mac); + /** * 车辆上线 */ 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 6c49ad6..04eed36 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 @@ -548,6 +548,30 @@ public class AsDeviceServiceImpl extends ServiceImpl i return Boolean.TRUE; } + /** + * 管理员开锁 + */ + @SneakyThrows + @Override + public Boolean unlockingByMac(String mac) { + AsDevice asDevice = asDeviceMapper.selectAsDeviceByMac(mac); + /** 1.获取token*/ + String token = Token.getToken(); + Boolean execute = transactionTemplate.execute(e -> { + /** 2.发送命令*/ + sendCommand(mac, token,IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_20,"管理员开锁"); + asDevice.setIsAdminUnlocking("1"); + asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN); + int i = asDeviceMapper.updateAsDevice(asDevice); + if(i>0){ + log.info("管理员开锁，更新设备状态成功"); + } + return Boolean.TRUE; + }); + if(!execute)throw new ServiceException("管理员开锁失败"); + return Boolean.TRUE; + } + /** * 车辆上线 */ @@ -722,6 +746,25 @@ public class AsDeviceServiceImpl extends ServiceImpl i return Boolean.TRUE; } + /** + * 响铃寻车 + * @param mac + * @return + */ + @SneakyThrows + @Override + public Boolean ringByMac(String mac) { + /** 1.获取token*/ + String token = Token.getToken(); + Boolean execute = transactionTemplate.execute(e -> { + /** 2.发送命令*/ + sendCommand(mac, token,IotConstants.COMMAND_PLAY1,"响铃寻车"); + return Boolean.TRUE; + }); + if(!execute)throw new ServiceException("响铃寻车失败"); + return Boolean.TRUE; + } + /** * 临时锁车 * @param orderNo @@ -782,6 +825,29 @@ public class AsDeviceServiceImpl extends ServiceImpl i return Boolean.TRUE; } + /** + * 管理员锁车 + * @param mac + * @return + */ + @Transactional + @SneakyThrows + @Override + public Boolean adminLockByMac(String mac) { + if(StrUtil.isBlank(mac))throw new ServiceException("mac不能为空"); + AsDevice asDevice = asDeviceMapper.selectAsDeviceByMac(mac); + /** 2.发送命令*/ + 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); + if(device==0){ + log.info("【临时解锁】改变车辆状态失败"); + throw new ServiceException("【临时锁车】改变车辆状态失败"); + } + return Boolean.TRUE; + } + /** * 临时解锁 */ diff --git a/electripper-system/src/main/resources/mapper/system/AsUserMapper.xml b/electripper-system/src/main/resources/mapper/system/AsUserMapper.xml index 02aa150..962b635 100644 --- a/electripper-system/src/main/resources/mapper/system/AsUserMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/AsUserMapper.xml @@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + order by u.login_date desc - select r.rule_id, r.dept_id, d.dept_name area, r.`name`, r.`explain`, + select r.rule_id, r.dept_id, d.dept_name, r.`name`, r.`explain`, r.status, r.auto_refund_deposit, r.order_exceed_minutes, r.order_exceed_warn, r.free_ride_time, r.rental_unit, r.riding_rule, r.riding_rule_json, r.charging_cycle, r.charging_cycle_value, r.capped_amount, r.instructions, r.create_by, r.create_time from et_fee_rule r @@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where 1 = 1 and r.`name` like concat('%', #{name}, '%') and r.status = #{status} + and r.dept_id = #{deptId} ${params.dataScope}