chuangte/share-space-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
邱贞招 2025-02-20 15:07:27 +08:00
parent ab372189ea
commit b80b64f9c7
11 changed files with 95 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
share-space-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java
View File

@ -14,6 +14,7 @@ import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.onenet.Token;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.ss.article.service.IArticleService;
import com.ruoyi.ss.articleClassify.service.IArticleClassifyService;
@ -45,6 +46,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.List;
/**
@ -294,4 +298,14 @@ public class AppController extends BaseController
}
}
/**
* 获取token
*/
@GetMapping("/getToken")
public AjaxResult getToken()
{
return success(Token.getToken());
}
}

15
share-space-admin/src/main/java/com/ruoyi/web/controller/app/AppDeviceAdminController.java
View File

@ -88,7 +88,20 @@ public class AppDeviceAdminController extends BaseController {
} else {
return error("请输入SN码");
}
return toAjax(deviceService.reboot(device, "小程序管理员重启设备"));
return toAjax(deviceService.reboot(device, "小程序控制台重启设备"));
}
@ApiOperation("管理员开门")
@DeviceAdminRequired
@PutMapping("/openDoor")
public AjaxResult openDoor(@RequestParam String sn) {
DeviceVO device = null;
if (StringUtils.hasText(sn)) {
device = deviceService.selectBySn(sn);
} else {
return error("请输入SN码");
}
return toAjax(deviceService.openDoor(device, "小程序控制台开门"));
}
}

10
share-space-system/src/main/java/com/ruoyi/ss/commandLog/service/impl/CommandLogServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.ss.commandLog.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.constant.CacheConstants;
@ -126,11 +127,10 @@ public class CommandLogServiceImpl implements ICommandLogService
etCommandLog.setSn(deviceService.selectSnByMac(mac));
etCommandLog.setResult(result);
etCommandLog.setCreateTime(DateUtils.getNowDate());
JSONObject paramsObj = JSON.parseObject(result);
String code = paramsObj.getString("code");
etCommandLog.setCallStatus(code);
etCommandLog.setUserId(user.getUserId());
etCommandLog.setUserName(user.getUsername());
if(ObjectUtil.isNotEmpty(user)){
etCommandLog.setUserId(user.getUserId());
etCommandLog.setUserName(user.getUsername());
}
etCommandLog.setReason(reason);
int i = commandLogMapper.insertEtCommandLog(etCommandLog);
if(i>0){

3
share-space-system/src/main/java/com/ruoyi/ss/device/domain/Device.java
View File

@ -253,4 +253,7 @@ public class Device extends BaseEntity
@ApiModelProperty("投放类型：1-房间门；2-麻将桌；3-台球桌；4-房间灯；5-卫生间门；6-大门")
private String placementType;
@ApiModelProperty("电压系数")
private BigDecimal vxs;
}

4
share-space-system/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
View File

@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sd.over_price,
sd.rent_time,
sd.lock_user_id,
sd.vxs,
sd.surplus_ele,
sd.limit_recharge_time,
sd.limit_recharge_reason,
@ -370,6 +371,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="onlineStatus1 != null">online_status1,</if>
<if test="onlineStatus2 != null">online_status2,</if>
<if test="version != null">version,</if>
<if test="vxs != null">vxs,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="storeId != null">#{storeId},</if>
@ -424,6 +426,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="onlineStatus1 != null">#{onlineStatus1},</if>
<if test="onlineStatus2 != null">#{onlineStatus2},</if>
<if test="version != null">#{version},</if>
<if test="vxs != null">#{vxs},</if>
</trim>
</insert>
@ -497,6 +500,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="onlineStatus1 != null">online_status1 = #{onlineStatus1},</if>
<if test="onlineStatus2 != null">online_status2 = #{onlineStatus2},</if>
<if test="version != null">version = #{version},</if>
<if test="vxs != null">vxs = #{vxs},</if>
</trim>
where device_id = #{deviceId}
</update>

5
share-space-system/src/main/java/com/ruoyi/ss/device/service/DeviceService.java
View File

@ -276,6 +276,11 @@ public interface DeviceService
*/
int reboot(DeviceVO device,String reason);
/**
* 开门
*/
int openDoor(DeviceVO device, String reason);
/**
* 开关设施
*/

