diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/FysEquipmentAlarmRecordController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/FysEquipmentAlarmRecordController.java new file mode 100644 index 0000000..fc5a192 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/FysEquipmentAlarmRecordController.java @@ -0,0 +1,105 @@ +package com.fuyuanshen.equipment.controller; + +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.FysEquipmentAlarmRecordVo; +import com.fuyuanshen.equipment.domain.bo.FysEquipmentAlarmRecordBo; +import com.fuyuanshen.equipment.service.IFysEquipmentAlarmRecordService; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; + +/** + * 设备报警记录 + * + * @author Lion Li + * @date 2025-07-29 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/equipmentAlarmRecord") +public class FysEquipmentAlarmRecordController extends BaseController { + + private final IFysEquipmentAlarmRecordService fysEquipmentAlarmRecordService; + + /** + * 查询设备报警记录列表 + */ + @SaCheckPermission("system:equipmentAlarmRecord:list") + @GetMapping("/list") + public TableDataInfo list(FysEquipmentAlarmRecordBo bo, PageQuery pageQuery) { + return fysEquipmentAlarmRecordService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备报警记录列表 + */ + @SaCheckPermission("system:equipmentAlarmRecord:export") + @Log(title = "设备报警记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(FysEquipmentAlarmRecordBo bo, HttpServletResponse response) { + List list = fysEquipmentAlarmRecordService.queryList(bo); + ExcelUtil.exportExcel(list, "设备报警记录", FysEquipmentAlarmRecordVo.class, response); + } + + /** + * 获取设备报警记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("system:equipmentAlarmRecord:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(fysEquipmentAlarmRecordService.queryById(id)); + } + + /** + * 新增设备报警记录 + */ + @SaCheckPermission("system:equipmentAlarmRecord:add") + @Log(title = "设备报警记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody FysEquipmentAlarmRecordBo bo) { + return toAjax(fysEquipmentAlarmRecordService.insertByBo(bo)); + } + + /** + * 修改设备报警记录 + */ + @SaCheckPermission("system:equipmentAlarmRecord:edit") + @Log(title = "设备报警记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody FysEquipmentAlarmRecordBo bo) { + return toAjax(fysEquipmentAlarmRecordService.updateByBo(bo)); + } + + /** + * 删除设备报警记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("system:equipmentAlarmRecord:remove") + @Log(title = "设备报警记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(fysEquipmentAlarmRecordService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/FysEquipmentAlarmRecord.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/FysEquipmentAlarmRecord.java new file mode 100644 index 0000000..540702e --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/FysEquipmentAlarmRecord.java @@ -0,0 +1,84 @@ +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; + +/** + * 设备报警记录对象 fys_equipment_alarm_record + * + * @author Lion Li + * @date 2025-07-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fys_equipment_alarm_record") +public class FysEquipmentAlarmRecord extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * 报警设备id + */ + private Long deviceId; + + /** + * 设备IMEI + */ + private String deviceImei; + + /** + * 设备MAC + */ + private String deviceMac; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 所属代理(客户) + */ + private Long agent; + + /** + * 绑定app用户 + */ + private Long bindApp; + + /** + * 报警类型 + */ + private Long alarmType; + + /** + * 报警编码 + + */ + private String alarmCode; + + /** + * 报警描述 + */ + private String alarmDescription; + + /** + * 报警时间 + */ + private Date alarmTime; + + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/FysEquipmentAlarmRecordBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/FysEquipmentAlarmRecordBo.java new file mode 100644 index 0000000..936dac0 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/FysEquipmentAlarmRecordBo.java @@ -0,0 +1,82 @@ +package com.fuyuanshen.equipment.domain.bo; + +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.equipment.domain.FysEquipmentAlarmRecord; +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; + +/** + * 设备报警记录业务对象 fys_equipment_alarm_record + * + * @author Lion Li + * @date 2025-07-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = FysEquipmentAlarmRecord.class, reverseConvertGenerate = false) +public class FysEquipmentAlarmRecordBo extends BaseEntity { + + /** + * + */ + @NotNull(message = "不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 报警设备id + */ + private Long deviceId; + + /** + * 设备IMEI + */ + private String deviceImei; + + /** + * 设备MAC + */ + private String deviceMac; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 所属代理(客户) + */ + private Long agent; + + /** + * 绑定app用户 + */ + private Long bindApp; + + /** + * 报警类型 + */ + private Long alarmType; + + /** + * 报警编码 + + */ + private String alarmCode; + + /** + * 报警描述 + */ + private String alarmDescription; + + /** + * 报警时间 + */ + private Date alarmTime; + + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/FysEquipmentAlarmRecordVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/FysEquipmentAlarmRecordVo.java new file mode 100644 index 0000000..c501849 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/FysEquipmentAlarmRecordVo.java @@ -0,0 +1,102 @@ +package com.fuyuanshen.equipment.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fuyuanshen.equipment.domain.FysEquipmentAlarmRecord; +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; + + + +/** + * 设备报警记录视图对象 fys_equipment_alarm_record + * + * @author Lion Li + * @date 2025-07-29 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = FysEquipmentAlarmRecord.class) +public class FysEquipmentAlarmRecordVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long id; + + /** + * 报警设备id + */ + @ExcelProperty(value = "报警设备id") + private Long deviceId; + + /** + * 设备IMEI + */ + @ExcelProperty(value = "设备IMEI") + private String deviceImei; + + /** + * 设备MAC + */ + @ExcelProperty(value = "设备MAC") + private String deviceMac; + + /** + * 设备名称 + */ + @ExcelProperty(value = "设备名称") + private String deviceName; + + /** + * 所属代理(客户) + */ + @ExcelProperty(value = "所属代理", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "客=户") + private Long agent; + + /** + * 绑定app用户 + */ + @ExcelProperty(value = "绑定app用户") + private Long bindApp; + + /** + * 报警类型 + */ + @ExcelProperty(value = "报警类型") + private Long alarmType; + + /** + * 报警编码 + + */ + @ExcelProperty(value = "报警编码") + private String alarmCode; + + /** + * 报警描述 + */ + @ExcelProperty(value = "报警描述") + private String alarmDescription; + + /** + * 报警时间 + */ + @ExcelProperty(value = "报警时间") + private Date alarmTime; + + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/FysEquipmentAlarmRecordMapper.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/FysEquipmentAlarmRecordMapper.java new file mode 100644 index 0000000..3126fac --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/FysEquipmentAlarmRecordMapper.java @@ -0,0 +1,15 @@ +package com.fuyuanshen.equipment.mapper; + +import com.fuyuanshen.equipment.domain.FysEquipmentAlarmRecord; +import com.fuyuanshen.equipment.domain.vo.FysEquipmentAlarmRecordVo; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备报警记录Mapper接口 + * + * @author Lion Li + * @date 2025-07-29 + */ +public interface FysEquipmentAlarmRecordMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IFysEquipmentAlarmRecordService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IFysEquipmentAlarmRecordService.java new file mode 100644 index 0000000..0d4f5d5 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IFysEquipmentAlarmRecordService.java @@ -0,0 +1,68 @@ +package com.fuyuanshen.equipment.service; + +import com.fuyuanshen.equipment.domain.vo.FysEquipmentAlarmRecordVo; +import com.fuyuanshen.equipment.domain.bo.FysEquipmentAlarmRecordBo; +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-07-29 + */ +public interface IFysEquipmentAlarmRecordService { + + /** + * 查询设备报警记录 + * + * @param id 主键 + * @return 设备报警记录 + */ + FysEquipmentAlarmRecordVo queryById(Long id); + + /** + * 分页查询设备报警记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备报警记录分页列表 + */ + TableDataInfo queryPageList(FysEquipmentAlarmRecordBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备报警记录列表 + * + * @param bo 查询条件 + * @return 设备报警记录列表 + */ + List queryList(FysEquipmentAlarmRecordBo bo); + + /** + * 新增设备报警记录 + * + * @param bo 设备报警记录 + * @return 是否新增成功 + */ + Boolean insertByBo(FysEquipmentAlarmRecordBo bo); + + /** + * 修改设备报警记录 + * + * @param bo 设备报警记录 + * @return 是否修改成功 + */ + Boolean updateByBo(FysEquipmentAlarmRecordBo 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/FysEquipmentAlarmRecordServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/FysEquipmentAlarmRecordServiceImpl.java new file mode 100644 index 0000000..ac0ffad --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/FysEquipmentAlarmRecordServiceImpl.java @@ -0,0 +1,141 @@ +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.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import com.fuyuanshen.equipment.domain.bo.FysEquipmentAlarmRecordBo; +import com.fuyuanshen.equipment.domain.vo.FysEquipmentAlarmRecordVo; +import com.fuyuanshen.equipment.domain.FysEquipmentAlarmRecord; +import com.fuyuanshen.equipment.mapper.FysEquipmentAlarmRecordMapper; +import com.fuyuanshen.equipment.service.IFysEquipmentAlarmRecordService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备报警记录Service业务层处理 + * + * @author Lion Li + * @date 2025-07-29 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class FysEquipmentAlarmRecordServiceImpl implements IFysEquipmentAlarmRecordService { + + private final FysEquipmentAlarmRecordMapper baseMapper; + + /** + * 查询设备报警记录 + * + * @param id 主键 + * @return 设备报警记录 + */ + @Override + public FysEquipmentAlarmRecordVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询设备报警记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备报警记录分页列表 + */ + @Override + public TableDataInfo queryPageList(FysEquipmentAlarmRecordBo 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(FysEquipmentAlarmRecordBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(FysEquipmentAlarmRecordBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(FysEquipmentAlarmRecord::getId); + lqw.eq(bo.getDeviceId() != null, FysEquipmentAlarmRecord::getDeviceId, bo.getDeviceId()); + lqw.eq(StringUtils.isNotBlank(bo.getDeviceImei()), FysEquipmentAlarmRecord::getDeviceImei, bo.getDeviceImei()); + lqw.eq(StringUtils.isNotBlank(bo.getDeviceMac()), FysEquipmentAlarmRecord::getDeviceMac, bo.getDeviceMac()); + lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), FysEquipmentAlarmRecord::getDeviceName, bo.getDeviceName()); + lqw.eq(bo.getAgent() != null, FysEquipmentAlarmRecord::getAgent, bo.getAgent()); + lqw.eq(bo.getBindApp() != null, FysEquipmentAlarmRecord::getBindApp, bo.getBindApp()); + lqw.eq(bo.getAlarmType() != null, FysEquipmentAlarmRecord::getAlarmType, bo.getAlarmType()); + lqw.eq(StringUtils.isNotBlank(bo.getAlarmCode()), FysEquipmentAlarmRecord::getAlarmCode, bo.getAlarmCode()); + lqw.eq(StringUtils.isNotBlank(bo.getAlarmDescription()), FysEquipmentAlarmRecord::getAlarmDescription, bo.getAlarmDescription()); + lqw.eq(bo.getAlarmTime() != null, FysEquipmentAlarmRecord::getAlarmTime, bo.getAlarmTime()); + return lqw; + } + + /** + * 新增设备报警记录 + * + * @param bo 设备报警记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(FysEquipmentAlarmRecordBo bo) { + FysEquipmentAlarmRecord add = MapstructUtils.convert(bo, FysEquipmentAlarmRecord.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改设备报警记录 + * + * @param bo 设备报警记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(FysEquipmentAlarmRecordBo bo) { + FysEquipmentAlarmRecord update = MapstructUtils.convert(bo, FysEquipmentAlarmRecord.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(FysEquipmentAlarmRecord 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/FysEquipmentAlarmRecordMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/FysEquipmentAlarmRecordMapper.xml new file mode 100644 index 0000000..e2777b8 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/FysEquipmentAlarmRecordMapper.xml @@ -0,0 +1,7 @@ + + + + +