qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 调整

Browse Source
This commit is contained in:
邱贞招 2024-06-19 21:54:45 +08:00
parent 0a22b587fc
commit e84d807428
9 changed files with 136 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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号查询车辆实时信息
*/

27
electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java
View File

@ -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);
}
/**
* 车辆上线

12
electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsUserController.java
View File

@ -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));
}

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

@ -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{

4
electripper-system/src/main/java/com/ruoyi/system/domain/EtFeeRule.java
View File

@ -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;

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

@ -135,7 +135,12 @@ public interface IAsDeviceService extends IService<AsDevice>
/**
* 响铃寻车
*/
Boolean ring(String mac);
Boolean ring(String sn);
/**
* 响铃寻车
*/
Boolean ringByMac(String mac);
/**
* 临时锁车
@ -145,7 +150,12 @@ public interface IAsDeviceService extends IService<AsDevice>
/**
* 管理员锁车
*/
Boolean adminLock(String mac);
Boolean adminLock(String sn);
/**
* 管理员锁车
*/
Boolean adminLockByMac(String mac);
/**
* 临时解锁
@ -172,6 +182,11 @@ public interface IAsDeviceService extends IService<AsDevice>
*/
Boolean unlocking(String sn);
/**
* 管理员开锁
*/
Boolean unlockingByMac(String mac);
/**
* 车辆上线
*/

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

@ -548,6 +548,30 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> 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<AsDeviceMapper, AsDevice> 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<AsDeviceMapper, AsDevice> 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;
}
/**
* 临时解锁
*/

5
electripper-system/src/main/resources/mapper/system/AsUserMapper.xml
View File

@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
order by u.login_date desc
</select>
<select id="selectAllocatedList" parameterType="AsUser" resultMap="AsUserResult">
@ -167,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sysUserId != null and sysUserId != ''">sys_user_id,</if>
<if test="areaId != null">area_id,</if>
<if test="isAuthentication != null">is_authentication,</if>
<if test="appName != null">app_name,</if>
<if test="appName != null and appName != ''">app_name,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@ -190,7 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sysUserId != null and sysUserId != ''">#{sysUserId},</if>
<if test="areaId != null">#{areaId},</if>
<if test="isAuthentication != null">#{isAuthentication},</if>
<if test="appName != null">#{appName},</if>
<if test="appName != null and appName != ''">#{appName},</if>
sysdate()
)
</insert>

4
electripper-system/src/main/resources/mapper/system/EtFeeRuleMapper.xml
View File

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="ruleId" column="rule_id" />
<result property="areaId" column="area_id" />
<result property="deptId" column="dept_id" />
<result property="deptName" column="dept_name" />
<result property="name" column="name" />
<result property="explain" column="explain" />
<result property="status" column="status" />
@ -34,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectEtFeeRuleList" parameterType="EtFeeRule" resultMap="EtFeeRuleResult">
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
<if test="name != null and name != ''"> and r.`name` like concat('%', #{name}, '%')</if>
<if test="status != null and status != ''"> and r.status = #{status}</if>
<if test="deptId != null "> and r.dept_id = #{deptId}</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>