From 94f944fc22a61838976c6e1dfe3d8a1692ee6caa Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Mon, 28 Jul 2025 15:46:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/device/DeviceController.java | 104 ++++++++++++++++++ .../admin/device/vo/DevicePageReqVO.java | 39 +++++++ .../admin/device/vo/DeviceRespVO.java | 47 ++++++++ .../admin/device/vo/DeviceSaveReqVO.java | 41 +++++++ .../dal/dataobject/device/DeviceDO.java | 66 +++++++++++ .../system/dal/mysql/device/DeviceMapper.java | 34 ++++++ .../system/service/device/DeviceService.java | 66 +++++++++++ .../service/device/DeviceServiceImpl.java | 95 ++++++++++++++++ .../resources/mapper/device/DeviceMapper.xml | 12 ++ 9 files changed, 504 insertions(+) create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DevicePageReqVO.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceRespVO.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java create mode 100644 yudao-module-system/src/main/resources/mapper/device/DeviceMapper.xml diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java new file mode 100644 index 0000000..13797b3 --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java @@ -0,0 +1,104 @@ +package cn.iocoder.yudao.module.system.controller.admin.device; + +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; + +import cn.iocoder.yudao.module.system.controller.admin.device.vo.*; +import cn.iocoder.yudao.module.system.dal.dataobject.device.DeviceDO; +import cn.iocoder.yudao.module.system.service.device.DeviceService; + +@Tag(name = "管理后台 - 设备信息") +@RestController +@RequestMapping("/system/device") +@Validated +public class DeviceController { + + @Resource + private DeviceService deviceService; + + @PostMapping("/create") + @Operation(summary = "创建设备信息") + public CommonResult createDevice(@Valid @RequestBody DeviceSaveReqVO createReqVO) { + return success(deviceService.createDevice(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新设备信息") + public CommonResult updateDevice(@Valid @RequestBody DeviceSaveReqVO updateReqVO) { + deviceService.updateDevice(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除设备信息") + @Parameter(name = "id", description = "编号", required = true) + public CommonResult deleteDevice(@RequestParam("id") Integer id) { + deviceService.deleteDevice(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除设备信息") + public CommonResult deleteDeviceList(@RequestParam("ids") List ids) { + deviceService.deleteDeviceListByIds(ids); + return success(true); + } + + @GetMapping("/list") + @Operation(summary = "获得设备信息列表") + public CommonResult> getDeviceList(@RequestParam("type") String type, @RequestParam("orgid") String orgid) { + List list = deviceService.getDeviceList(type,orgid); + return success(BeanUtils.toBean(list, DeviceRespVO.class)); + } + + @GetMapping("/get") + @Operation(summary = "获得设备信息") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + public CommonResult getDevice(@RequestParam("id") Integer id) { + DeviceDO device = deviceService.getDevice(id); + return success(BeanUtils.toBean(device, DeviceRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得设备信息分页") + public CommonResult> getDevicePage(@Valid DevicePageReqVO pageReqVO) { + PageResult pageResult = deviceService.getDevicePage(pageReqVO); + return success(BeanUtils.toBean(pageResult, DeviceRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出设备信息 Excel") + @ApiAccessLog(operateType = EXPORT) + public void exportDeviceExcel(@Valid DevicePageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = deviceService.getDevicePage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "设备信息.xls", "数据", DeviceRespVO.class, + BeanUtils.toBean(list, DeviceRespVO.class)); + } + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DevicePageReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DevicePageReqVO.java new file mode 100644 index 0000000..d6455ce --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DevicePageReqVO.java @@ -0,0 +1,39 @@ +package cn.iocoder.yudao.module.system.controller.admin.device.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 设备信息分页 Request VO") +@Data +public class DevicePageReqVO extends PageParam { + + @Schema(description = "设备ID", example = "28776") + private String deviceid; + + @Schema(description = "设备名称", example = "芋艿") + private String devicename; + + @Schema(description = "设备类型", example = "1") + private String devicetype; + + @Schema(description = "组织ID", example = "10664") + private Integer orgid; + + @Schema(description = "组织名称", example = "李四") + private String orgname; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createtime; + + @Schema(description = "更新时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] updatetime; + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceRespVO.java new file mode 100644 index 0000000..553e5a9 --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceRespVO.java @@ -0,0 +1,47 @@ +package cn.iocoder.yudao.module.system.controller.admin.device.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 设备信息 Response VO") +@Data +@ExcelIgnoreUnannotated +public class DeviceRespVO { + + @Schema(description = "主键ID，自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "9788") + @ExcelProperty("主键ID，自增") + private Integer id; + + @Schema(description = "设备ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28776") + @ExcelProperty("设备ID") + private String deviceid; + + @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @ExcelProperty("设备名称") + private String devicename; + + @Schema(description = "设备类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("设备类型") + private String devicetype; + + @Schema(description = "组织ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10664") + @ExcelProperty("组织ID") + private Integer orgid; + + @Schema(description = "组织名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") + @ExcelProperty("组织名称") + private String orgname; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createtime; + + @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("更新时间") + private LocalDateTime updatetime; + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java new file mode 100644 index 0000000..ca360ef --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java @@ -0,0 +1,41 @@ +package cn.iocoder.yudao.module.system.controller.admin.device.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 设备信息新增/修改 Request VO") +@Data +public class DeviceSaveReqVO { + + @Schema(description = "主键ID，自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "9788") + private Integer id; + + @Schema(description = "设备ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28776") + @NotEmpty(message = "设备ID不能为空") + private String deviceid; + + @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @NotEmpty(message = "设备名称不能为空") + private String devicename; + + @Schema(description = "设备类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotEmpty(message = "设备类型不能为空") + private String devicetype; + + @Schema(description = "组织ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10664") + private Integer orgid; + + @Schema(description = "组织名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") + private String orgname; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createtime; + + @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime updatetime; + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java new file mode 100644 index 0000000..4ec7665 --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java @@ -0,0 +1,66 @@ +package cn.iocoder.yudao.module.system.dal.dataobject.device; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * 设备信息 DO + * + * @author 艾康菲 + */ +@TableName("tb_device") +@KeySequence("tb_device_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DeviceDO { + + /** + * 主键ID，自增 + */ + @TableId + private Integer id; + /** + * 设备ID + */ + @TableField("deviceid") + private String deviceid; + /** + * 设备名称 + */ + @TableField("devicename") + private String devicename; + /** + * 设备类型 + */ + @TableField("devicetype") + private String devicetype; + /** + * 组织ID + */ + @TableField("orgid") + private Integer orgid; + /** + * 组织名称 + */ + @TableField("orgname") + private String orgname; + /** + * 创建时间 + */ + @TableField("createtime") + private LocalDateTime createtime; + /** + * 更新时间 + */ + @TableField("updatetime") + private LocalDateTime updatetime; + + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java new file mode 100644 index 0000000..71a00a2 --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java @@ -0,0 +1,34 @@ +package cn.iocoder.yudao.module.system.dal.mysql.device; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.system.dal.dataobject.device.DeviceDO; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.system.controller.admin.device.vo.*; + +/** + * 设备信息 Mapper + * + * @author 艾康菲 + */ +@Mapper +@InterceptorIgnore(tenantLine = "true") +public interface DeviceMapper extends BaseMapperX { + + default PageResult selectPage(DevicePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(DeviceDO::getDeviceid, reqVO.getDeviceid()) + .likeIfPresent(DeviceDO::getDevicename, reqVO.getDevicename()) + .eqIfPresent(DeviceDO::getDevicetype, reqVO.getDevicetype()) + .eqIfPresent(DeviceDO::getOrgid, reqVO.getOrgid()) + .likeIfPresent(DeviceDO::getOrgname, reqVO.getOrgname()) + .betweenIfPresent(DeviceDO::getCreatetime, reqVO.getCreatetime()) + .betweenIfPresent(DeviceDO::getUpdatetime, reqVO.getUpdatetime()) + .orderByDesc(DeviceDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java new file mode 100644 index 0000000..c5ac38d --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java @@ -0,0 +1,66 @@ +package cn.iocoder.yudao.module.system.service.device; + +import java.util.*; +import javax.validation.*; +import cn.iocoder.yudao.module.system.controller.admin.device.vo.*; +import cn.iocoder.yudao.module.system.dal.dataobject.device.DeviceDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; + +/** + * 设备信息 Service 接口 + * + * @author 艾康菲 + */ +public interface DeviceService { + + /** + * 创建设备信息 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Integer createDevice(@Valid DeviceSaveReqVO createReqVO); + + /** + * 更新设备信息 + * + * @param updateReqVO 更新信息 + */ + void updateDevice(@Valid DeviceSaveReqVO updateReqVO); + + /** + * 删除设备信息 + * + * @param id 编号 + */ + void deleteDevice(Integer id); + + /** + * 批量删除设备信息 + * + * @param ids 编号 + */ + void deleteDeviceListByIds(List ids); + /* + * 根据类型和组织查询设备列表 + * */ + List getDeviceList(String type, String orgid); + + /** + * 获得设备信息 + * + * @param id 编号 + * @return 设备信息 + */ + DeviceDO getDevice(Integer id); + + /** + * 获得设备信息分页 + * + * @param pageReqVO 分页查询 + * @return 设备信息分页 + */ + PageResult getDevicePage(DevicePageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java new file mode 100644 index 0000000..91b09c5 --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java @@ -0,0 +1,95 @@ +package cn.iocoder.yudao.module.system.service.device; + +import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import cn.iocoder.yudao.module.system.controller.admin.device.vo.*; +import cn.iocoder.yudao.module.system.dal.dataobject.device.DeviceDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; + +import cn.iocoder.yudao.module.system.dal.mysql.device.DeviceMapper; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; + +/** + * 设备信息 Service 实现类 + * + * @author 艾康菲 + */ +@Service +@Validated +public class DeviceServiceImpl implements DeviceService { + + @Resource + private DeviceMapper deviceMapper; + + @Override + public Integer createDevice(DeviceSaveReqVO createReqVO) { + // 插入 + DeviceDO device = BeanUtils.toBean(createReqVO, DeviceDO.class); + deviceMapper.insert(device); + // 返回 + return device.getId(); + } + + @Override + public void updateDevice(DeviceSaveReqVO updateReqVO) { + // 校验存在 + validateDeviceExists(updateReqVO.getId()); + // 更新 + DeviceDO updateObj = BeanUtils.toBean(updateReqVO, DeviceDO.class); + deviceMapper.updateById(updateObj); + } + + @Override + public void deleteDevice(Integer id) { + // 校验存在 + validateDeviceExists(id); + // 删除 + deviceMapper.deleteById(id); + } + + @Override + public void deleteDeviceListByIds(List ids) { + // 校验存在 + validateDeviceExists(ids); + // 删除 + deviceMapper.deleteByIds(ids); + } + + private void validateDeviceExists(List ids) { + List list = deviceMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + } + } + @Override + public List getDeviceList(String type, String orgid) { + QueryWrapperX queryWrapper = new QueryWrapperX<>(); + queryWrapper.eqIfPresent("devicetype", type); + queryWrapper.eqIfPresent("orgid", orgid); + List ids = deviceMapper.selectList(queryWrapper); + return ids; + } + + private void validateDeviceExists(Integer id) { + if (deviceMapper.selectById(id) == null) { + } + } + + @Override + public DeviceDO getDevice(Integer id) { + return deviceMapper.selectById(id); + } + + @Override + public PageResult getDevicePage(DevicePageReqVO pageReqVO) { + return deviceMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/resources/mapper/device/DeviceMapper.xml b/yudao-module-system/src/main/resources/mapper/device/DeviceMapper.xml new file mode 100644 index 0000000..8d57277 --- /dev/null +++ b/yudao-module-system/src/main/resources/mapper/device/DeviceMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file