14
share-space-system/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.ss.device.service.impl;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.redis.RedisLock;
import com.ruoyi.common.core.redis.enums.RedisLockKey;
@ -415,6 +416,16 @@ public class DeviceServiceImpl implements DeviceService
return res != null && res.isSuccess() ? 1 : 0;
}
/**
* 开门
*/
@Override
public int openDoor(DeviceVO device, String reason) {
ServiceUtil.assertion(device == null, "设备不存在");
CommandResponse res = iotService.openDoor(device, reason);
return res != null && res.isSuccess() ? 1 : 0;
}
/**
* 开关设施
*/
@ -1218,6 +1229,7 @@ public class DeviceServiceImpl implements DeviceService
.filter(item -> Objects.equals(device.getMac(), item.getMac()) || Objects.equals(device.getMac2(), item.getMac()))
.findFirst().orElse(null);
log.info("拉取的deviceInfo: {}", JSON.toJSON(deviceInfo));
// 更新设备信息
device.setDeviceId(device.getDeviceId());
if (deviceInfo != null) {
@ -1228,6 +1240,7 @@ public class DeviceServiceImpl implements DeviceService
device.setVoltage(deviceInfo.getV());
device.setElectricity(deviceInfo.getA());
device.setVersion(deviceInfo.getVersion());
device.setVxs(deviceInfo.getVxs());
// 判断是否支持WIFI，支持则更新
if (ModelTag.hasTag(device.getModelTags(), ModelTag.WIFI)) {
@ -1274,6 +1287,7 @@ public class DeviceServiceImpl implements DeviceService
// 异步更新设备信息
for (DeviceVO device : list) {
scheduledExecutorService.schedule(() -> {
log.info("异步更新数据库的device: {}", device);
// if (StringUtils.hasText(onlineType)) {
// 获取并设置在线状态
this.setOnlineStatus(device);

3
share-space-system/src/main/java/com/ruoyi/ss/store/service/impl/StoreServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.ss.store.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.exception.ServiceException;
@ -234,7 +235,7 @@ public class StoreServiceImpl implements IStoreService
// 同步修改店铺名称，则修改房间、设施、卫生间中的店铺名称
StoreVO storeVO = storeMapper.selectEStoreByStoreId(eStore.getStoreId());
if(!eStore.getName().equals(storeVO.getName())){
if(ObjectUtil.isNotNull(eStore.getName()) && !eStore.getName().equals(storeVO.getName())){
syncModifyStoreName(eStore.getStoreId(), eStore.getName());
}
return Boolean.TRUE;

2
share-space-system/src/main/java/com/ruoyi/system/iot/domain/IotDeviceInfo.java
View File

@ -32,6 +32,7 @@ public class IotDeviceInfo {
private String model; // 型号
private String wifi; // WIFI
private String version; // 版本号
private BigDecimal vxs; // 电压系数
public static IotDeviceInfo newDefaultInstance() {
return IotDeviceInfo.builder()
@ -45,6 +46,7 @@ public class IotDeviceInfo {
.time(BigDecimal.ZERO)
.model(null)
.version(null)
.vxs(BigDecimal.ONE)
.build();
}

9
share-space-system/src/main/java/com/ruoyi/system/iot/service/IotService.java
View File

@ -44,15 +44,16 @@ public interface IotService {
*/
boolean open(IotDevice device,boolean isIgnore,String reason);
// /**
// * 重启设备
// */
// boolean reboot(DeviceVO device,String reason);
/**
* 重启设备
*/
CommandResponse reboot(IotDevice device, String reason);
/**
* 开门
*/
CommandResponse openDoor(IotDevice device, String reason);
/**
* 断电
*

29
share-space-system/src/main/java/com/ruoyi/system/iot/service/impl/IotServiceImpl.java
View File

@ -745,8 +745,7 @@ public class IotServiceImpl implements IotService {
return null;
}
String command = IotConstants.COMMAND_SET_VXS + vxs + IotConstants.COMMAND_SEPARATOR;
sendCommand(deviceName, command, productId,reason);
return null;
return sendCommand(deviceName, command, productId,reason);
}
/**
@ -767,6 +766,24 @@ public class IotServiceImpl implements IotService {
return res;
}
/**
* 开门
*/
@Override
public CommandResponse openDoor(IotDevice device, String reason) {
if (device == null || StringUtils.isBlank(device.getProductId())) {
return null;
}
CommandResponse res = null;
if (StringUtils.hasText(device.iotMac2())) {
res = openDoor(device.iotMac2(), device.getProductId(), reason);
}
if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.iotMac1())) {
res = openDoor(device.iotMac1(), device.getProductId(), reason);
}
return res;
}
private CommandResponse reboot(String deviceName, String productId, String reason) {
if (StringUtils.isAnyBlank(deviceName, productId)) {
return null;
@ -774,4 +791,12 @@ public class IotServiceImpl implements IotService {
String command = IotConstants.COMMAND_REBOOT;
return sendCommand(deviceName, command, productId, reason);
}
private CommandResponse openDoor(String deviceName, String productId, String reason) {
if (StringUtils.isAnyBlank(deviceName, productId)) {
return null;
}
String command = IotConstants.COMMAND_RECHARGE +"5";
return sendCommand(deviceName, command, productId, reason);
}
}