From 2c565f5c2d4d51ef9a868dbebc5d0d96d38f3a21 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Thu, 28 Aug 2025 11:22:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/DeviceAlarmController.java | 105 +++++++++++++ .../device/DeviceControlCenterController.java | 2 + .../equipment/domain/DeviceAlarm.java | 99 ++++++++++++ .../equipment/domain/bo/DeviceAlarmBo.java | 96 ++++++++++++ .../equipment/domain/vo/DeviceAlarmVo.java | 120 +++++++++++++++ .../equipment/mapper/DeviceAlarmMapper.java | 15 ++ .../service/IDeviceAlarmService.java | 68 +++++++++ .../service/impl/DeviceAlarmServiceImpl.java | 143 ++++++++++++++++++ .../mapper/equipment/DeviceAlarmMapper.xml | 7 + 9 files changed, 655 insertions(+) create mode 100644 fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceAlarm.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceAlarmMapper.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceAlarmService.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceAlarmServiceImpl.java create mode 100644 fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java new file mode 100644 index 0000000..1741190 --- /dev/null +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java @@ -0,0 +1,105 @@ +package com.fuyuanshen.web.controller.device; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; +import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo; +import com.fuyuanshen.equipment.service.IDeviceAlarmService; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; + +/** + * 设备告警 + * + * @author Lion Li + * @date 2025-08-28 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/equipment/alarm") +public class DeviceAlarmController extends BaseController { + + private final IDeviceAlarmService deviceAlarmService; + + /** + * 查询设备告警列表 + */ + @SaCheckPermission("equipment:alarm:list") + @GetMapping("/list") + public TableDataInfo list(DeviceAlarmBo bo, PageQuery pageQuery) { + return deviceAlarmService.queryPageList(bo, pageQuery); + } + + /** + * 设备告警列表 + */ + @SaCheckPermission("equipment:alarm:export") + @Log(title = "设备告警", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DeviceAlarmBo bo, HttpServletResponse response) { + List list = deviceAlarmService.queryList(bo); + ExcelUtil.exportExcel(list, "设备告警", DeviceAlarmVo.class, response); + } + + /** + * 获取设备告警详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("equipment:alarm:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(deviceAlarmService.queryById(id)); + } + + /** + * 新增设备告警 + */ + @SaCheckPermission("equipment:alarm:add") + @Log(title = "设备告警", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DeviceAlarmBo bo) { + return toAjax(deviceAlarmService.insertByBo(bo)); + } + + /** + * 修改设备告警 + */ + @SaCheckPermission("equipment:alarm:edit") + @Log(title = "设备告警", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DeviceAlarmBo bo) { + return toAjax(deviceAlarmService.updateByBo(bo)); + } + + /** + * 删除设备告警 + * + * @param ids 主键串 + */ + @SaCheckPermission("equipment:alarm:remove") + @Log(title = "设备告警", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(deviceAlarmService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java index 789ca85..66c7b98 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java @@ -32,6 +32,8 @@ import java.util.Map; public class DeviceControlCenterController extends BaseController { private final DeviceBizService appDeviceService; + + /** * 查询设备列表 */ diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceAlarm.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceAlarm.java new file mode 100644 index 0000000..203655f --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceAlarm.java @@ -0,0 +1,99 @@ +package com.fuyuanshen.equipment.domain; + +import com.fuyuanshen.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 设备告警对象 device_alarm + * + * @author Lion Li + * @date 2025-08-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("device_alarm") +public class DeviceAlarm extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 设备ID + */ + private Long deviceId; + + /** + * 报警事项 + */ + private String deviceAction; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 数据来源 + */ + private String dataSource; + + /** + * 内容 + */ + private String content; + + /** + * 设备类型 + */ + private Long deviceType; + + /** + * 经度 + + */ + private Long longitude; + + /** + * 纬度 + */ + private Long latitude; + + /** + * 报警位置 + */ + private String location; + + /** + * 报警开始时间 + */ + private Date startTime; + + /** + * 报警结束时间 + */ + private Date finishTime; + + /** + * 报警持续时间 + */ + private Date durationTime; + + /** + * 0已处理，1未处理 + */ + private Long treatmentState; + + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java new file mode 100644 index 0000000..7102adb --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java @@ -0,0 +1,96 @@ +package com.fuyuanshen.equipment.domain.bo; + +import com.fuyuanshen.equipment.domain.DeviceAlarm; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 设备告警业务对象 device_alarm + * + * @author Lion Li + * @date 2025-08-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DeviceAlarm.class, reverseConvertGenerate = false) +public class DeviceAlarmBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 设备ID + */ + private Long deviceId; + + /** + * 报警事项 + */ + private String deviceAction; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 数据来源 + */ + private String dataSource; + + /** + * 内容 + */ + private String content; + + /** + * 设备类型 + */ + private Long deviceType; + + /** + * 经度 + + */ + private Long longitude; + + /** + * 纬度 + */ + private Long latitude; + + /** + * 报警位置 + */ + private String location; + + /** + * 报警开始时间 + */ + private Date startTime; + + /** + * 报警结束时间 + */ + private Date finishTime; + + /** + * 报警持续时间 + */ + private Date durationTime; + + /** + * 0已处理，1未处理 + */ + private Long treatmentState; + + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java new file mode 100644 index 0000000..f053801 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java @@ -0,0 +1,120 @@ +package com.fuyuanshen.equipment.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fuyuanshen.equipment.domain.DeviceAlarm; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.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; + + + +/** + * 设备告警视图对象 device_alarm + * + * @author Lion Li + * @date 2025-08-28 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DeviceAlarm.class) +public class DeviceAlarmVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 设备ID + */ + @ExcelProperty(value = "设备ID") + private Long deviceId; + + /** + * 报警事项 + */ + @ExcelProperty(value = "报警事项") + private String deviceAction; + + /** + * 设备名称 + */ + @ExcelProperty(value = "设备名称") + private String deviceName; + + /** + * 数据来源 + */ + @ExcelProperty(value = "数据来源") + private String dataSource; + + /** + * 内容 + */ + @ExcelProperty(value = "内容") + private String content; + + /** + * 设备类型 + */ + @ExcelProperty(value = "设备类型") + private Long deviceType; + + /** + * 经度 + + */ + @ExcelProperty(value = "经度 +") + private Long longitude; + + /** + * 纬度 + */ + @ExcelProperty(value = "纬度") + private Long latitude; + + /** + * 报警位置 + */ + @ExcelProperty(value = "报警位置") + private String location; + + /** + * 报警开始时间 + */ + @ExcelProperty(value = "报警开始时间") + private Date startTime; + + /** + * 报警结束时间 + */ + @ExcelProperty(value = "报警结束时间") + private Date finishTime; + + /** + * 报警持续时间 + */ + @ExcelProperty(value = "报警持续时间") + private Date durationTime; + + /** + * 0已处理，1未处理 + */ + @ExcelProperty(value = "0已处理，1未处理") + private Long treatmentState; + + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceAlarmMapper.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceAlarmMapper.java new file mode 100644 index 0000000..950e105 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceAlarmMapper.java @@ -0,0 +1,15 @@ +package com.fuyuanshen.equipment.mapper; + +import com.fuyuanshen.equipment.domain.DeviceAlarm; +import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备告警Mapper接口 + * + * @author Lion Li + * @date 2025-08-28 + */ +public interface DeviceAlarmMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceAlarmService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceAlarmService.java new file mode 100644 index 0000000..c3dc9ff --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceAlarmService.java @@ -0,0 +1,68 @@ +package com.fuyuanshen.equipment.service; + +import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; +import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 设备告警Service接口 + * + * @author Lion Li + * @date 2025-08-28 + */ +public interface IDeviceAlarmService { + + /** + * 查询设备告警 + * + * @param id 主键 + * @return 设备告警 + */ + DeviceAlarmVo queryById(Long id); + + /** + * 分页查询设备告警列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备告警分页列表 + */ + TableDataInfo queryPageList(DeviceAlarmBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备告警列表 + * + * @param bo 查询条件 + * @return 设备告警列表 + */ + List queryList(DeviceAlarmBo bo); + + /** + * 新增设备告警 + * + * @param bo 设备告警 + * @return 是否新增成功 + */ + Boolean insertByBo(DeviceAlarmBo bo); + + /** + * 修改设备告警 + * + * @param bo 设备告警 + * @return 是否修改成功 + */ + Boolean updateByBo(DeviceAlarmBo bo); + + /** + * 校验并批量删除设备告警信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceAlarmServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceAlarmServiceImpl.java new file mode 100644 index 0000000..3834551 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceAlarmServiceImpl.java @@ -0,0 +1,143 @@ +package com.fuyuanshen.equipment.service.impl; + +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.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 lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo; +import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; +import com.fuyuanshen.equipment.domain.DeviceAlarm; +import com.fuyuanshen.equipment.mapper.DeviceAlarmMapper; +import com.fuyuanshen.equipment.service.IDeviceAlarmService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备告警Service业务层处理 + * + * @author Lion Li + * @date 2025-08-28 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class DeviceAlarmServiceImpl implements IDeviceAlarmService { + + private final DeviceAlarmMapper baseMapper; + + /** + * 查询设备告警 + * + * @param id 主键 + * @return 设备告警 + */ + @Override + public DeviceAlarmVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询设备告警列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备告警分页列表 + */ + @Override + public TableDataInfo queryPageList(DeviceAlarmBo 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(DeviceAlarmBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(DeviceAlarmBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(DeviceAlarm::getId); + lqw.eq(bo.getDeviceId() != null, DeviceAlarm::getDeviceId, bo.getDeviceId()); + lqw.eq(StringUtils.isNotBlank(bo.getDeviceAction()), DeviceAlarm::getDeviceAction, bo.getDeviceAction()); + lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), DeviceAlarm::getDeviceName, bo.getDeviceName()); + lqw.eq(StringUtils.isNotBlank(bo.getDataSource()), DeviceAlarm::getDataSource, bo.getDataSource()); + lqw.eq(StringUtils.isNotBlank(bo.getContent()), DeviceAlarm::getContent, bo.getContent()); + lqw.eq(bo.getDeviceType() != null, DeviceAlarm::getDeviceType, bo.getDeviceType()); + lqw.eq(bo.getLongitude() != null, DeviceAlarm::getLongitude, bo.getLongitude()); + lqw.eq(bo.getLatitude() != null, DeviceAlarm::getLatitude, bo.getLatitude()); + lqw.eq(StringUtils.isNotBlank(bo.getLocation()), DeviceAlarm::getLocation, bo.getLocation()); + lqw.eq(bo.getStartTime() != null, DeviceAlarm::getStartTime, bo.getStartTime()); + lqw.eq(bo.getFinishTime() != null, DeviceAlarm::getFinishTime, bo.getFinishTime()); + lqw.eq(bo.getDurationTime() != null, DeviceAlarm::getDurationTime, bo.getDurationTime()); + lqw.eq(bo.getTreatmentState() != null, DeviceAlarm::getTreatmentState, bo.getTreatmentState()); + return lqw; + } + + /** + * 新增设备告警 + * + * @param bo 设备告警 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DeviceAlarmBo bo) { + DeviceAlarm add = MapstructUtils.convert(bo, DeviceAlarm.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改设备告警 + * + * @param bo 设备告警 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DeviceAlarmBo bo) { + DeviceAlarm update = MapstructUtils.convert(bo, DeviceAlarm.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DeviceAlarm 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/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml new file mode 100644 index 0000000..4a8dc01 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml @@ -0,0 +1,7 @@ + + + + + From 765e0f8509c6bc3899349fae90524dd39bf50b8c Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Thu, 28 Aug 2025 11:26:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java | 6 ++---- .../equipment/service/impl/DeviceAlarmServiceImpl.java | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java index f053801..ecd2d8e 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java @@ -1,6 +1,7 @@ package com.fuyuanshen.equipment.domain.vo; import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; import com.fuyuanshen.equipment.domain.DeviceAlarm; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; @@ -15,7 +16,6 @@ import java.io.Serializable; import java.util.Date; - /** * 设备告警视图对象 device_alarm * @@ -74,10 +74,8 @@ public class DeviceAlarmVo implements Serializable { /** * 经度 - */ - @ExcelProperty(value = "经度 -") + @ExcelProperty(value = "经度") private Long longitude; /** diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceAlarmServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceAlarmServiceImpl.java index 3834551..e109554 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceAlarmServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceAlarmServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo; import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; From 760738bcdd6f109be55689ac5da3563798445e21 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Thu, 28 Aug 2025 13:30:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/WEBDeviceController.java | 16 +++++++++++++++ .../web/service/WEBDeviceService.java | 10 ++++++++++ .../service/impl/WEBDeviceServiceImpl.java | 20 +++++++++++++++++++ .../equipment/domain/bo/DeviceAlarmBo.java | 7 ++++--- 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java index 5908c27..b1e34d1 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java @@ -5,6 +5,7 @@ import com.fuyuanshen.app.domain.AppPersonnelInfoRecords; import com.fuyuanshen.common.core.domain.R; import com.fuyuanshen.common.web.core.BaseController; import com.fuyuanshen.equipment.domain.DeviceLog; +import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; import com.fuyuanshen.equipment.domain.vo.WebDeviceVo; import com.fuyuanshen.web.service.WEBDeviceService; import io.swagger.v3.oas.annotations.Operation; @@ -86,6 +87,21 @@ public class WEBDeviceController extends BaseController { } + /** + * 设备告警记录 + * + * @param deviceId + * @return + */ + @Operation(summary = "设备告警记录") + @GetMapping(value = "/getAlarmRecord/{deviceId}") + public R> getAlarmRecord(@PathVariable Long deviceId) { + List device = deviceService.getAlarmRecord(deviceId); + return R.ok(device); + } + + + } diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java index 5c19bea..7066a51 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java @@ -12,6 +12,7 @@ import com.fuyuanshen.equipment.domain.form.DeviceForm; import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria; import com.fuyuanshen.equipment.domain.vo.AppDeviceVo; import com.fuyuanshen.equipment.domain.vo.CustomerVo; +import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; import com.fuyuanshen.equipment.domain.vo.WebDeviceVo; import java.io.IOException; @@ -55,4 +56,13 @@ public interface WEBDeviceService extends IService { * @return */ List getOperationRecord(Long deviceId); + + + /** + * 设备告警记录 + * + * @param deviceId + * @return + */ + List getAlarmRecord(Long deviceId); } diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java index d4882c3..cc6ae26 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java @@ -12,10 +12,13 @@ import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper; import com.fuyuanshen.app.mapper.AppDeviceShareMapper; import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper; import com.fuyuanshen.equipment.domain.Device; +import com.fuyuanshen.equipment.domain.DeviceAlarm; import com.fuyuanshen.equipment.domain.DeviceAssignments; import com.fuyuanshen.equipment.domain.DeviceLog; +import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; import com.fuyuanshen.equipment.domain.vo.WebDeviceVo; import com.fuyuanshen.equipment.enums.BindingStatusEnum; +import com.fuyuanshen.equipment.mapper.DeviceAlarmMapper; import com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper; import com.fuyuanshen.equipment.mapper.DeviceLogMapper; import com.fuyuanshen.equipment.mapper.DeviceMapper; @@ -43,6 +46,7 @@ public class WEBDeviceServiceImpl extends ServiceImpl impl private final AppDeviceBindRecordMapper appDeviceBindRecordMapper; private final AppPersonnelInfoRecordsMapper infoRecordsMapper; private final DeviceLogMapper deviceLogMapper; + private final DeviceAlarmMapper deviceAlarmMapper; private final DeviceMapper deviceMapper; private final AppDeviceShareMapper appDeviceShareMapper; @@ -133,4 +137,20 @@ public class WEBDeviceServiceImpl extends ServiceImpl impl } + /** + * 设备告警记录 + * + * @param deviceId + * @return + */ + @Override + public List getAlarmRecord(Long deviceId) { + List alarmList = deviceAlarmMapper.selectList ( + new QueryWrapper().eq("device_id", deviceId) + .orderByDesc("create_time")); + List deviceAlarmVoList = BeanUtil.copyToList(alarmList, DeviceAlarmVo.class); + return deviceAlarmVoList; + } + + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java index 7102adb..e0df7d6 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java @@ -1,13 +1,14 @@ package com.fuyuanshen.equipment.domain.bo; -import com.fuyuanshen.equipment.domain.DeviceAlarm; +import com.fuyuanshen.common.core.validate.EditGroup; import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.equipment.domain.DeviceAlarm; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; + import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; /** * 设备告警业务对象 device_alarm From 3969e50566519083630bea62a7c9b6dd3b315ee8 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Fri, 29 Aug 2025 10:29:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=88=97=E8=A1=A8(web)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/DeviceAlarmController.java | 21 ++--- .../device/DeviceShareController.java | 43 ++++++++++ .../web/service/DeviceShareService.java | 83 +++++++++++-------- .../service/impl/WEBDeviceServiceImpl.java | 2 +- .../app/domain/bo/AppDeviceShareBo.java | 19 ++++- .../app/mapper/AppDeviceShareMapper.java | 10 ++- .../mapper/app/AppDeviceShareMapper.xml | 55 ++++++++---- 7 files changed, 169 insertions(+), 64 deletions(-) create mode 100644 fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java index 1741190..a7b16c0 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java @@ -31,7 +31,7 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/equipment/alarm") +@RequestMapping("api/equipment/alarm") public class DeviceAlarmController extends BaseController { private final IDeviceAlarmService deviceAlarmService; @@ -39,17 +39,17 @@ public class DeviceAlarmController extends BaseController { /** * 查询设备告警列表 */ - @SaCheckPermission("equipment:alarm:list") + // @SaCheckPermission("equipment:alarm:list") @GetMapping("/list") public TableDataInfo list(DeviceAlarmBo bo, PageQuery pageQuery) { return deviceAlarmService.queryPageList(bo, pageQuery); } /** - * 设备告警列表 + * 导出设备告警列表 */ - @SaCheckPermission("equipment:alarm:export") - @Log(title = "设备告警", businessType = BusinessType.EXPORT) + // @SaCheckPermission("equipment:alarm:export") + @Log(title = "导出设备告警列表", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(DeviceAlarmBo bo, HttpServletResponse response) { List list = deviceAlarmService.queryList(bo); @@ -61,17 +61,17 @@ public class DeviceAlarmController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("equipment:alarm:query") + // @SaCheckPermission("equipment:alarm:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable Long id) { return R.ok(deviceAlarmService.queryById(id)); } /** * 新增设备告警 */ - @SaCheckPermission("equipment:alarm:add") + // @SaCheckPermission("equipment:alarm:add") @Log(title = "设备告警", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class DeviceAlarmController extends BaseController { /** * 修改设备告警 */ - @SaCheckPermission("equipment:alarm:edit") + // @SaCheckPermission("equipment:alarm:edit") @Log(title = "设备告警", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,11 +95,12 @@ public class DeviceAlarmController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("equipment:alarm:remove") + // @SaCheckPermission("equipment:alarm:remove") @Log(title = "设备告警", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { return toAjax(deviceAlarmService.deleteWithValidByIds(List.of(ids), true)); } + } diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java new file mode 100644 index 0000000..e623e9d --- /dev/null +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java @@ -0,0 +1,43 @@ +package com.fuyuanshen.web.controller.device; + +import com.fuyuanshen.app.domain.bo.AppDeviceShareBo; +import com.fuyuanshen.app.domain.vo.AppDeviceShareVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo; +import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; +import com.fuyuanshen.web.service.DeviceShareService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 设备分享管理 + * + * @author Lion Li + * @date 2025-08-28 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("api/equipment/share") +public class DeviceShareController extends BaseController { + + private final DeviceShareService appDeviceShareService; + + + /** + *查询设备分享列表(web) + */ + // @SaCheckPermission("equipment:alarm:list") + @GetMapping("/list") + public TableDataInfo list(AppDeviceShareBo bo, PageQuery pageQuery) { + return appDeviceShareService.queryWebList(bo, pageQuery); + } + + + +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/DeviceShareService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/DeviceShareService.java index d73eaa7..9e493b1 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/DeviceShareService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/DeviceShareService.java @@ -43,7 +43,7 @@ import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*; public class DeviceShareService { private final AppDeviceShareMapper appDeviceShareMapper; - + private final DeviceMapper deviceMapper; private final DeviceTypeMapper deviceTypeMapper; @@ -61,32 +61,32 @@ public class DeviceShareService { } private static void buildDeviceStatus(AppDeviceShareVo item) { - //设备在线状态 - String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX); - if(StringUtils.isNotBlank(onlineStatus)){ + // 设备在线状态 + String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX); + if (StringUtils.isNotBlank(onlineStatus)) { item.setOnlineStatus(1); - }else{ + } else { item.setOnlineStatus(0); } - String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX+ item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX); + String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX); // 获取电量 - if(StringUtils.isNotBlank(deviceStatus)){ + if (StringUtils.isNotBlank(deviceStatus)) { JSONObject jsonObject = JSONObject.parseObject(deviceStatus); item.setBattery(jsonObject.getString("batteryPercentage")); - }else{ + } else { item.setBattery("0"); } - String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_LOCATION_KEY_PREFIX); - if(StringUtils.isNotBlank(location)){ + String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_LOCATION_KEY_PREFIX); + if (StringUtils.isNotBlank(location)) { JSONObject jsonObject = JSONObject.parseObject(location); item.setLatitude(jsonObject.getString("latitude")); item.setLongitude(jsonObject.getString("longitude")); } - String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX); - if(StringUtils.isNotBlank(alarmStatus)){ + String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX); + if (StringUtils.isNotBlank(alarmStatus)) { item.setAlarmStatus(alarmStatus); } } @@ -96,7 +96,7 @@ public class DeviceShareService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(AppDeviceShare::getId, id); List appDeviceShareVos = appDeviceShareMapper.selectVoList(queryWrapper); - if(appDeviceShareVos==null || appDeviceShareVos.isEmpty()){ + if (appDeviceShareVos == null || appDeviceShareVos.isEmpty()) { return null; } @@ -113,7 +113,7 @@ public class DeviceShareService { shareDetailVo.setDeviceMac(device.getDeviceMac()); DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType()); - if(deviceType!=null){ + if (deviceType != null) { shareDetailVo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode())); } shareDetailVo.setDevicePic(device.getDevicePic()); @@ -125,52 +125,53 @@ public class DeviceShareService { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); qw.eq(AppPersonnelInfo::getDeviceId, device.getId()); List appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw); - if(appPersonnelInfoVos!=null && !appPersonnelInfoVos.isEmpty()){ + if (appPersonnelInfoVos != null && !appPersonnelInfoVos.isEmpty()) { shareDetailVo.setPersonnelInfo(appPersonnelInfoVos.get(0)); } - //设备在线状态 - String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei()+ DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX); - if(StringUtils.isNotBlank(onlineStatus)){ + // 设备在线状态 + String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX); + if (StringUtils.isNotBlank(onlineStatus)) { shareDetailVo.setOnlineStatus(1); - }else{ + } else { shareDetailVo.setOnlineStatus(0); } - String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX); + String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX); // 获取电量 - if(StringUtils.isNotBlank(deviceStatus)){ + if (StringUtils.isNotBlank(deviceStatus)) { JSONObject jsonObject = JSONObject.parseObject(deviceStatus); shareDetailVo.setMainLightMode(jsonObject.getString("mainLightMode")); shareDetailVo.setLaserLightMode(jsonObject.getString("laserLightMode")); shareDetailVo.setBatteryPercentage(jsonObject.getString("batteryPercentage")); shareDetailVo.setChargeState(jsonObject.getString("chargeState")); shareDetailVo.setBatteryRemainingTime(jsonObject.getString("batteryRemainingTime")); - }else{ + } else { shareDetailVo.setBatteryPercentage("0"); } // 获取经度纬度 - String locationKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX; + String locationKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX; String locationInfo = RedisUtils.getCacheObject(locationKey); - if(StringUtils.isNotBlank(locationInfo)){ + if (StringUtils.isNotBlank(locationInfo)) { JSONObject jsonObject = JSONObject.parseObject(locationInfo); shareDetailVo.setLongitude(jsonObject.get("longitude").toString()); shareDetailVo.setLatitude(jsonObject.get("latitude").toString()); - shareDetailVo.setAddress((String)jsonObject.get("address")); + shareDetailVo.setAddress((String) jsonObject.get("address")); } - String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX); - if(StringUtils.isNotBlank(alarmStatus)){ + String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX); + if (StringUtils.isNotBlank(alarmStatus)) { shareDetailVo.setAlarmStatus(alarmStatus); } - String lightBrightness = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX); - if(StringUtils.isNotBlank(lightBrightness)){ + String lightBrightness = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX); + if (StringUtils.isNotBlank(lightBrightness)) { shareDetailVo.setLightBrightness(lightBrightness); } return shareDetailVo; } + /** * 校验短信验证码 */ @@ -181,14 +182,15 @@ public class DeviceShareService { } return code.equals(smsCode); } + public int deviceShare(AppDeviceShareBo bo) { boolean flag = validateSmsCode(AppLoginHelper.getTenantId(), bo.getPhonenumber(), bo.getSmsCode()); - if(!flag){ + if (!flag) { throw new ServiceException("验证码错误"); } Device device = deviceMapper.selectById(bo.getDeviceId()); - if(device==null){ + if (device == null) { throw new ServiceException("设备不存在"); } Long userId = AppLoginHelper.getUserId(); @@ -196,7 +198,7 @@ public class DeviceShareService { lqw.eq(AppDeviceShare::getDeviceId, bo.getDeviceId()); lqw.eq(AppDeviceShare::getPhonenumber, bo.getPhonenumber()); Long count = appDeviceShareMapper.selectCount(lqw); - if(count>0){ + if (count > 0) { UpdateWrapper uw = new UpdateWrapper<>(); uw.eq("device_id", bo.getDeviceId()); @@ -206,7 +208,7 @@ public class DeviceShareService { uw.set("update_time", new Date()); return appDeviceShareMapper.update(uw); - }else { + } else { AppDeviceShare appDeviceShare = new AppDeviceShare(); appDeviceShare.setDeviceId(bo.getDeviceId()); appDeviceShare.setPhonenumber(bo.getPhonenumber()); @@ -232,4 +234,19 @@ public class DeviceShareService { } + /** + * 查询设备分享列表(web) + * + * @param bo + * @param pageQuery + * @return + */ + public TableDataInfo queryWebList(AppDeviceShareBo bo, PageQuery pageQuery) { + Page page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + Page result = appDeviceShareMapper.selectWebDeviceShareList(bo, page); + List records = result.getRecords(); + records.forEach(DeviceShareService::buildDeviceStatus); + return TableDataInfo.build(result); + } + } diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java index cc6ae26..cc92780 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java @@ -145,7 +145,7 @@ public class WEBDeviceServiceImpl extends ServiceImpl impl */ @Override public List getAlarmRecord(Long deviceId) { - List alarmList = deviceAlarmMapper.selectList ( + List alarmList = deviceAlarmMapper.selectList( new QueryWrapper().eq("device_id", deviceId) .orderByDesc("create_time")); List deviceAlarmVoList = BeanUtil.copyToList(alarmList, DeviceAlarmVo.class); diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceShareBo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceShareBo.java index 07fe7e0..0262567 100644 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceShareBo.java +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceShareBo.java @@ -1,5 +1,7 @@ package com.fuyuanshen.app.domain.bo; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.fuyuanshen.app.domain.AppDeviceShare; import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import io.github.linpeilie.annotations.AutoMapper; @@ -7,6 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.util.Date; + /** * 设备分享业务对象 app_device_share * @@ -35,10 +39,16 @@ public class AppDeviceShareBo extends BaseEntity { /** * 功能权限（1：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息） -以逗号分隔 + * 以逗号分隔 */ private String permission; + /** + * 分享用户 + * share_user + */ + private String shareUser; + /** * 备注 */ @@ -46,4 +56,11 @@ public class AppDeviceShareBo extends BaseEntity { private String smsCode; + + /** + * 分享时间 + */ + private Date shareStartTime; + private Date shareEndTime; + } diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java index 1de4c14..99bc47c 100644 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java @@ -18,5 +18,13 @@ import org.apache.ibatis.annotations.Param; public interface AppDeviceShareMapper extends BaseMapperPlus { IPage otherDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page page); - Page selectAppDeviceShareList(@Param("bo") AppDeviceShareBo bo,Page page); + Page selectAppDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page page); + + /** + * 查询设备分享列表(web) + * + * @param bo 设备分享 + * @return 设备分享 + */ + Page selectWebDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page page); } diff --git a/fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml b/fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml index 137f67f..0b76a8e 100644 --- a/fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml +++ b/fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml @@ -1,27 +1,27 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + +