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

前端相关界面完善 新增APP设备录入功能

Browse Source
This commit is contained in:
SjS 2025-05-19 18:13:14 +08:00
parent e0c8100eee
commit d79d9fdebe
28 changed files with 183 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/enums/LogBizType.java
View File

@ -17,6 +17,7 @@ public enum LogBizType {
UNIT("5", "单位"),
SHIFT("6", "调班"),
SUIT("SUIT", "套餐"),
DEVICE("DEVICE", "设备"),
ARTICLE_CATEGORY("ARTICLE_CATEGORY", "文章分类"),
BOOTH("BOOTH", "卡座");

8
ruoyi-service/src/main/java/com/ruoyi/bst/booth/domain/Booth.java
View File

@ -30,10 +30,10 @@ public class Booth extends BaseEntity
@NotNull(message = "分区ID不能为空",groups = ValidGroup.Create.class)
private Long partId;
@Excel(name = "卡座编号")
@ApiModelProperty("卡座编号")
@NotBlank(message = "卡座编号不能为空",groups = ValidGroup.Create.class)
private String boothNo;
@Excel(name = "卡座名")
@ApiModelProperty("卡座名")
@NotBlank(message = "卡座名不能为空",groups = ValidGroup.Create.class)
private String boothName;
@Excel(name = "过期时间")
@ApiModelProperty("过期时间")

4
ruoyi-service/src/main/java/com/ruoyi/bst/booth/domain/BoothVO.java
View File

@ -23,6 +23,10 @@ public class BoothVO extends Booth{
@ApiModelProperty("店铺名称")
private String storeName;
@Excel(name = "商户名称")
@ApiModelProperty("商户名称")
private String mchName;
@Excel(name = "店铺ID")
@ApiModelProperty("店铺ID")
private Long storeId;

22
ruoyi-service/src/main/java/com/ruoyi/bst/booth/mapper/BoothMapper.xml
View File

@ -12,13 +12,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="userId" column="user_id" />
<result property="expiredTime" column="expired_time" />
<result property="orderNum" column="order_num" />
<result property="boothName" column="booth_name" />
</resultMap>
<sql id="selectBoothVo">
select
bb.booth_id,
bb.part_id,
bb.booth_no,
bb.booth_name,
bb.picture,
bb.create_time,
bb.user_id,
@ -28,7 +29,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.part_name as part_name,
bp_parent.part_name as parent_name,
bs.store_name as store_name,
bs.user_id as mch_id
bs.user_id as mch_id,
mch_su.user_name as mch_name
from <include refid="searchTables"/>
</sql>
@ -37,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join bst_part bp on bp.part_id = bb.part_id
left join bst_part bp_parent on bp.parent_id = bp_parent.part_id
left join bst_store bs on bp.store_id = bs.store_id
left join sys_user mch_su on bs.user_id = mch_su.user_id
</sql>
<sql id="searchCondition">
@ -44,10 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.userId != null "> and bb.user_id = #{query.userId}</if>
<if test="query.deleted != null "> and bb.deleted = #{query.deleted}</if>
<if test="query.boothId != null "> and bb.booth_id = #{query.boothId}</if>
<if test="query.boothNo != null and query.boothNo != ''"> and bb.booth_no like concat('%', #{query.boothNo}, '%')</if>
<if test="query.boothName != null and query.boothName != ''"> and bb.booth_name like concat('%', #{query.boothName}, '%')</if>
<if test="query.picture != null and query.picture != ''"> and bb.picture = #{query.picture}</if>
<if test="query.partName != null and query.partName != ''"> and bp.part_name like concat('%', #{query.partName}, '%') </if>
<if test="query.partName != null and query.partName != ''"> and bp.part_name like concat('%', #{query.partName}, '%') </if>
<if test="query.time != null"> and bb.expired_time &gt;= #{query.time} </if>
<if test="query.storeName != null and query.storeName != ''"> and bs.store_name like concat('%', #{query.storeName}, '%') </if>
${@com.ruoyi.framework.util.DataScopeUtil@create(query.scope)
@ -73,7 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- selectIdByQuery -->
<select id="selectIdByQuery" resultType="Long">
select bb.booth_id <include refid="searchTables"/>
select bb.booth_id from
<include refid="searchTables"/>
<where>
<include refid="searchCondition"/>
</where>
@ -84,7 +87,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from <include refid="searchTables"/>
<where>
<if test="query.boothId != null "> and bb.booth_id != #{query.boothId}</if>
<if test="query.boothNo != null "> and bb.booth_no = #{query.boothNo}</if>
</where>
</select>
@ -95,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBoothByBoothNo" resultType="com.ruoyi.bst.booth.domain.BoothVO">
<include refid="selectBoothVo"/>
where bb.booth_no = #{boothNo}
where bb.booth_name = #{boothName}
</select>
<insert id="insertBooth" parameterType="Booth" useGeneratedKeys="true" keyProperty="boothId">
@ -105,14 +107,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="picture != null">picture,</if>
<if test="createTime != null">create_time,</if>
<if test="orderNum != null">order_num,</if>
<if test="boothNo != null">booth_no,</if>
<if test="boothName != null">booth_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="partId != null">#{partId},</if>
<if test="picture != null">#{picture},</if>
<if test="createTime != null">#{createTime},</if>
<if test="orderNum != null">#{orderNum},</if>
<if test="boothNo != null">#{boothNo},</if>
<if test="boothName != null">#{boothName},</if>
</trim>
</insert>
@ -199,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="updateColumns">
<if test="data.partId != null">part_id = #{data.partId},</if>
<if test="data.boothNo != null">booth_no = #{data.boothNo},</if>
<if test="data.boothName != null">booth_name = #{data.boothName},</if>
<if test="data.picture != null">picture = #{data.picture},</if>
<if test="data.createTime != null">create_time = #{data.createTime},</if>
<if test="data.userId != null">user_id = #{data.userId},</if>

4
ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/BoothService.java
View File

@ -86,7 +86,7 @@ public interface BoothService
public int deleteBoothByBoothId(Long boothId);
public BoothVO bindUser(Long userId, String boothNo);
public BoothVO bindUser(Long userId, Long boothId);
public DeviceIotVO lighting(BoothVO booth, Long userId,boolean requiredIot);
@ -96,5 +96,5 @@ public interface BoothService
int unbindUser(BoothVO booth);
int userChangeBind(String usingBoothNo ,String changeBoothNo,Long userId);
int userChangeBind(Long usingBoothId ,Long changeBoothId,Long userId);
}

6
ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/BoothValidator.java
View File

@ -20,9 +20,5 @@ public interface BoothValidator {
*/
boolean canDeleteAll(List<Long> ids);
/**
* 校验
* @param boothId
*/
void validate(Long boothId,String boothNo);
}

4
ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/impl/BoothConverterImpl.java
View File

@ -17,7 +17,7 @@ public class BoothConverterImpl implements BoothConverter {
// 设置基本信息
po.setPartId(data.getPartId());
po.setPicture(data.getPicture());
po.setBoothNo(data.getBoothNo());
po.setBoothName(data.getBoothName());
po.setOrderNum(data.getOrderNum());
return po;
}
@ -32,7 +32,7 @@ public class BoothConverterImpl implements BoothConverter {
po.setBoothId(data.getBoothId());
po.setPartId(data.getPartId());
po.setPicture(data.getPicture());
po.setBoothNo(data.getBoothNo());
po.setBoothName(data.getBoothName());
po.setOrderNum(data.getOrderNum());
return po;
}

69
ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/impl/BoothServiceImpl.java
View File

@ -100,12 +100,12 @@ public class BoothServiceImpl implements BoothService {
}
@Override
public BoothVO selectBoothByBoothNo(String boothNo, boolean scope) {
if (boothNo == null) {
public BoothVO selectBoothByBoothNo(String boothName, boolean scope) {
if (boothName == null) {
return null;
}
BoothQuery query = new BoothQuery();
query.setBoothNo(boothNo);
query.setBoothName(boothName);
query.setScope(scope);
query.addStorePermission(StoreStaffPermission.BOOTH_VIEW.getCode());
return this.selectOne(query);
@ -139,15 +139,9 @@ public class BoothServiceImpl implements BoothService {
@Override
public int insertBooth(Booth booth) {
booth.setCreateTime(DateUtils.getNowDate());
Integer result = transactionTemplate.execute(status -> {
int rows = boothMapper.insertBooth(booth);
if (rows > 0) {
// 后校验
boothValidator.validate(booth.getBoothId(), booth.getBoothNo());
}
return rows;
});
return result == null ? 0 : result;
PartVO partVO = partService.selectPartById(booth.getPartId());
ServiceUtil.assertion(partVO == null, "id为%s的分区信息不存在", booth.getPartId());
return boothMapper.insertBooth(booth);
}
/**
@ -158,9 +152,9 @@ public class BoothServiceImpl implements BoothService {
*/
@Override
public int updateBooth(Booth booth) {
if (booth.getBoothNo() != null) {
boothValidator.validate(booth.getBoothId(), booth.getBoothNo());
}
ServiceUtil.assertion(booth.getPartId() == null, "分区ID不能为空");
PartVO partVO = partService.selectPartById(booth.getPartId());
ServiceUtil.assertion(partVO == null, "id为%s的分区信息不存在", booth.getPartId());
return boothMapper.updateBooth(booth);
}
@ -187,18 +181,19 @@ public class BoothServiceImpl implements BoothService {
}
@Override
public BoothVO bindUser(Long userId, String boothNo) {
public BoothVO bindUser(Long userId, Long boothId) {
boolean lock = redisLock.lock(RedisLockKey.BOOTH_BIND_USER, userId);
ServiceUtil.assertion(!lock, "您当前操作过于频繁，请稍后重试");
try {
//查询当前用户当前绑定的卡座
BoothQuery query = new BoothQuery();
query.setUserId(userId);
query.setTime(LocalDateTime.now());
List<BoothVO> list = boothMapper.selectBoothList(query);
if (list != null && !list.isEmpty()){
return CollectionUtils.firstElement(list);
};
BoothVO booth = boothMapper.selectBoothByBoothNo(boothNo);
if (list != null && !list.isEmpty()) {
return CollectionUtils.firstElement(list);
}
BoothVO booth = boothMapper.selectBoothByBoothId(boothId);
ServiceUtil.assertion(booth == null, "当前卡座不存在");
if (booth.getUserId() != null && booth.getExpiredTime() != null && booth.getExpiredTime().isAfter(LocalDateTime.now())) {
// 卡座未过期，被其他用户绑定
@ -233,15 +228,15 @@ public class BoothServiceImpl implements BoothService {
}
@Override
public int userChangeBind(String usingBoothNo, String changeBoothNo, Long userId) {
public int userChangeBind(Long usingBoothId, Long changeBoothId, Long userId) {
BoothVO usingBooth = boothMapper.selectBoothByBoothNo(usingBoothNo);
ServiceUtil.assertion(usingBooth == null, "编号为%s的卡座信息不存在", usingBoothNo);
ServiceUtil.assertion(usingBooth.getUserId() == null, "请先绑定编号为%s的卡座后再进行操作", usingBoothNo);
ServiceUtil.assertion(!usingBooth.getUserId().equals(userId), "您无权限更改当前卡座信息", usingBoothNo);
BoothVO changeBooth = boothMapper.selectBoothByBoothNo(changeBoothNo);
ServiceUtil.assertion(changeBooth == null, "编号为%s的卡座信息不存在", changeBoothNo);
boolean lock = redisLock.lock(RedisLockKey.BOOTH_CHANGE_USER, changeBoothNo);
BoothVO usingBooth = boothMapper.selectBoothByBoothId(usingBoothId);
ServiceUtil.assertion(usingBooth == null, "ID为%s的卡座信息不存在", usingBoothId);
ServiceUtil.assertion(usingBooth.getUserId() == null, "请先绑定ID为%s的卡座后再进行操作", usingBoothId);
ServiceUtil.assertion(!usingBooth.getUserId().equals(userId), "您无权限更改当前卡座信息", usingBoothId);
BoothVO changeBooth = boothMapper.selectBoothByBoothId(changeBoothId);
ServiceUtil.assertion(changeBooth == null, "ID为%s的卡座信息不存在", changeBoothId);
boolean lock = redisLock.lock(RedisLockKey.BOOTH_CHANGE_USER, changeBoothId);
ServiceUtil.assertion(!lock, "您当前操作过于频繁，请稍后重试");
try {
Integer result = transactionTemplate.execute(status -> {
@ -262,7 +257,7 @@ public class BoothServiceImpl implements BoothService {
});
return result;
} finally {
redisLock.unlock(RedisLockKey.BOOTH_CHANGE_USER, changeBoothNo);
redisLock.unlock(RedisLockKey.BOOTH_CHANGE_USER, changeBoothId);
}
}
@ -283,17 +278,17 @@ public class BoothServiceImpl implements BoothService {
DeviceQuery deviceQuery = new DeviceQuery();
deviceQuery.setBoothId(booth.getBoothId());
deviceQuery.setDeleted(false);
deviceQuery.setBoothNo(booth.getBoothNo());
deviceQuery.setBoothId(booth.getBoothId());
List<DeviceVO> deviceVOList = deviceMapper.selectDeviceList(deviceQuery);
ServiceUtil.assertion(CollectionUtils.isEmpty(deviceVOList), "当前卡座下无可用设备");
// 设备相关校验
if (deviceVOList != null && !deviceVOList.isEmpty()) {
deviceVOList.forEach(deviceVO -> {
ServiceUtil.assertion(deviceVO == null || deviceVO.getDeviceId() == null, "设备不存在");
ServiceUtil.assertion(StringUtils.isAllBlank(deviceVO.getMac(), deviceVO.getMac2()), "设备MAC号为空");
ServiceUtil.assertion(deviceVO.getDuration() == null, "设备编号为%s的设备暂未设置开启时长", deviceVO.getDeviceNo());
});
}
deviceVOList.forEach(deviceVO -> {
ServiceUtil.assertion(deviceVO == null || deviceVO.getDeviceId() == null, "设备不存在");
ServiceUtil.assertion(StringUtils.isAllBlank(deviceVO.getMac(), deviceVO.getMac2()), "设备MAC号为空");
ServiceUtil.assertion(deviceVO.getDuration() == null, "设备编号为%s的设备暂未设置开启时长", deviceVO.getDeviceNo());
});
// 新建IotVO 返回数据库操作与物联网操作结果
DeviceIotVO iotVO = new DeviceIotVO();

22
ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/impl/BoothValidatorImpl.java
View File

@ -37,28 +37,6 @@ public class BoothValidatorImpl implements BoothValidator {
return canOperate(ids);
}
@Override
public void validate(Long boothId,String boothNo) {
BoothVO booth = boothMapper.selectBoothByBoothId(boothId);
ServiceUtil.assertion(booth == null, "卡座不存在");
// 判断卡座编号是否重复
this.validateNo(boothId, boothNo);
}
private void validateNo(Long boothId, String boothNo) {
if (StringUtils.isBlank(boothNo)) {
return;
}
BoothQuery query = new BoothQuery();
query.setDeleted(false);
query.setBoothId(boothId);
query.setBoothNo(boothNo);
int count = boothMapper.selectCount(query);
ServiceUtil.assertion(count > 0,"卡座编号已存在");
}
// 是否可以操作卡座
private boolean canOperate(List<Long> boothIds) {
return hasPermission(boothIds);

7
ruoyi-service/src/main/java/com/ruoyi/bst/device/domain/DeviceQuery.java
View File

@ -21,8 +21,11 @@ public class DeviceQuery extends DeviceVO{
@ApiModelProperty("店铺id")
private Long storeId;
@ApiModelProperty("卡座编号")
private String boothNo;
@ApiModelProperty("MAC列表")
private List<String> macList;
@ApiModelProperty("卡座名称")
private String boothName;
@ApiModelProperty("是否查询未绑定的设备")
private Boolean isUnbound;

20
ruoyi-service/src/main/java/com/ruoyi/bst/device/domain/dto/DeviceBltUploadDTO.java Normal file
View File

@ -0,0 +1,20 @@
package com.ruoyi.bst.device.domain.dto;
import com.ruoyi.iot.domain.IotDeviceDetail;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Data
public class DeviceBltUploadDTO {
@ApiModelProperty("设备MAC")
@NotBlank(message = "设备MAC不能为空")
private String mac;
@ApiModelProperty("系统数据")
@NotNull(message = "系统数据不能为空")
private IotDeviceDetail sys;
}

2
ruoyi-service/src/main/java/com/ruoyi/bst/device/domain/vo/DeviceMacSnVO.java
View File

@ -8,5 +8,5 @@ public class DeviceMacSnVO {
// MAC
private String mac;
// SN
private String sn;
private String deviceNo;
}

10
ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.java
View File

@ -7,6 +7,7 @@ import com.ruoyi.bst.device.domain.Device;
import com.ruoyi.bst.device.domain.DeviceCountVO;
import com.ruoyi.bst.device.domain.DeviceVO;
import com.ruoyi.bst.device.domain.DeviceQuery;
import com.ruoyi.bst.device.domain.vo.DeviceMacSnVO;
import com.ruoyi.common.domain.vo.LongIntegerVO;
import com.ruoyi.common.domain.vo.StringIntegerVO;
import org.apache.ibatis.annotations.Param;
@ -176,4 +177,13 @@ public interface DeviceMapper
* @return
*/
List<StringIntegerVO> selectOnlineStatusCount(@Param("query") DeviceQuery query);
/**
* 根据mac查询SN
*
* @param query
* @return
*/
List<DeviceMacSnVO> selectMacSnList(@Param("query") DeviceQuery query);
}

29
ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
View File

@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
su.user_name,
bs.store_name,
bs.store_id,
bb.booth_no as position
bb.booth_name as position
from <include refid="searchTables"/>
</sql>
@ -104,16 +104,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<sql id="searchCondition">
<if test="query.deviceNo != null and query.deviceNo != ''"> and bd.device_no = #{query.deviceNo}</if>
<if test="query.deviceNo != null and query.deviceNo != ''"> and bd.device_no like concat('%', #{query.deviceNo}, '%')</if>
<if test="query.deviceId != null and query.deviceId != ''"> and bd.device_id = #{query.deviceId}</if>
<if test="query.storeId != null and query.storeId != ''"> and bd.store_id = #{query.storeId}</if>
<if test="query.boothId != null "> and bd.booth_id = #{query.boothId}</if>
<if test="query.boothNo != null and query.boothNo !=''"> and bb.booth_no = #{query.boothNo}</if>
<if test="query.boothName != null and query.boothName !=''"> and bb.booth_name = #{query.boothName}</if>
<if test="query.userId != null "> and bd.user_id = #{query.userId}</if>
<if test="query.modelId != null "> and bd.model_id = #{query.modelId}</if>
<if test="query.deviceName != null and query.deviceName != ''"> and bd.device_name like concat('%', #{query.deviceName}, '%')</if>
<if test="query.storeName != null and query.storeName != ''"> and bs.store_name like concat('%', #{query.storeName}, '%')</if>
<if test="query.mac != null and query.mac != ''"> and bd.mac = #{query.mac}</if>
<if test="query.mac != null and query.mac != ''"> and bd.mac like concat('%', #{query.mac}, '%')</if>
<if test="query.mac2 != null and query.mac2 != ''"> and bd.mac2 = #{query.mac2}</if>
<if test="query.totalElectriQuantity != null "> and bd.total_electri_quantity = #{query.totalElectriQuantity}</if>
<if test="query.onlineStatus != null and query.onlineStatus != ''"> and bd.online_status = #{query.onlineStatus}</if>
@ -143,6 +143,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.wxs != null "> and bd.wxs = #{query.wxs}</if>
<if test="query.isUnbound != null and query.isUnbound "> and bd.booth_id IS NULL</if>
<if test="query.lastRecoverTime != null "> and bd.last_recover_time = #{query.lastRecoverTime}</if>
<if test="query.macList != null and query.macList.size() > 0">
and bd.mac in
<foreach collection="query.macList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
${@com.ruoyi.framework.util.DataScopeUtil@create(query.scope)
.userSetAlias("bd.user_id")
.storeAlias("bd.store_id",query.storePermissions)
@ -262,6 +268,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by `key`
</select>
<!--selectMacSnList-->
<select id="selectMacSnList" resultType="com.ruoyi.bst.device.domain.vo.DeviceMacSnVO">
select
bd.mac,
bd.device_no
from bst_device bd
<where>
<include refid="searchCondition"/>
</where>
</select>
<insert id="insertDevice" parameterType="Device" useGeneratedKeys="true" keyProperty="deviceId">
<selectKey resultType="Long" order="AFTER" keyProperty="deviceId">
select LAST_INSERT_ID()
@ -880,7 +897,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="unbindStore">
update bst_device
set store_id = null
set store_id = null,booth_id = null
where device_id = #{deviceId}
</update>
@ -901,7 +918,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="unbindBooth">
update bst_device
set booth_id = null,store_id = null
set booth_id = null
where device_id = #{deviceId}
</update>

13
ruoyi-service/src/main/java/com/ruoyi/bst/device/service/DeviceService.java
View File

@ -12,6 +12,7 @@ import com.ruoyi.bst.booth.domain.BoothVO;
import com.ruoyi.bst.device.domain.Device;
import com.ruoyi.bst.device.domain.DeviceVO;
import com.ruoyi.bst.device.domain.DeviceQuery;
import com.ruoyi.bst.device.domain.vo.DeviceMacSnVO;
import com.ruoyi.bst.store.domain.StoreVO;
import com.ruoyi.common.domain.vo.LongIntegerVO;
@ -136,10 +137,9 @@ public interface DeviceService
/**
* 根据设备ID解除绑定
* @param deviceId
* @param booth
* @return
*/
public void unbindBooth(Long deviceId,BoothVO booth);
public void unbindBooth(Long deviceId);
/**
@ -170,4 +170,13 @@ public interface DeviceService
* @param store
*/
void unbindStore(Long deviceId, StoreVO store);
/**
* 根据mac查询SN
*
* @param macList
* @return
*/
public List<DeviceMacSnVO> listSnByMac(List<String> macList);
}

13
ruoyi-service/src/main/java/com/ruoyi/bst/device/service/impl/DeviceServiceImpl.java
View File

@ -22,6 +22,7 @@ import com.ruoyi.bst.device.domain.dto.DeviceWifiDTO;
import com.ruoyi.bst.device.domain.enums.DeviceOnlineStatus;
import com.ruoyi.bst.device.domain.enums.DevicePowerStatus;
import com.ruoyi.bst.device.domain.enums.DeviceStatus;
import com.ruoyi.bst.device.domain.vo.DeviceMacSnVO;
import com.ruoyi.bst.model.domain.ModelVO;
import com.ruoyi.bst.model.domain.enums.ModelTag;
import com.ruoyi.bst.model.service.ModelService;
@ -378,7 +379,7 @@ public class DeviceServiceImpl implements DeviceService
}
@Override
public void unbindBooth(Long deviceId, BoothVO booth) {
public void unbindBooth(Long deviceId) {
DeviceVO device = deviceMapper.selectDeviceByDeviceId(deviceId);
ServiceUtil.assertion(device == null, "设备未录入");
@ -448,4 +449,14 @@ public class DeviceServiceImpl implements DeviceService
int i = deviceMapper.unbindStore(device.getDeviceId());
ServiceUtil.assertion(i==0,"绑定失败");
}
@Override
public List<DeviceMacSnVO> listSnByMac(List<String> macList) {
if (CollectionUtils.isEmptyElement(macList)) {
return Collections.emptyList();
}
DeviceQuery query = new DeviceQuery();
query.setMacList(macList);
return deviceMapper.selectMacSnList(query);
}
}

8
ruoyi-service/src/main/java/com/ruoyi/bst/lightingNum/domain/LightingNumVO.java
View File

@ -19,12 +19,12 @@ public class LightingNumVO extends LightingNum{
@ApiModelProperty("用户昵称")
private String nickName;
@Excel(name = "用户账号")
@ApiModelProperty("用户账号")
@Excel(name = "商户账号")
@ApiModelProperty("商户账号")
private String mchName;
@Excel(name = "用户昵称")
@ApiModelProperty("用户昵称")
@Excel(name = "商户昵称")
@ApiModelProperty("商户昵称")
private String mchNickName;
}

3
ruoyi-service/src/main/java/com/ruoyi/bst/lightingNum/mapper/LightingNumMapper.xml
View File

@ -38,7 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.userId != null "> and bln.user_id = #{query.userId}</if>
<if test="query.storeId != null "> and bln.store_id = #{query.storeId}</if>
<if test="query.number != null "> and bln.number = #{query.number}</if>
<if test="query.userName != null "> and bs.user_name like concat('%',#{query.userName},'%') </if>
<if test="query.userName != null "> and su.user_name like concat('%',#{query.userName},'%') </if>
<if test="query.nickName != null "> and su.nick_name like concat('%',#{query.nickName},'%') </if>
<if test="query.storeName != null "> and bs.store_name like concat('%',#{query.storeName},'%')</if>
<if test="query.mchId != null "> and bs.user_id = #{query.mchId}</if>
${@com.ruoyi.framework.util.DataScopeUtil@create(query.scope)

3
ruoyi-service/src/main/java/com/ruoyi/bst/order/domain/OrderQuery.java
View File

@ -18,6 +18,9 @@ public class OrderQuery extends OrderVO{
@ApiModelProperty("用户id列表")
private List<Long> userIds;
@ApiModelProperty("下单用户")
private String userName;
@ApiModelProperty("商户id")
private Long mchId;

3
ruoyi-service/src/main/java/com/ruoyi/bst/order/mapper/OrderMapper.xml
View File

@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<sql id="searchCondition">
<if test="query.orderNo != null and query.orderNo != ''"> and bo.order_no = #{query.orderNo}</if>
<if test="query.orderNo != null and query.orderNo != ''"> and bo.order_no like concat('%', #{query.orderNo}, '%')</if>
<if test="query.id != null and query.id != ''"> and bo.id = #{query.id}</if>
<if test="query.storeId != null "> and bo.store_id = #{query.storeId}</if>
<if test="query.storeName != null and query.storeName != ''"> and bo.store_name like concat('%', #{query.storeName}, '%')</if>
@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.endTime != null"> and date(bo.create_time) &lt;= #{query.endTime}</if>
<if test="query.createDate != null"> and date(bo.create_time) = #{query.createDate}</if>
<if test="query.mchId != null"> and bs.user_id = #{query.mchId}</if>
<if test="query.userName != null"> and su.user_name like concat('%', #{query.userName}, '%')</if>
<if test="query.statusList != null and query.statusList.size() > 0">
and bo.status in
<foreach collection="query.statusList" item="item" open="(" separator="," close=")">

2
ruoyi-service/src/main/java/com/ruoyi/bst/pay/service/impl/PayConverterImpl.java
View File

@ -37,7 +37,7 @@ public class PayConverterImpl implements PayConverter {
// 基础信息
pay.setStatus(PayStatus.WAIT_PAY.getStatus());
pay.setExpireTime(LocalDateTime.now().plusMinutes(10));
pay.setRemark("充值订单:"+order.getOrderNo());
pay.setDescription("充值订单:"+order.getOrderNo());
// 订单信息
pay.setBstType(PayBstType.ORDER.getType());

1
ruoyi-service/src/main/java/com/ruoyi/bst/refund/mapper/RefundMapper.xml
View File

@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.storeId != null and query.storeId != ''"> and br.store_id = #{query.storeId}</if>
<if test="query.month != null">and month(br.create_time) = #{query.month}</if>
<if test="query.year != null">and year(br.create_time) = #{query.year}</if>
<if test="query.createDate != null">and date(br.create_time) = #{query.createDate}</if>
<if test="query.createDateRange != null and query.createDateRange.size() > 1">
and date(br.create_time) &gt;= #{query.createDateRange[0]}
and date(br.create_time) &lt;= #{query.createDateRange[1]}

1
ruoyi-service/src/main/java/com/ruoyi/bst/store/domain/Store.java
View File

@ -31,6 +31,7 @@ public class Store extends BaseEntity
@Excel(name = "用户ID")
@ApiModelProperty("用户ID")
@NotNull(message = "所属用户不能为空",groups = {ValidGroup.Create.class})
private Long userId;
@Excel(name = "店铺名称")

2
ruoyi-service/src/main/java/com/ruoyi/bst/store/service/impl/StoreConverterImpl.java
View File

@ -14,6 +14,7 @@ public class StoreConverterImpl implements StoreConverter {
Store po = new Store();
// 设置基本信息
po.setStoreName(data.getStoreName());
po.setUserId(data.getUserId());
po.setUserName(data.getUserName());
po.setPhone(data.getPhone());
po.setStartTime(data.getStartTime());
@ -33,6 +34,7 @@ public class StoreConverterImpl implements StoreConverter {
Store po = new Store();
// 设置基本信息
po.setStoreId(data.getStoreId());
po.setUserId(data.getUserId());
po.setStoreName(data.getStoreName());
po.setUserName(data.getUserName());
po.setPhone(data.getPhone());

32
ruoyi-web/src/main/java/com/ruoyi/web/app/AppBoothController.java
View File

@ -32,12 +32,12 @@ public class AppBoothController extends BaseController {
private BoothService boothService;
@ApiOperation("爆灯")
@PutMapping("/{boothNo}/lighting")
public AjaxResult lighting(@PathVariable @ApiParam("设备id") String boothNo,boolean requiredIot) {
if (boothNo == null) {
@PutMapping("/{boothId}/lighting")
public AjaxResult lighting(@PathVariable @ApiParam("设备id") Long boothId,boolean requiredIot) {
if (boothId == null) {
return error("卡座编号不能为空");
}
BoothVO booth = boothService.selectBoothByBoothNo(boothNo);
BoothVO booth = boothService.selectBoothByBoothId(boothId);
if (booth == null) {
return error("当前卡座信息不存在");
}
@ -51,21 +51,21 @@ public class AppBoothController extends BaseController {
}
@ApiOperation("用户绑定卡座")
@PutMapping("/{boothNo}/bindUser")
public AjaxResult bindBooth(@PathVariable String boothNo) {
if (boothNo == null) {
@PutMapping("/{boothId}/bindUser")
public AjaxResult bindBooth(@PathVariable Long boothId) {
if (boothId == null) {
return error("卡座编号不能为空");
};
return AjaxResult.success(boothService.bindUser(getUserId(),boothNo));
return AjaxResult.success(boothService.bindUser(getUserId(),boothId));
}
@ApiOperation("用户解绑卡座")
@PutMapping("/{boothNo}/unbind")
public AjaxResult unbindBooth(@PathVariable String boothNo) {
if (boothNo == null) {
@PutMapping("/{boothId}/unbind")
public AjaxResult unbindBooth(@PathVariable Long boothId) {
if (boothId == null) {
return error("卡座编号不能为空");
};
BoothVO booth = boothService.selectBoothByBoothNo(boothNo);
BoothVO booth = boothService.selectBoothByBoothId(boothId);
ServiceUtil.assertion(booth==null,"当前卡座不存在");
ServiceUtil.assertion(!booth.getUserId().equals(getUserId()),"您无权操作当前卡座设备");
return AjaxResult.success(boothService.unbindUser(booth));
@ -73,11 +73,11 @@ public class AppBoothController extends BaseController {
@ApiOperation("用户换绑卡座")
@PutMapping("/userChangeBind")
public AjaxResult userChangeBind( String usingBoothNo ,String changeBoothNo) {
if (usingBoothNo == null || changeBoothNo == null) {
return error("卡座编号不能为空");
public AjaxResult userChangeBind( Long usingBoothId ,Long changeBoothId) {
if (usingBoothId == null || changeBoothId == null) {
return error("卡座ID不能为空");
};
return AjaxResult.success(boothService.userChangeBind(usingBoothNo,changeBoothNo,getUserId()));
return AjaxResult.success(boothService.userChangeBind(usingBoothId,changeBoothId,getUserId()));
}
@ApiOperation("查询用户绑定的卡座和设备信息")

6
ruoyi-web/src/main/java/com/ruoyi/web/bst/BoothController.java
View File

@ -114,7 +114,6 @@ public class BoothController extends BaseController {
if (!partValidator.canCheckForPart(booth.getPartId())) {
return AjaxResult.error("您无权选择ID为" + booth.getPartId() + "的分区");
}
// 卡座编号唯一性校验
return toAjax(boothService.insertBooth(booth));
}
@ -154,7 +153,6 @@ public class BoothController extends BaseController {
if (boothId == null) {
return AjaxResult.error("卡座ID不能为空");
}
if (!boothValidator.canEdit(boothId)) {
return AjaxResult.error("您无更改该卡座相关的权限");
}
@ -165,12 +163,10 @@ public class BoothController extends BaseController {
if (!storeValidator.canEdit(booth.getStoreId())) {
return AjaxResult.error("您无权限操作当前店铺信息");
}
// 设备权限校验
if (!deviceValidator.canOperate(device.getDeviceId())) {
return AjaxResult.error("您无权限操作当设备信息");
}
// 绑定设备
if (device.getDeviceId() != null) {
return AjaxResult.success("操作成功", deviceService.bindBoothById(device.getDeviceId(), booth));
@ -209,7 +205,7 @@ public class BoothController extends BaseController {
return AjaxResult.error("您无权限操作当设备信息");
}
deviceService.unbindBooth(device.getDeviceId(), booth);
deviceService.unbindBooth(device.getDeviceId());
return AjaxResult.success("操作成功");
}
}

2
ruoyi-web/src/main/java/com/ruoyi/web/bst/ChangeRecordController.java
View File

@ -90,7 +90,7 @@ public class ChangeRecordController extends BaseController
@PreAuthorize("@ss.hasPermi('bst:changeRecord:consumeRecord')")
@Log(title = "爆灯次数变化")
@Log(title = "消费记录列表")
@GetMapping("/consumeRecord")
public AjaxResult consumeRecord(ChangeRecordQuery query) {
if (query.getUserId() == null) {

9
ruoyi-web/src/main/java/com/ruoyi/web/bst/DeviceController.java
View File

@ -196,5 +196,14 @@ public class DeviceController extends BaseController
return AjaxResult.success(deviceService.updateDeviceStore(device));
}
/**
* 查询MAC对应的SN
*/
@PreAuthorize("@ss.hasPermi('bst:device:list')")
@PostMapping("/listSnByMac")
public AjaxResult listSnByMac(@RequestBody List<String> macList) {
return success(deviceService.listSnByMac(macList));
}
}