diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqClientIdController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqClientIdController.java new file mode 100644 index 000000000..e0abb6d91 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqClientIdController.java @@ -0,0 +1,110 @@ +package org.dromara.web.controller.app; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.common.core.validate.SaveGroup; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.web.domain.vo.EqClientIdVo; +import org.dromara.web.domain.bo.EqClientIdBo; +import org.dromara.web.service.IEqClientIdService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 客户端与用户关联 + * + * @author zzc + * @date 2024-10-27 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dromara/clientId") +public class EqClientIdController extends BaseController { + + private final IEqClientIdService eqClientIdService; + + /** + * 查询客户端与用户关联列表 + */ + @GetMapping("/list") + public TableDataInfo list(EqClientIdBo bo, PageQuery pageQuery) { + return eqClientIdService.queryPageList(bo, pageQuery); + } + + /** + * 导出客户端与用户关联列表 + */ + @Log(title = "客户端与用户关联", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqClientIdBo bo, HttpServletResponse response) { + List list = eqClientIdService.queryList(bo); + ExcelUtil.exportExcel(list, "客户端与用户关联", EqClientIdVo.class, response); + } + + /** + * 获取客户端与用户关联详细信息 + * + * @param id 主键 + */ + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(eqClientIdService.queryById(id)); + } + + /** + * 保存客户端与用户关联 + */ + @Log(title = "客户端与用户关联", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("save") + public R saveBo(@Validated(SaveGroup.class) @RequestBody EqClientIdBo bo) { + return toAjax(eqClientIdService.saveBo(bo)); + } + + /** + * 新增客户端与用户关联 + */ + @Log(title = "客户端与用户关联", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqClientIdBo bo) { + return toAjax(eqClientIdService.insertByBo(bo)); + } + + /** + * 修改客户端与用户关联 + */ + @Log(title = "客户端与用户关联", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqClientIdBo bo) { + return toAjax(eqClientIdService.updateByBo(bo)); + } + + /** + * 删除客户端与用户关联 + * + * @param ids 主键串 + */ + @Log(title = "客户端与用户关联", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(eqClientIdService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java index f735600a3..ff3f34d1d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java @@ -101,6 +101,10 @@ public class EqDeviceController extends BaseController { return R.ok(eqEquipmentService.ota(equipmentCode)); } + /** + * 控制设备 门 灯光 控制 + * 传参设备编码 + */ @GetMapping("/operate") public R operate(EqDeviceCmdBo bo){ if (bo.getEquipmentCode() == null) throw new ServiceException("设备编码不能为空"); diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/EqClientId.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqClientId.java new file mode 100644 index 000000000..baad67d04 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqClientId.java @@ -0,0 +1,41 @@ +package org.dromara.web.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 客户端与用户关联对象 eq_client_id + * + * @author zzc + * @date 2024-10-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eq_client_id") +public class EqClientId extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id") + private Long id; + + /** + * 用户id + */ + private Long userId; + + /** + * 客户端id + */ + private String cid; + + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqClientIdBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqClientIdBo.java new file mode 100644 index 000000000..d6e97c93c --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqClientIdBo.java @@ -0,0 +1,43 @@ +package org.dromara.web.domain.bo; + +import org.dromara.common.core.validate.SaveGroup; +import org.dromara.web.domain.EqClientId; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 客户端与用户关联业务对象 eq_client_id + * + * @author zzc + * @date 2024-10-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EqClientId.class, reverseConvertGenerate = false) +public class EqClientIdBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 用户id + */ + @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class, SaveGroup.class }) + private Long userId; + + /** + * 客户端id + */ + @NotBlank(message = "客户端id不能为空", groups = { AddGroup.class, EditGroup.class, SaveGroup.class }) + private String cid; + + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqClientIdVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqClientIdVo.java new file mode 100644 index 000000000..f967689c9 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqClientIdVo.java @@ -0,0 +1,50 @@ +package org.dromara.web.domain.vo; + +import org.dromara.web.domain.EqClientId; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 客户端与用户关联视图对象 eq_client_id + * + * @author zzc + * @date 2024-10-27 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EqClientId.class) +public class EqClientIdVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long id; + + /** + * 用户id + */ + @ExcelProperty(value = "用户id") + private Long userId; + + /** + * 客户端id + */ + @ExcelProperty(value = "客户端id") + private String cid; + + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqClientIdMapper.java b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqClientIdMapper.java new file mode 100644 index 000000000..50d7395c9 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqClientIdMapper.java @@ -0,0 +1,15 @@ +package org.dromara.web.mapper; + +import org.dromara.web.domain.EqClientId; +import org.dromara.web.domain.vo.EqClientIdVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 客户端与用户关联Mapper接口 + * + * @author zzc + * @date 2024-10-27 + */ +public interface EqClientIdMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IEqClientIdService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqClientIdService.java new file mode 100644 index 000000000..aa1cc6068 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqClientIdService.java @@ -0,0 +1,75 @@ +package org.dromara.web.service; + +import org.dromara.web.domain.vo.EqClientIdVo; +import org.dromara.web.domain.bo.EqClientIdBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 客户端与用户关联Service接口 + * + * @author zzc + * @date 2024-10-27 + */ +public interface IEqClientIdService { + + /** + * 查询客户端与用户关联 + * + * @param id 主键 + * @return 客户端与用户关联 + */ + EqClientIdVo queryById(Long id); + + /** + * 分页查询客户端与用户关联列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 客户端与用户关联分页列表 + */ + TableDataInfo queryPageList(EqClientIdBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的客户端与用户关联列表 + * + * @param bo 查询条件 + * @return 客户端与用户关联列表 + */ + List queryList(EqClientIdBo bo); + + /** + * 新增客户端与用户关联 + * + * @param bo 客户端与用户关联 + * @return 是否新增成功 + */ + Boolean insertByBo(EqClientIdBo bo); + + /** + * 保存客户端与用户关联 新增或更新 + * @param bo + * @return + */ + Boolean saveBo(EqClientIdBo bo); + + /** + * 修改客户端与用户关联 + * + * @param bo 客户端与用户关联 + * @return 是否修改成功 + */ + Boolean updateByBo(EqClientIdBo bo); + + /** + * 校验并批量删除客户端与用户关联信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqClientIdServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqClientIdServiceImpl.java new file mode 100644 index 000000000..17b46240c --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqClientIdServiceImpl.java @@ -0,0 +1,140 @@ +package org.dromara.web.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.web.domain.bo.EqClientIdBo; +import org.dromara.web.domain.vo.EqClientIdVo; +import org.dromara.web.domain.EqClientId; +import org.dromara.web.mapper.EqClientIdMapper; +import org.dromara.web.service.IEqClientIdService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 客户端与用户关联Service业务层处理 + * + * @author zzc + * @date 2024-10-27 + */ +@RequiredArgsConstructor +@Service +public class EqClientIdServiceImpl implements IEqClientIdService { + + private final EqClientIdMapper baseMapper; + + /** + * 查询客户端与用户关联 + * + * @param id 主键 + * @return 客户端与用户关联 + */ + @Override + public EqClientIdVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询客户端与用户关联列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 客户端与用户关联分页列表 + */ + @Override + public TableDataInfo queryPageList(EqClientIdBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的客户端与用户关联列表 + * + * @param bo 查询条件 + * @return 客户端与用户关联列表 + */ + @Override + public List queryList(EqClientIdBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqClientIdBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, EqClientId::getUserId, bo.getUserId()); + lqw.eq(StringUtils.isNotBlank(bo.getCid()), EqClientId::getCid, bo.getCid()); + return lqw; + } + + @Override + public Boolean saveBo(EqClientIdBo bo) { + EqClientId update = MapstructUtils.convert(bo, EqClientId.class); + validEntityBeforeSave(update); + if (bo.getId()== null){ + return baseMapper.insert(update) > 0; + } + return baseMapper.updateById(update) > 0; + } + + /** + * 新增客户端与用户关联 + * + * @param bo 客户端与用户关联 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EqClientIdBo bo) { + EqClientId add = MapstructUtils.convert(bo, EqClientId.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改客户端与用户关联 + * + * @param bo 客户端与用户关联 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EqClientIdBo bo) { + EqClientId update = MapstructUtils.convert(bo, EqClientId.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqClientId entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除客户端与用户关联信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java index f69008d32..2cecc1f54 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java @@ -307,7 +307,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { //通过设备mac地址查询设备编码 final String macPrefix = "mock_"; - equipmentCode = macPrefix + equipmentCode; + equipmentCode = macPrefix + equipmentCode.toLowerCase(); //根据设备名称地址查询设备id（设备code） DeviceByDeviceName deviceByNameDto = iotService.apiTenantDevicesByName(equipmentCode);//无信息会抛异常 无需判断 diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties index 9187081fb..ac2b1539e 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -473,7 +473,7 @@ ble.name38=连接蓝牙成功! ble.name39=连接蓝牙失败!可尝试重新搜索,重启蓝牙,或重启应用! ble.name40=蓝牙连接断开! ble.name41=未知错误!尝试手动重启蓝牙,或重启应用! -ble.name42=配网成功,设备正在初始化，请等待3s…… +ble.name42=配网成功,设备正在初始化，请等待…… ble.name43=密码错误,重新尝试! ble.name44=无法找到网络,重新尝试! ble.name45=设备断开连接,重新尝试! @@ -504,7 +504,7 @@ ble.name69=观察：显示器显示“A”，此时设备开始配网； ble.name70=5.在APP上对设备进行配网，直至配网完成； ble.name71=观察：配网完成后显示器显示“11”，设备进入待机装填； ble.name72=返回首页 -ble.name73=设备初始化成功，是否修改设备密码？ +ble.name73=设备初始化成功，是否修改设备名字？ email.name0=登录验证码 email.name1=您本次验证码为 diff --git a/ruoyi-admin/src/main/resources/mapper/device/EqClientIdMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/EqClientIdMapper.xml new file mode 100644 index 000000000..9a3aa48a8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/device/EqClientIdMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/SaveGroup.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/SaveGroup.java new file mode 100644 index 000000000..1455c5ddc --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/SaveGroup.java @@ -0,0 +1,9 @@ +package org.dromara.common.core.validate; + +/** + * 校验分组 add + * + * @author Lion Li + */ +public interface SaveGroup { +}