From 9fb72e5ac01760c2b4a750eb454bd4562c9cb99c Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Fri, 8 Aug 2025 09:49:08 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceGroupController.java | 105 ++++++++++++++ .../DeviceRepairRecordsController.java | 105 ++++++++++++++ .../equipment/domain/DeviceGroup.java | 56 ++++++++ .../equipment/domain/DeviceRepairRecords.java | 58 ++++++++ .../equipment/domain/bo/DeviceGroupBo.java | 56 ++++++++ .../domain/bo/DeviceRepairRecordsBo.java | 60 ++++++++ .../equipment/domain/vo/DeviceGroupVo.java | 68 +++++++++ .../domain/vo/DeviceRepairRecordsVo.java | 70 +++++++++ .../equipment/mapper/DeviceGroupMapper.java | 15 ++ .../mapper/DeviceRepairRecordsMapper.java | 15 ++ .../service/IDeviceGroupService.java | 58 ++++++++ .../service/IDeviceRepairRecordsService.java | 68 +++++++++ .../service/impl/DeviceGroupServiceImpl.java | 120 ++++++++++++++++ .../impl/DeviceRepairRecordsServiceImpl.java | 135 ++++++++++++++++++ .../mapper/equipment/DeviceGroupMapper.xml | 7 + .../equipment/DeviceRepairRecordsMapper.xml | 7 + 16 files changed, 1003 insertions(+) create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceGroupController.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceRepairRecordsController.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGroup.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceRepairRecords.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceRepairRecordsBo.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceGroupMapper.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceRepairRecordsMapper.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceRepairRecordsService.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.java create mode 100644 fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceGroupMapper.xml create mode 100644 fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceRepairRecordsMapper.xml diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceGroupController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceGroupController.java new file mode 100644 index 0000000..7720b37 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceGroupController.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.DeviceGroupVo; +import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo; +import com.fuyuanshen.equipment.service.IDeviceGroupService; + +/** + * 设备分组 + * + * @author Lion Li + * @date 2025-08-08 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/fys-equipment/group") +public class DeviceGroupController extends BaseController { + + private final IDeviceGroupService deviceGroupService; + + /** + * 查询设备分组列表 + */ + @SaCheckPermission("fys-equipment:group:list") + @GetMapping("/list") + public R> list(DeviceGroupBo bo) { + List list = deviceGroupService.queryList(bo); + return R.ok(list); + } + + /** + * 导出设备分组列表 + */ + @SaCheckPermission("fys-equipment:group:export") + @Log(title = "设备分组", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DeviceGroupBo bo, HttpServletResponse response) { + List list = deviceGroupService.queryList(bo); + ExcelUtil.exportExcel(list, "设备分组", DeviceGroupVo.class, response); + } + + /** + * 获取设备分组详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("fys-equipment:group:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(deviceGroupService.queryById(id)); + } + + /** + * 新增设备分组 + */ + @SaCheckPermission("fys-equipment:group:add") + @Log(title = "设备分组", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DeviceGroupBo bo) { + return toAjax(deviceGroupService.insertByBo(bo)); + } + + /** + * 修改设备分组 + */ + @SaCheckPermission("fys-equipment:group:edit") + @Log(title = "设备分组", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DeviceGroupBo bo) { + return toAjax(deviceGroupService.updateByBo(bo)); + } + + /** + * 删除设备分组 + * + * @param ids 主键串 + */ + @SaCheckPermission("fys-equipment:group:remove") + @Log(title = "设备分组", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(deviceGroupService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceRepairRecordsController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceRepairRecordsController.java new file mode 100644 index 0000000..1304daa --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceRepairRecordsController.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.DeviceRepairRecordsVo; +import com.fuyuanshen.equipment.domain.bo.DeviceRepairRecordsBo; +import com.fuyuanshen.equipment.service.IDeviceRepairRecordsService; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; + +/** + * 设备维修记录 + * + * @author Lion Li + * @date 2025-08-08 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/equipment/repairRecords") +public class DeviceRepairRecordsController extends BaseController { + + private final IDeviceRepairRecordsService deviceRepairRecordsService; + + /** + * 查询设备维修记录列表 + */ + @SaCheckPermission("equipment:repairRecords:list") + @GetMapping("/list") + public TableDataInfo list(DeviceRepairRecordsBo bo, PageQuery pageQuery) { + return deviceRepairRecordsService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备维修记录列表 + */ + @SaCheckPermission("equipment:repairRecords:export") + @Log(title = "设备维修记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DeviceRepairRecordsBo bo, HttpServletResponse response) { + List list = deviceRepairRecordsService.queryList(bo); + ExcelUtil.exportExcel(list, "设备维修记录", DeviceRepairRecordsVo.class, response); + } + + /** + * 获取设备维修记录详细信息 + * + * @param recordId 主键 + */ + @SaCheckPermission("equipment:repairRecords:query") + @GetMapping("/{recordId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long recordId) { + return R.ok(deviceRepairRecordsService.queryById(recordId)); + } + + /** + * 新增设备维修记录 + */ + @SaCheckPermission("equipment:repairRecords:add") + @Log(title = "设备维修记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DeviceRepairRecordsBo bo) { + return toAjax(deviceRepairRecordsService.insertByBo(bo)); + } + + /** + * 修改设备维修记录 + */ + @SaCheckPermission("equipment:repairRecords:edit") + @Log(title = "设备维修记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DeviceRepairRecordsBo bo) { + return toAjax(deviceRepairRecordsService.updateByBo(bo)); + } + + /** + * 删除设备维修记录 + * + * @param recordIds 主键串 + */ + @SaCheckPermission("equipment:repairRecords:remove") + @Log(title = "设备维修记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] recordIds) { + return toAjax(deviceRepairRecordsService.deleteWithValidByIds(List.of(recordIds), true)); + } +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGroup.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGroup.java new file mode 100644 index 0000000..fa90f59 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGroup.java @@ -0,0 +1,56 @@ +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.io.Serial; + +/** + * 设备分组对象 device_group + * + * @author Lion Li + * @date 2025-08-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("device_group") +public class DeviceGroup extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 分组名称 + */ + private String groupName; + + /** + * 状态：0-禁用，1-正常 + */ + private Long status; + + /** + * 父分组ID + */ + private Long parentId; + + /** + * 完整分组路径 + */ + private String fullPath; + + /** + * 删除标记：0-未删除，1-已删除 + */ + private Long isDeleted; + + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceRepairRecords.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceRepairRecords.java new file mode 100644 index 0000000..3fca3c4 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceRepairRecords.java @@ -0,0 +1,58 @@ +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_repair_records + * + * @author Lion Li + * @date 2025-08-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("device_repair_records") +public class DeviceRepairRecords extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 维修记录ID + */ + @TableId(value = "record_id") + private Long recordId; + + /** + * 设备ID + */ + private String deviceId; + + /** + * 维修时间 + */ + private Date repairTime; + + /** + * 维修部位 + */ + private String repairPart; + + /** + * 维修原因 + */ + private String repairReason; + + /** + * 维修人员 + */ + private String repairPerson; + + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java new file mode 100644 index 0000000..187eb53 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java @@ -0,0 +1,56 @@ +package com.fuyuanshen.equipment.domain.bo; + +import com.fuyuanshen.equipment.domain.DeviceGroup; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 设备分组业务对象 device_group + * + * @author Lion Li + * @date 2025-08-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DeviceGroup.class, reverseConvertGenerate = false) +public class DeviceGroupBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 分组名称 + */ + @NotBlank(message = "分组名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String groupName; + + /** + * 状态：0-禁用，1-正常 + */ + @NotNull(message = "状态：0-禁用，1-正常不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long status; + + /** + * 父分组ID + */ + private Long parentId; + + /** + * 完整分组路径 + */ + private String fullPath; + + /** + * 删除标记：0-未删除，1-已删除 + */ + @NotNull(message = "删除标记：0-未删除，1-已删除不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long isDeleted; + + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceRepairRecordsBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceRepairRecordsBo.java new file mode 100644 index 0000000..0c7529e --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceRepairRecordsBo.java @@ -0,0 +1,60 @@ +package com.fuyuanshen.equipment.domain.bo; + +import com.fuyuanshen.equipment.domain.DeviceRepairRecords; +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_repair_records + * + * @author Lion Li + * @date 2025-08-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DeviceRepairRecords.class, reverseConvertGenerate = false) +public class DeviceRepairRecordsBo extends BaseEntity { + + /** + * 维修记录ID + */ + @NotNull(message = "维修记录ID不能为空", groups = { EditGroup.class }) + private Long recordId; + + /** + * 设备ID + */ + @NotBlank(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deviceId; + + /** + * 维修时间 + */ + @NotNull(message = "维修时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date repairTime; + + /** + * 维修部位 + */ + @NotBlank(message = "维修部位不能为空", groups = { AddGroup.class, EditGroup.class }) + private String repairPart; + + /** + * 维修原因 + */ + @NotBlank(message = "维修原因不能为空", groups = { AddGroup.class, EditGroup.class }) + private String repairReason; + + /** + * 维修人员 + */ + @NotBlank(message = "维修人员不能为空", groups = { AddGroup.class, EditGroup.class }) + private String repairPerson; + + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java new file mode 100644 index 0000000..fe45339 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java @@ -0,0 +1,68 @@ +package com.fuyuanshen.equipment.domain.vo; + +import com.fuyuanshen.equipment.domain.DeviceGroup; +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_group + * + * @author Lion Li + * @date 2025-08-08 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DeviceGroup.class) +public class DeviceGroupVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 分组名称 + */ + @ExcelProperty(value = "分组名称") + private String groupName; + + /** + * 状态：0-禁用，1-正常 + */ + @ExcelProperty(value = "状态：0-禁用，1-正常") + private Long status; + + /** + * 父分组ID + */ + @ExcelProperty(value = "父分组ID") + private Long parentId; + + /** + * 完整分组路径 + */ + @ExcelProperty(value = "完整分组路径") + private String fullPath; + + /** + * 删除标记：0-未删除，1-已删除 + */ + @ExcelProperty(value = "删除标记：0-未删除，1-已删除") + private Long isDeleted; + + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java new file mode 100644 index 0000000..f66bb67 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java @@ -0,0 +1,70 @@ +package com.fuyuanshen.equipment.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fuyuanshen.equipment.domain.DeviceRepairRecords; +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_repair_records + * + * @author Lion Li + * @date 2025-08-08 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DeviceRepairRecords.class) +public class DeviceRepairRecordsVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 维修记录ID + */ + @ExcelProperty(value = "维修记录ID") + private Long recordId; + + /** + * 设备ID + */ + @ExcelProperty(value = "设备ID") + private String deviceId; + + /** + * 维修时间 + */ + @ExcelProperty(value = "维修时间") + private Date repairTime; + + /** + * 维修部位 + */ + @ExcelProperty(value = "维修部位") + private String repairPart; + + /** + * 维修原因 + */ + @ExcelProperty(value = "维修原因") + private String repairReason; + + /** + * 维修人员 + */ + @ExcelProperty(value = "维修人员") + private String repairPerson; + + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceGroupMapper.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceGroupMapper.java new file mode 100644 index 0000000..a92cfad --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceGroupMapper.java @@ -0,0 +1,15 @@ +package com.fuyuanshen.equipment.mapper; + +import com.fuyuanshen.equipment.domain.DeviceGroup; +import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备分组Mapper接口 + * + * @author Lion Li + * @date 2025-08-08 + */ +public interface DeviceGroupMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceRepairRecordsMapper.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceRepairRecordsMapper.java new file mode 100644 index 0000000..eb3cec2 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceRepairRecordsMapper.java @@ -0,0 +1,15 @@ +package com.fuyuanshen.equipment.mapper; + +import com.fuyuanshen.equipment.domain.DeviceRepairRecords; +import com.fuyuanshen.equipment.domain.vo.DeviceRepairRecordsVo; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备维修记录Mapper接口 + * + * @author Lion Li + * @date 2025-08-08 + */ +public interface DeviceRepairRecordsMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java new file mode 100644 index 0000000..8cda9c8 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java @@ -0,0 +1,58 @@ +package com.fuyuanshen.equipment.service; + +import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo; +import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo; + +import java.util.Collection; +import java.util.List; + +/** + * 设备分组Service接口 + * + * @author Lion Li + * @date 2025-08-08 + */ +public interface IDeviceGroupService { + + /** + * 查询设备分组 + * + * @param id 主键 + * @return 设备分组 + */ + DeviceGroupVo queryById(Long id); + + + /** + * 查询符合条件的设备分组列表 + * + * @param bo 查询条件 + * @return 设备分组列表 + */ + List queryList(DeviceGroupBo bo); + + /** + * 新增设备分组 + * + * @param bo 设备分组 + * @return 是否新增成功 + */ + Boolean insertByBo(DeviceGroupBo bo); + + /** + * 修改设备分组 + * + * @param bo 设备分组 + * @return 是否修改成功 + */ + Boolean updateByBo(DeviceGroupBo 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/IDeviceRepairRecordsService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceRepairRecordsService.java new file mode 100644 index 0000000..8fb838c --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceRepairRecordsService.java @@ -0,0 +1,68 @@ +package com.fuyuanshen.equipment.service; + +import com.fuyuanshen.equipment.domain.vo.DeviceRepairRecordsVo; +import com.fuyuanshen.equipment.domain.bo.DeviceRepairRecordsBo; +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-08 + */ +public interface IDeviceRepairRecordsService { + + /** + * 查询设备维修记录 + * + * @param recordId 主键 + * @return 设备维修记录 + */ + DeviceRepairRecordsVo queryById(Long recordId); + + /** + * 分页查询设备维修记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备维修记录分页列表 + */ + TableDataInfo queryPageList(DeviceRepairRecordsBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备维修记录列表 + * + * @param bo 查询条件 + * @return 设备维修记录列表 + */ + List queryList(DeviceRepairRecordsBo bo); + + /** + * 新增设备维修记录 + * + * @param bo 设备维修记录 + * @return 是否新增成功 + */ + Boolean insertByBo(DeviceRepairRecordsBo bo); + + /** + * 修改设备维修记录 + * + * @param bo 设备维修记录 + * @return 是否修改成功 + */ + Boolean updateByBo(DeviceRepairRecordsBo 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/DeviceGroupServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java new file mode 100644 index 0000000..3f64a2a --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java @@ -0,0 +1,120 @@ +package com.fuyuanshen.equipment.service.impl; + +import com.fuyuanshen.common.core.utils.MapstructUtils; +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.DeviceGroupBo; +import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo; +import com.fuyuanshen.equipment.domain.DeviceGroup; +import com.fuyuanshen.equipment.mapper.DeviceGroupMapper; +import com.fuyuanshen.equipment.service.IDeviceGroupService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备分组Service业务层处理 + * + * @author Lion Li + * @date 2025-08-08 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class DeviceGroupServiceImpl implements IDeviceGroupService { + + private final DeviceGroupMapper baseMapper; + + /** + * 查询设备分组 + * + * @param id 主键 + * @return 设备分组 + */ + @Override + public DeviceGroupVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + + /** + * 查询符合条件的设备分组列表 + * + * @param bo 查询条件 + * @return 设备分组列表 + */ + @Override + public List queryList(DeviceGroupBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(DeviceGroupBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(DeviceGroup::getId); + lqw.like(StringUtils.isNotBlank(bo.getGroupName()), DeviceGroup::getGroupName, bo.getGroupName()); + lqw.eq(bo.getStatus() != null, DeviceGroup::getStatus, bo.getStatus()); + lqw.eq(bo.getParentId() != null, DeviceGroup::getParentId, bo.getParentId()); + lqw.eq(StringUtils.isNotBlank(bo.getFullPath()), DeviceGroup::getFullPath, bo.getFullPath()); + lqw.eq(bo.getIsDeleted() != null, DeviceGroup::getIsDeleted, bo.getIsDeleted()); + return lqw; + } + + /** + * 新增设备分组 + * + * @param bo 设备分组 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DeviceGroupBo bo) { + DeviceGroup add = MapstructUtils.convert(bo, DeviceGroup.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改设备分组 + * + * @param bo 设备分组 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DeviceGroupBo bo) { + DeviceGroup update = MapstructUtils.convert(bo, DeviceGroup.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DeviceGroup 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/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.java new file mode 100644 index 0000000..48569e3 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.java @@ -0,0 +1,135 @@ +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.DeviceRepairRecordsBo; +import com.fuyuanshen.equipment.domain.vo.DeviceRepairRecordsVo; +import com.fuyuanshen.equipment.domain.DeviceRepairRecords; +import com.fuyuanshen.equipment.mapper.DeviceRepairRecordsMapper; +import com.fuyuanshen.equipment.service.IDeviceRepairRecordsService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备维修记录Service业务层处理 + * + * @author Lion Li + * @date 2025-08-08 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class DeviceRepairRecordsServiceImpl implements IDeviceRepairRecordsService { + + private final DeviceRepairRecordsMapper baseMapper; + + /** + * 查询设备维修记录 + * + * @param recordId 主键 + * @return 设备维修记录 + */ + @Override + public DeviceRepairRecordsVo queryById(Long recordId){ + return baseMapper.selectVoById(recordId); + } + + /** + * 分页查询设备维修记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备维修记录分页列表 + */ + @Override + public TableDataInfo queryPageList(DeviceRepairRecordsBo 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(DeviceRepairRecordsBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(DeviceRepairRecordsBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(DeviceRepairRecords::getRecordId); + lqw.eq(StringUtils.isNotBlank(bo.getDeviceId()), DeviceRepairRecords::getDeviceId, bo.getDeviceId()); + lqw.eq(bo.getRepairTime() != null, DeviceRepairRecords::getRepairTime, bo.getRepairTime()); + lqw.eq(StringUtils.isNotBlank(bo.getRepairPart()), DeviceRepairRecords::getRepairPart, bo.getRepairPart()); + lqw.eq(StringUtils.isNotBlank(bo.getRepairReason()), DeviceRepairRecords::getRepairReason, bo.getRepairReason()); + lqw.eq(StringUtils.isNotBlank(bo.getRepairPerson()), DeviceRepairRecords::getRepairPerson, bo.getRepairPerson()); + return lqw; + } + + /** + * 新增设备维修记录 + * + * @param bo 设备维修记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DeviceRepairRecordsBo bo) { + DeviceRepairRecords add = MapstructUtils.convert(bo, DeviceRepairRecords.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRecordId(add.getRecordId()); + } + return flag; + } + + /** + * 修改设备维修记录 + * + * @param bo 设备维修记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DeviceRepairRecordsBo bo) { + DeviceRepairRecords update = MapstructUtils.convert(bo, DeviceRepairRecords.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DeviceRepairRecords 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/DeviceGroupMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceGroupMapper.xml new file mode 100644 index 0000000..36cd5e2 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceGroupMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceRepairRecordsMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceRepairRecordsMapper.xml new file mode 100644 index 0000000..46af59f --- /dev/null +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceRepairRecordsMapper.xml @@ -0,0 +1,7 @@ + + + + + From 3abee42b0726d6a26086f669c74987cc11c79a37 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Fri, 8 Aug 2025 10:43:53 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/DeviceControlCenterController.java | 210 ++++++++++++++++++ 1 file changed, 210 insertions(+) create mode 100644 fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java 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 new file mode 100644 index 0000000..0f4079c --- /dev/null +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java @@ -0,0 +1,210 @@ +package com.fuyuanshen.web.controller.device; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author: 默苍璃 + * @date: 2025-08-0810:40 + */ +@Slf4j +@Tag(name = "web后台:设备控制中心", description = "web后台:设备控制中心") +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/device") +public class DeviceControlCenterController { + + /** + * 获取设备基本信息 + * @param deviceId 设备ID + * @return 设备基本信息 + */ + @GetMapping("/info/{deviceId}") + public ResponseEntity> getDeviceInfo(@PathVariable String deviceId) { + // 实际应用中这里会从数据库查询设备信息 + Map deviceInfo = new HashMap<>(); + deviceInfo.put("deviceName", "6170零零一"); + deviceInfo.put("deviceModel", "BJQ6170"); + deviceInfo.put("deviceId", deviceId); + deviceInfo.put("status", "在线"); + deviceInfo.put("batteryLevel", 85); + + return ResponseEntity.ok(deviceInfo); + } + + /** + * 设置灯光模式 + * @param lightModeRequest 灯光模式请求 + * @return 操作结果 + */ + @PostMapping("/light-mode") + public ResponseEntity> setLightMode(@RequestBody LightModeRequest lightModeRequest) { + // 实际应用中这里会控制设备灯光 + Map response = new HashMap<>(); + response.put("code", 200); + // response.put("message", "灯光模式已设置为: " + lightModeRequest.getMode()); + // response.put("deviceId", lightModeRequest.getDeviceId()); + // response.put("mode", lightModeRequest.getMode()); + + return ResponseEntity.ok(response); + } + + /** + * 更新人员信息 + * @param personInfo 人员信息 + * @return 操作结果 + */ + @PostMapping("/person-info") + public ResponseEntity> updatePersonInfo(@RequestBody PersonInfo personInfo) { + // 实际应用中这里会更新数据库 + Map response = new HashMap<>(); + response.put("code", 200); + response.put("message", "人员信息已更新"); + // response.put("unit", personInfo.getUnit()); + // response.put("position", personInfo.getPosition()); + + return ResponseEntity.ok(response); + } + + /** + * 管理开机画面内容 + * @param bootScreenRequest 开机画面请求 + * @return 操作结果 + */ + @PostMapping("/boot-screen") + public ResponseEntity> manageBootScreen(@RequestBody BootScreenRequest bootScreenRequest) { + // 实际应用中这里会更新设备开机画面 + Map response = new HashMap<>(); + response.put("code", 200); + response.put("message", "开机画面内容已更新"); + // response.put("deviceId", bootScreenRequest.getDeviceId()); + // response.put("screens", bootScreenRequest.getScreens()); + + return ResponseEntity.ok(response); + } + + /** + * 设置灯光亮度 + * @param brightnessRequest 亮度请求 + * @return 操作结果 + */ + @PostMapping("/brightness") + public ResponseEntity> setBrightness(@RequestBody BrightnessRequest brightnessRequest) { + // 实际应用中这里会控制设备亮度 + Map response = new HashMap<>(); + response.put("code", 200); + // response.put("message", "灯光亮度已设置为: " + brightnessRequest.getBrightness() + "%"); + // response.put("deviceId", brightnessRequest.getDeviceId()); + // response.put("brightness", brightnessRequest.getBrightness()); + // response.put("forceAlarm", brightnessRequest.isForceAlarm()); + + return ResponseEntity.ok(response); + } + + /** + * 获取设备位置信息 + * @param deviceId 设备ID + * @return 位置信息 + */ + @GetMapping("/location/{deviceId}") + public ResponseEntity> getLocation(@PathVariable String deviceId) { + // 实际应用中这里会从设备获取实时位置 + Map locationInfo = new HashMap<>(); + locationInfo.put("deviceId", deviceId); + locationInfo.put("longitude", "114°7'E"); + locationInfo.put("latitude", "30'28'N"); + locationInfo.put("address", "湖北省武汉市洪山区光谷大道国际企业中心"); + locationInfo.put("timestamp", new Date()); + + return ResponseEntity.ok(locationInfo); + } + + /** + * 发送紧急消息 + * @param messageRequest 消息请求 + * @return 操作结果 + */ + @PostMapping("/send-message") + public ResponseEntity> sendMessage(@RequestBody MessageRequest messageRequest) { + // 实际应用中这里会向设备发送消息 + Map response = new HashMap<>(); + response.put("code", 200); + response.put("message", "消息已发送"); + // response.put("deviceId", messageRequest.getDeviceId()); + // response.put("content", messageRequest.getContent()); + response.put("timestamp", new Date()); + + return ResponseEntity.ok(response); + } + + /** + * 管理操作视频 + * @param videoRequest 视频请求 + * @return 操作结果 + */ + @PostMapping("/operation-video") + public ResponseEntity> manageOperationVideo(@RequestBody VideoRequest videoRequest) { + // 实际应用中这里会更新设备操作视频 + Map response = new HashMap<>(); + response.put("code", 200); + response.put("message", "操作视频已更新"); + // response.put("deviceId", videoRequest.getDeviceId()); + // response.put("videoUrl", videoRequest.getVideoUrl()); + + return ResponseEntity.ok(response); + } + + // 请求对象类定义 + public static class LightModeRequest { + private String deviceId; + private String mode; // 强光、弱光、爆闪、泛光、激光 + + // Getters and Setters + } + + public static class PersonInfo { + private String deviceId; + private String unit; // 单位 + private String position; // 职位 + + // Getters and Setters + } + + public static class BootScreenRequest { + private String deviceId; + private List screens; // 产品参数、操作说明等 + + // Getters and Setters + } + + public static class BrightnessRequest { + private String deviceId; + private int brightness; // 0-100 + private boolean forceAlarm; // 强制报警 + + // Getters and Setters + } + + public static class MessageRequest { + private String deviceId; + private String content; // 消息内容 + + // Getters and Setters + } + + public static class VideoRequest { + private String deviceId; + private String videoUrl; // 视频链接 + + // Getters and Setters + } + +} From 72cab138a7b1775e609d6d9199cad812078bd748 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Fri, 8 Aug 2025 10:44:49 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/device/DeviceControlCenterController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0f4079c..13b3471 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 @@ -19,7 +19,7 @@ import java.util.Map; @Tag(name = "web后台:设备控制中心", description = "web后台:设备控制中心") @RestController @RequiredArgsConstructor -@RequestMapping("/api/device") +@RequestMapping("/api/device/controlCenter") public class DeviceControlCenterController { /** From 1af4b165f25130b3bc7abc151cc05eba1650164c Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Wed, 13 Aug 2025 19:29:04 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuyuanshen/CorrectVCardGenerator.java | 96 +++++++++++++++++++ .../fuyuanshen/web/ChineseVCardGenerator.java | 64 +++++++++++++ .../fuyuanshen/web/PhoneNumberGenerator.java | 41 ++++++++ .../com/fuyuanshen/web/VCardGenerator.java | 59 ++++++++++++ .../device}/DeviceGroupController.java | 14 +-- .../equipment/domain/bo/DeviceGroupBo.java | 8 +- .../domain/bo/DeviceRepairRecordsBo.java | 2 + .../equipment/domain/vo/DeviceGroupVo.java | 6 +- .../equipment/mapper/DeviceMapper.java | 1 + .../service/impl/DeviceGroupServiceImpl.java | 29 ++++-- .../impl/DeviceRepairRecordsServiceImpl.java | 1 + 11 files changed, 305 insertions(+), 16 deletions(-) create mode 100644 fys-admin/src/main/java/com/fuyuanshen/CorrectVCardGenerator.java create mode 100644 fys-admin/src/main/java/com/fuyuanshen/web/ChineseVCardGenerator.java create mode 100644 fys-admin/src/main/java/com/fuyuanshen/web/PhoneNumberGenerator.java create mode 100644 fys-admin/src/main/java/com/fuyuanshen/web/VCardGenerator.java rename {fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller => fys-admin/src/main/java/com/fuyuanshen/web/controller/device}/DeviceGroupController.java (92%) diff --git a/fys-admin/src/main/java/com/fuyuanshen/CorrectVCardGenerator.java b/fys-admin/src/main/java/com/fuyuanshen/CorrectVCardGenerator.java new file mode 100644 index 0000000..8c4b719 --- /dev/null +++ b/fys-admin/src/main/java/com/fuyuanshen/CorrectVCardGenerator.java @@ -0,0 +1,96 @@ +package com.fuyuanshen; + +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class CorrectVCardGenerator { + public static void main(String[] args) { + // // 定义江西上饶的134号段（共22个） + // String[] prefixes = { + // "1340703", "1340793", "1342650", "1342651", "1342663", + // "1342664", "1342665", "1343703", "1343793", "1347901", + // "1347902", "1347903", "1347930", "1347931", "1347932", + // "1347933", "1347934", "1347935", "1347936", "1347937", + // "1347938", "1347939" + // }; 1340700 号段（移动） + // 1340708 号段（移动） + // 1340709 号段（移动） + // 1340791 号段（移动） + // 1342668 号段（移动） + // 1343700 号段（移动） + // 1343708 号段（移动） + // 1343709 号段（移动） + // 1343790 号段（移动） + // 1343791 号段（移动） + // 1347910 号段（移动） + // 1347911 号段（移动） + // 1347912 号段（移动） + // 1347913 号段（移动） + // 1347914 号段（移动） + // 1347915 号段（移动） + // 1347916 号段（移动） + // 1347917 号段（移动） + // 1347918 号段（移动） + // 1347919 号段（移动） + + // 定义江西南昌的134号段（共22个） + String[] prefixes = { + "1340700", "1340708", "1340709", "1340791", "1342668", + "1343700", "1343708", "1343709", "1343790", "1343791", + "1347910", "1347911", "1347912", "1347913", "1347914", + "1347915", "1347916", "1347917", "1347918", "1347919" + }; + + // 创建.vcf文件 + String filename = "南昌联系人.vcf"; + + try (BufferedWriter writer = new BufferedWriter(new FileWriter(filename))) { + // 生成所有联系人 + int count = 0; + for (String prefix : prefixes) { + for (int i = 0; i < 100; i++) { + String middle = String.format("%02d", i); + String phoneNumber = prefix + middle + "51"; + + // 每个联系人以BEGIN:VCARD开始 + writer.write("BEGIN:VCARD"); + writer.newLine(); + writer.write("VERSION:3.0"); + writer.newLine(); + + // 中文姓名（用户+序号） + writer.write("FN:用户" + (count + 1)); + writer.newLine(); + + // 手机号码 + writer.write("TEL;TYPE=CELL;TYPE=VOICE:" + phoneNumber); + writer.newLine(); + + // 添加唯一标识符 + writer.write("UID:" + phoneNumber + "@shangrao"); + writer.newLine(); + + // 添加备注信息 + writer.write("NOTE:生成于" + new SimpleDateFormat("yyyy-MM-dd").format(new Date())); + writer.newLine(); + + // 每个联系人以END:VCARD结束 + writer.write("END:VCARD"); + writer.newLine(); + writer.newLine(); // 联系人之间空一行 + + count++; + } + } + + System.out.println("成功生成 " + count + " 个联系人"); + System.out.println("文件已保存为: " + filename); + + } catch (IOException e) { + System.err.println("文件写入错误: " + e.getMessage()); + } + } +} \ No newline at end of file diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/ChineseVCardGenerator.java b/fys-admin/src/main/java/com/fuyuanshen/web/ChineseVCardGenerator.java new file mode 100644 index 0000000..d856a73 --- /dev/null +++ b/fys-admin/src/main/java/com/fuyuanshen/web/ChineseVCardGenerator.java @@ -0,0 +1,64 @@ +package com.fuyuanshen.web; + +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class ChineseVCardGenerator { + public static void main(String[] args) { + // 定义江西上饶的134号段（共22个） + String[] prefixes = { + "1340703", "1340793", "1342650", "1342651", "1342663", + "1342664", "1342665", "1343703", "1343793", "1347901", + "1347902", "1347903", "1347930", "1347931", "1347932", + "1347933", "1347934", "1347935", "1347936", "1347937", + "1347938", "1347939" + }; + + // 创建.vcf文件 + String filename = "上饶联系人.vcf"; + + try (BufferedWriter writer = new BufferedWriter(new FileWriter(filename, true))) { + // 添加文件头信息（包含中文） + writer.write("BEGIN:VCARD"); + writer.newLine(); + writer.write("VERSION:3.0"); + writer.newLine(); + writer.write("X-GENERATOR:Java VCard Generator"); + writer.newLine(); + writer.write("PRODID:-//Apple Inc.//iPhone OS 15.6//EN"); + writer.newLine(); + writer.newLine(); + + // 生成所有联系人 + int count = 0; + for (String prefix : prefixes) { + for (int i = 0; i < 100; i++) { + String middle = String.format("%02d", i); + String phoneNumber = prefix + middle + "51"; + + // 写入单个联系人（使用中文） + writer.write("FN;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:用户" + (count + 1)); // 中文姓名 + writer.newLine(); + writer.write("TEL;TYPE=CELL;CHARSET=UTF-8:" + phoneNumber); // 手机号 + writer.newLine(); + writer.write("NOTE;CHARSET=UTF-8:生成时间 " + new SimpleDateFormat("yyyy-MM-dd").format(new Date())); + writer.newLine(); + writer.write("END:VCARD"); + writer.newLine(); + writer.newLine(); + + count++; + } + } + + System.out.println("成功生成 " + count + " 个中文联系人"); + System.out.println("文件已保存为: " + filename); + + } catch (IOException e) { + System.err.println("文件写入错误: " + e.getMessage()); + } + } +} \ No newline at end of file diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/PhoneNumberGenerator.java b/fys-admin/src/main/java/com/fuyuanshen/web/PhoneNumberGenerator.java new file mode 100644 index 0000000..56536d8 --- /dev/null +++ b/fys-admin/src/main/java/com/fuyuanshen/web/PhoneNumberGenerator.java @@ -0,0 +1,41 @@ +package com.fuyuanshen.web; + +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; + +public class PhoneNumberGenerator { + public static void main(String[] args) { + // 定义江西上饶的134号段（共22个） + String[] prefixes = { + "1340703", "1340793", "1342650", "1342651", "1342663", + "1342664", "1342665", "1343703", "1343793", "1347901", + "1347902", "1347903", "1347930", "1347931", "1347932", + "1347933", "1347934", "1347935", "1347936", "1347937", + "1347938", "1347939" + }; + + // 输出到控制台 + System.out.println("江西上饶134号段完整手机号码（共2200个）："); + for (String prefix : prefixes) { + for (int i = 0; i < 100; i++) { + String middle = String.format("%02d", i); // 生成00-99的中间数字 + System.out.println(prefix + middle + "51"); + } + } + + // 同时输出到文件（可选） + try (BufferedWriter writer = new BufferedWriter(new FileWriter("shangrao_phones.txt"))) { + for (String prefix : prefixes) { + for (int i = 0; i < 100; i++) { + String middle = String.format("%02d", i); + writer.write(prefix + middle + "51"); + writer.newLine(); + } + } + System.out.println("\n同时已保存到文件：shangrao_phones.txt"); + } catch (IOException e) { + System.err.println("文件写入错误：" + e.getMessage()); + } + } +} \ No newline at end of file diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/VCardGenerator.java b/fys-admin/src/main/java/com/fuyuanshen/web/VCardGenerator.java new file mode 100644 index 0000000..9a1f507 --- /dev/null +++ b/fys-admin/src/main/java/com/fuyuanshen/web/VCardGenerator.java @@ -0,0 +1,59 @@ +package com.fuyuanshen.web; + +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; + +public class VCardGenerator { + public static void main(String[] args) { + // 定义江西上饶的134号段（共22个） + String[] prefixes = { + "1340703", "1340793", "1342650", "1342651", "1342663", + "1342664", "1342665", "1343703", "1343793", "1347901", + "1347902", "1347903", "1347930", "1347931", "1347932", + "1347933", "1347934", "1347935", "1347936", "1347937", + "1347938", "1347939" + }; + + // 创建.vcf文件 + String filename = "shangrao_contacts.vcf"; + + try (BufferedWriter writer = new BufferedWriter(new FileWriter(filename))) { + // 写入文件头 + writer.write("BEGIN:VCARD"); + writer.newLine(); + writer.write("VERSION:3.0"); + writer.newLine(); + writer.newLine(); + + // 生成所有联系人 + int count = 0; + for (String prefix : prefixes) { + for (int i = 0; i < 100; i++) { + String middle = String.format("%02d", i); + String phoneNumber = prefix + middle + "51"; + + // 写入单个联系人 + writer.write("FN:" + phoneNumber); // 姓名字段使用手机号 + writer.newLine(); + writer.write("TEL;TYPE=CELL:" + phoneNumber); // 电话字段使用手机号 + writer.newLine(); + writer.write("END:VCARD"); + writer.newLine(); + writer.newLine(); + + count++; + } + } + + // 写入文件尾 + writer.write("END:VCARD"); + + System.out.println("成功生成 " + count + " 个联系人"); + System.out.println("文件已保存为: " + filename); + + } catch (IOException e) { + System.err.println("文件写入错误: " + e.getMessage()); + } + } +} \ No newline at end of file diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceGroupController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java similarity index 92% rename from fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceGroupController.java rename to fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java index 7720b37..8f8e7a9 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceGroupController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java @@ -1,4 +1,4 @@ -package com.fuyuanshen.equipment.controller; +package com.fuyuanshen.web.controller.device; import java.util.List; @@ -11,7 +11,6 @@ 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; @@ -30,11 +29,12 @@ import com.fuyuanshen.equipment.service.IDeviceGroupService; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/fys-equipment/group") +@RequestMapping("/api/device/group") public class DeviceGroupController extends BaseController { private final IDeviceGroupService deviceGroupService; + /** * 查询设备分组列表 */ @@ -64,10 +64,11 @@ public class DeviceGroupController extends BaseController { @SaCheckPermission("fys-equipment:group:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable Long id) { return R.ok(deviceGroupService.queryById(id)); } + /** * 新增设备分组 */ @@ -79,6 +80,7 @@ public class DeviceGroupController extends BaseController { return toAjax(deviceGroupService.insertByBo(bo)); } + /** * 修改设备分组 */ @@ -98,8 +100,8 @@ public class DeviceGroupController extends BaseController { @SaCheckPermission("fys-equipment:group:remove") @Log(title = "设备分组", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { return toAjax(deviceGroupService.deleteWithValidByIds(List.of(ids), true)); } + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java index 187eb53..b475bac 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java @@ -1,5 +1,7 @@ package com.fuyuanshen.equipment.domain.bo; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; import com.fuyuanshen.equipment.domain.DeviceGroup; import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import io.github.linpeilie.annotations.AutoMapper; @@ -21,7 +23,7 @@ public class DeviceGroupBo extends BaseEntity { /** * 主键ID */ - @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + // @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) private Long id; /** @@ -33,7 +35,7 @@ public class DeviceGroupBo extends BaseEntity { /** * 状态：0-禁用，1-正常 */ - @NotNull(message = "状态：0-禁用，1-正常不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "状态：0-禁用，1-正常不能为空", groups = { AddGroup.class, EditGroup.class }) private Long status; /** @@ -49,7 +51,7 @@ public class DeviceGroupBo extends BaseEntity { /** * 删除标记：0-未删除，1-已删除 */ - @NotNull(message = "删除标记：0-未删除，1-已删除不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "删除标记：0-未删除，1-已删除不能为空", groups = { AddGroup.class, EditGroup.class }) private Long isDeleted; diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceRepairRecordsBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceRepairRecordsBo.java index 0c7529e..b40b975 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceRepairRecordsBo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceRepairRecordsBo.java @@ -1,5 +1,7 @@ package com.fuyuanshen.equipment.domain.bo; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; import com.fuyuanshen.equipment.domain.DeviceRepairRecords; import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import io.github.linpeilie.annotations.AutoMapper; diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java index fe45339..d7eecaa 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java @@ -11,7 +11,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.util.Date; - +import java.util.List; /** @@ -64,5 +64,9 @@ public class DeviceGroupVo implements Serializable { @ExcelProperty(value = "删除标记：0-未删除，1-已删除") private Long isDeleted; + /** + * 嵌套子分组 + */ + private List children; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java index 57cbd4e..d767a99 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java @@ -66,4 +66,5 @@ public interface DeviceMapper extends BaseMapper { * @return */ List findByOriginalDeviceId(Long originalDeviceId); + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java index 3f64a2a..574bfce 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java @@ -1,5 +1,7 @@ package com.fuyuanshen.equipment.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.fuyuanshen.common.core.domain.R; import com.fuyuanshen.common.core.utils.MapstructUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -37,7 +39,7 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { * @return 设备分组 */ @Override - public DeviceGroupVo queryById(Long id){ + public DeviceGroupVo queryById(Long id) { return baseMapper.selectVoById(id); } @@ -66,6 +68,7 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { return lqw; } + /** * 新增设备分组 * @@ -74,8 +77,21 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { */ @Override public Boolean insertByBo(DeviceGroupBo bo) { + + // 验证分组名称唯一性 + DeviceGroup deviceGroup = baseMapper.selectOne(new QueryWrapper().eq("group_name", bo.getGroupName())); + if (deviceGroup != null) { + throw new RuntimeException("分组名称已存在,请勿重复添加"); + } + + // 验证父分组是否存在（如果提供了parentId） + DeviceGroup pDeviceGroup = baseMapper.selectById(bo.getParentId()); + if (bo.getParentId() != null && pDeviceGroup == null) { + throw new RuntimeException("父分组不存在"); + } + DeviceGroup add = MapstructUtils.convert(bo, DeviceGroup.class); - validEntityBeforeSave(add); + // validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); @@ -83,6 +99,7 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { return flag; } + /** * 修改设备分组 * @@ -99,8 +116,8 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(DeviceGroup entity){ - //TODO 做一些数据校验,如唯一约束 + private void validEntityBeforeSave(DeviceGroup entity) { + // TODO 做一些数据校验,如唯一约束 } /** @@ -112,8 +129,8 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ - //TODO 做一些业务上的校验,判断是否需要校验 + if (isValid) { + // TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.java index 48569e3..5eb4f89 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.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.DeviceRepairRecordsBo; import com.fuyuanshen.equipment.domain.vo.DeviceRepairRecordsVo; From 9c9d18cddc9e3d952416c9b11ecc4393977ace63 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Thu, 14 Aug 2025 14:21:47 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=88=86=E7=BB=84=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aa.conf | 119 ++++++++++++++++++ .../device/DeviceGroupController.java | 6 +- .../encrypt/utils/EncryptUtilsTest.java | 4 +- .../equipment/domain/DeviceGroup.java | 2 +- .../equipment/domain/bo/DeviceGroupBo.java | 7 ++ .../equipment/domain/vo/DeviceGroupVo.java | 9 +- .../equipment/mapper/DeviceGroupMapper.java | 23 ++++ .../service/IDeviceGroupService.java | 1 + .../service/impl/DeviceGroupServiceImpl.java | 43 ++++++- .../mapper/equipment/DeviceGroupMapper.xml | 25 +++- 10 files changed, 227 insertions(+), 12 deletions(-) create mode 100644 aa.conf diff --git a/aa.conf b/aa.conf new file mode 100644 index 0000000..383531e --- /dev/null +++ b/aa.conf @@ -0,0 +1,119 @@ + +#user nobody; +worker_processes 1; + +#error_log logs/error.log; +#error_log logs/error.log notice; +#error_log logs/error.log info; + +#pid logs/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include mime.types; + default_type application/octet-stream; + + #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + # '$status $body_bytes_sent "$http_referer" ' + # '"$http_user_agent" "$http_x_forwarded_for"'; + + #access_log logs/access.log main; + + sendfile on; + #tcp_nopush on; + + #keepalive_timeout 0; + keepalive_timeout 65; + + #gzip on; + + server { + listen 80; + server_name cnxhyc.com; + + #charset koi8-r; + + #access_log logs/host.access.log main; + + location / { + root html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} + } + + + # another virtual host using mix of IP-, name-, and port-based configuration + # + #server { + # listen 8000; + # listen somename:8080; + # server_name somename alias another.alias; + + # location / { + # root html; + # index index.html index.htm; + # } + #} + + + # HTTPS server + + server { + listen 443 ssl http2; + server_name cnxhyc.com; + + ssl_certificate /cert/cnxhyc.com.pem; + ssl_certificate_key /cert/cnxhyc.com.key; + + # 使用更现代的 SSL 配置 + ssl_protocols TLSv1.2 TLSv1.3; + ssl_ciphers TLS_AES_256_GCM_SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; + ssl_prefer_server_ciphers off; + + ssl_session_cache shared:SSL:10m; + ssl_session_timeout 10m; + + location / { + root html; + index index.html index.htm; + } + } + +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java index 8f8e7a9..0f0eafa 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java @@ -2,6 +2,7 @@ package com.fuyuanshen.web.controller.device; import java.util.List; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -45,6 +46,7 @@ public class DeviceGroupController extends BaseController { return R.ok(list); } + /** * 导出设备分组列表 */ @@ -56,6 +58,7 @@ public class DeviceGroupController extends BaseController { ExcelUtil.exportExcel(list, "设备分组", DeviceGroupVo.class, response); } + /** * 获取设备分组详细信息 * @@ -63,8 +66,7 @@ public class DeviceGroupController extends BaseController { */ @SaCheckPermission("fys-equipment:group:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(deviceGroupService.queryById(id)); } diff --git a/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java index c81f353..08b352a 100644 --- a/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java @@ -39,8 +39,8 @@ public class EncryptUtilsTest { loginBody.setClientId("e5cd7e4891bf95d1d19206ce24a7b32e"); loginBody.setGrantType("password"); loginBody.setTenantId("894078"); - loginBody.setCode("0"); - loginBody.setUuid("1c285b27f516486f9535face77023aeb"); + loginBody.setCode("9"); + loginBody.setUuid("d5be31eac1244cee851a9903f358bc6a"); // loginBody.setUsername("admin"); // loginBody.setPassword("admin123"); loginBody.setUsername("dyf"); diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGroup.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGroup.java index fa90f59..16f8414 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGroup.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGroup.java @@ -24,7 +24,7 @@ public class DeviceGroup extends TenantEntity { /** * 主键ID */ - @TableId(value = "id") + @TableId(value = "id", type = IdType.AUTO) private Long id; /** diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java index b475bac..37cff3b 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java @@ -5,6 +5,7 @@ import com.fuyuanshen.common.core.validate.EditGroup; import com.fuyuanshen.equipment.domain.DeviceGroup; import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import io.github.linpeilie.annotations.AutoMapper; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; @@ -55,4 +56,10 @@ public class DeviceGroupBo extends BaseEntity { private Long isDeleted; + @Schema(name = "页码", example = "1") + private Integer pageNum = 1; + + @Schema(name = "每页数据量", example = "10") + private Integer pageSize = 10; + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java index d7eecaa..58f6450 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java @@ -1,5 +1,7 @@ package com.fuyuanshen.equipment.domain.vo; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.fuyuanshen.equipment.domain.DeviceGroup; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -44,7 +46,7 @@ public class DeviceGroupVo implements Serializable { * 状态：0-禁用，1-正常 */ @ExcelProperty(value = "状态：0-禁用，1-正常") - private Long status; + private String status; /** * 父分组ID @@ -69,4 +71,9 @@ public class DeviceGroupVo implements Serializable { */ private List children; + /** + * 创建时间 + */ + private String createTime; + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceGroupMapper.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceGroupMapper.java index a92cfad..a681455 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceGroupMapper.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceGroupMapper.java @@ -1,8 +1,15 @@ package com.fuyuanshen.equipment.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuyuanshen.equipment.domain.Device; import com.fuyuanshen.equipment.domain.DeviceGroup; +import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo; import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo; import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 设备分组Mapper接口 @@ -12,4 +19,20 @@ import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; */ public interface DeviceGroupMapper extends BaseMapperPlus { + /** + * 查询设备分组列表 + * + * @param bo 设备分组 + * @return 设备分组 + */ + IPage selectRootGroups(@Param("bo") DeviceGroupBo bo, Page page); + + /** + * 查询子分组 + * + * @param id + * @return + */ + List selectByParentId(Long id); + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java index 8cda9c8..9662fef 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java @@ -1,5 +1,6 @@ package com.fuyuanshen.equipment.service; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo; import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo; diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java index 574bfce..51cf369 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java @@ -1,10 +1,16 @@ package com.fuyuanshen.equipment.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuyuanshen.common.core.domain.R; import com.fuyuanshen.common.core.utils.MapstructUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.equipment.domain.Device; +import com.fuyuanshen.equipment.domain.DeviceTypeGrants; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -15,9 +21,11 @@ import com.fuyuanshen.equipment.domain.DeviceGroup; import com.fuyuanshen.equipment.mapper.DeviceGroupMapper; import com.fuyuanshen.equipment.service.IDeviceGroupService; +import java.text.SimpleDateFormat; import java.util.List; import java.util.Map; import java.util.Collection; +import java.util.stream.Collectors; /** * 设备分组Service业务层处理 @@ -32,6 +40,7 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { private final DeviceGroupMapper baseMapper; + /** * 查询设备分组 * @@ -52,8 +61,34 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { */ @Override public List queryList(DeviceGroupBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + Page page = new Page<>(bo.getPageNum(), bo.getPageSize()); + // 1. 查询顶级分组（parent_id为null） + IPage rootGroups = baseMapper.selectRootGroups(bo, page); + List records = rootGroups.getRecords(); + + // 2. 递归构建树形结构 + return records.stream() + .map(this::buildGroupTree) + .collect(Collectors.toList()); + } + + private DeviceGroupVo buildGroupTree(DeviceGroup group) { + DeviceGroupVo vo = convertToVO(group); + // 递归查询子分组 + List children = baseMapper.selectByParentId(group.getId()); + vo.setChildren(children.stream() + .map(this::buildGroupTree) + .collect(Collectors.toList())); + return vo; + } + + private DeviceGroupVo convertToVO(DeviceGroup group) { + DeviceGroupVo vo = new DeviceGroupVo(); + vo.setId(group.getId()); + vo.setGroupName(group.getGroupName()); + vo.setStatus(group.getStatus() == 1 ? "正常" : "禁用"); + vo.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(group.getCreateTime())); + return vo; } private LambdaQueryWrapper buildQueryWrapper(DeviceGroupBo bo) { @@ -81,13 +116,13 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { // 验证分组名称唯一性 DeviceGroup deviceGroup = baseMapper.selectOne(new QueryWrapper().eq("group_name", bo.getGroupName())); if (deviceGroup != null) { - throw new RuntimeException("分组名称已存在,请勿重复添加"); + throw new RuntimeException("分组名称已存在,请勿重复添加！！！"); } // 验证父分组是否存在（如果提供了parentId） DeviceGroup pDeviceGroup = baseMapper.selectById(bo.getParentId()); if (bo.getParentId() != null && pDeviceGroup == null) { - throw new RuntimeException("父分组不存在"); + throw new RuntimeException("父分组不存在！！！"); } DeviceGroup add = MapstructUtils.convert(bo, DeviceGroup.class); diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceGroupMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceGroupMapper.xml index 36cd5e2..95050b1 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceGroupMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceGroupMapper.xml @@ -1,7 +1,28 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + From 48e972166fe9ad0e8512f52ba2aa5e699957c208 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Thu, 14 Aug 2025 18:55:53 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuyuanshen/equipment/domain/DeviceType.java | 7 +++++++ .../equipment/domain/form/DeviceTypeForm.java | 13 ++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java index 76e554e..4ed8380 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java @@ -65,4 +65,11 @@ public class DeviceType extends TenantEntity { BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); } + /** + * 型号字典用于APP页面跳转 + */ + @Schema(name = "型号字典用于APP页面跳转") + private Integer modelDictionary; + + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java index d416718..5a8617a 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java @@ -1,13 +1,6 @@ package com.fuyuanshen.equipment.domain.form; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fuyuanshen.common.tenant.core.TenantEntity; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; import lombok.Data; /** @@ -36,4 +29,10 @@ public class DeviceTypeForm { @Schema(name = "通讯方式", example = "0:4G;1:蓝牙") private String communicationMode; + /** + * 型号字典用于APP页面跳转 + */ + @Schema(name = "型号字典用于APP页面跳转") + private Integer modelDictionary; + } From f65a8cdc8c64030c5ee386caafd7df0583f17102 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Fri, 15 Aug 2025 09:40:33 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E5=AD=97=E5=85=B8=20mode?= =?UTF-8?q?lDictionary?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fuyuanshen/equipment/domain/DeviceType.java | 2 +- .../com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java index 4ed8380..32bd32e 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java @@ -69,7 +69,7 @@ public class DeviceType extends TenantEntity { * 型号字典用于APP页面跳转 */ @Schema(name = "型号字典用于APP页面跳转") - private Integer modelDictionary; + private String modelDictionary; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java index 5a8617a..7fc8a10 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java @@ -33,6 +33,6 @@ public class DeviceTypeForm { * 型号字典用于APP页面跳转 */ @Schema(name = "型号字典用于APP页面跳转") - private Integer modelDictionary; + private String modelDictionary; }