HuRongxin hai 1 mes
pai
achega
6a0aac82cd

+ 106 - 0
ruoyi-admin/src/main/java/org/dromara/web/controller/SysDeviceController.java

@@ -0,0 +1,106 @@
+package org.dromara.web.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.web.domain.bo.SysDeviceBo;
+import org.dromara.web.domain.vo.SysDeviceVo;
+import org.dromara.web.service.ISysDeviceService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 设备管理
+ *
+ * @author Lion Li
+ * @date 2025-08-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/parameter/device")
+public class SysDeviceController extends BaseController {
+
+    private final ISysDeviceService sysDeviceService;
+
+    /**
+     * 查询设备管理列表
+     */
+    @SaCheckPermission("parameter:device:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysDeviceVo> list(SysDeviceBo bo, PageQuery pageQuery) {
+        return sysDeviceService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出设备管理列表
+     */
+    @SaCheckPermission("parameter:device:export")
+    @Log(title = "设备管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysDeviceBo bo, HttpServletResponse response) {
+        List<SysDeviceVo> list = sysDeviceService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备管理", SysDeviceVo.class, response);
+    }
+
+    /**
+     * 获取设备管理详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("parameter:device:query")
+    @GetMapping("/{id}")
+    public R<SysDeviceVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(sysDeviceService.queryById(id));
+    }
+
+    /**
+     * 新增设备管理
+     */
+    @SaCheckPermission("parameter:device:add")
+    @Log(title = "设备管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysDeviceBo bo) {
+        return toAjax(sysDeviceService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备管理
+     */
+    @SaCheckPermission("parameter:device:edit")
+    @Log(title = "设备管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysDeviceBo bo) {
+        return toAjax(sysDeviceService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备管理
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("parameter:device:remove")
+    @Log(title = "设备管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(sysDeviceService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

+ 62 - 0
ruoyi-admin/src/main/java/org/dromara/web/domain/SysDevice.java

@@ -0,0 +1,62 @@
+package org.dromara.web.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 设备管理对象 sys_device
+ *
+ * @author Lion Li
+ * @date 2025-08-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_device")
+public class SysDevice extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备状态
+     */
+    private String deviceStatus;
+
+    /**
+     * 设备地址
+     */
+    private String deviceAddress;
+
+    /**
+     * 删除标志(0代表存在 1代表删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

+ 56 - 0
ruoyi-admin/src/main/java/org/dromara/web/domain/bo/SysDeviceBo.java

@@ -0,0 +1,56 @@
+package org.dromara.web.domain.bo;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import org.dromara.web.domain.SysDevice;
+
+/**
+ * 设备管理业务对象 sys_device
+ *
+ * @author Lion Li
+ * @date 2025-08-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysDevice.class, reverseConvertGenerate = false)
+public class SysDeviceBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 设备名称
+     */
+    @NotBlank(message = "设备名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String deviceName;
+
+    /**
+     * 设备编号
+     */
+    @NotBlank(message = "设备编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String deviceCode;
+
+    /**
+     * 设备状态
+     */
+    private String deviceStatus;
+
+    /**
+     * 设备地址
+     */
+    private String deviceAddress;
+
+}

+ 67 - 0
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/SysDeviceVo.java

@@ -0,0 +1,67 @@
+package org.dromara.web.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.web.domain.SysDevice;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 设备管理视图对象 sys_device
+ *
+ * @author Lion Li
+ * @date 2025-08-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysDevice.class)
+public class SysDeviceVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty(value = "设备名称")
+    private String deviceName;
+
+    /**
+     * 设备编号
+     */
+    @ExcelProperty(value = "设备编号")
+    private String deviceCode;
+
+    /**
+     * 设备状态
+     */
+    @ExcelProperty(value = "设备状态 ", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "device_status")
+    private String deviceStatus;
+
+    /**
+     * 设备地址
+     */
+    @ExcelProperty(value = "设备地址")
+    private String deviceAddress;
+
+}

+ 17 - 0
ruoyi-admin/src/main/java/org/dromara/web/mapper/SysDeviceMapper.java

@@ -0,0 +1,17 @@
+package org.dromara.web.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.web.domain.SysDevice;
+import org.dromara.web.domain.vo.SysDeviceVo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 设备管理Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-08-15
+ */
+@Repository
+public interface SysDeviceMapper extends BaseMapperPlus<SysDevice, SysDeviceVo> {
+
+}

+ 69 - 0
ruoyi-admin/src/main/java/org/dromara/web/service/ISysDeviceService.java

@@ -0,0 +1,69 @@
+package org.dromara.web.service;
+
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.web.domain.bo.SysDeviceBo;
+import org.dromara.web.domain.vo.SysDeviceVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 设备管理Service接口
+ *
+ * @author Lion Li
+ * @date 2025-08-15
+ */
+public interface ISysDeviceService {
+
+    /**
+     * 查询设备管理
+     *
+     * @param id 主键
+     * @return 设备管理
+     */
+    SysDeviceVo queryById(Long id);
+
+    /**
+     * 分页查询设备管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备管理分页列表
+     */
+    TableDataInfo<SysDeviceVo> queryPageList(SysDeviceBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的设备管理列表
+     *
+     * @param bo 查询条件
+     * @return 设备管理列表
+     */
+    List<SysDeviceVo> queryList(SysDeviceBo bo);
+
+    /**
+     * 新增设备管理
+     *
+     * @param bo 设备管理
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SysDeviceBo bo);
+
+    /**
+     * 修改设备管理
+     *
+     * @param bo 设备管理
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SysDeviceBo bo);
+
+    /**
+     * 校验并批量删除设备管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 134 - 0
ruoyi-admin/src/main/java/org/dromara/web/service/impl/SysDeviceServiceImpl.java

@@ -0,0 +1,134 @@
+package org.dromara.web.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.web.domain.SysDevice;
+import org.dromara.web.domain.bo.SysDeviceBo;
+import org.dromara.web.domain.vo.SysDeviceVo;
+import org.dromara.web.mapper.SysDeviceMapper;
+import org.dromara.web.service.ISysDeviceService;
+import org.springframework.stereotype.Service;
+
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 设备管理Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-08-15
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class SysDeviceServiceImpl implements ISysDeviceService {
+
+    private final SysDeviceMapper baseMapper;
+
+    /**
+     * 查询设备管理
+     *
+     * @param id 主键
+     * @return 设备管理
+     */
+    @Override
+    public SysDeviceVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询设备管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备管理分页列表
+     */
+    @Override
+    public TableDataInfo<SysDeviceVo> queryPageList(SysDeviceBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysDevice> lqw = buildQueryWrapper(bo);
+        Page<SysDeviceVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的设备管理列表
+     *
+     * @param bo 查询条件
+     * @return 设备管理列表
+     */
+    @Override
+    public List<SysDeviceVo> queryList(SysDeviceBo bo) {
+        LambdaQueryWrapper<SysDevice> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysDevice> buildQueryWrapper(SysDeviceBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysDevice> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(SysDevice::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getDeviceType()), SysDevice::getDeviceType, bo.getDeviceType());
+        lqw.eq(StringUtils.isNotBlank(bo.getDeviceCode()), SysDevice::getDeviceCode, bo.getDeviceCode());
+        return lqw;
+    }
+
+    /**
+     * 新增设备管理
+     *
+     * @param bo 设备管理
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SysDeviceBo bo) {
+        SysDevice add = MapstructUtils.convert(bo, SysDevice.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改设备管理
+     *
+     * @param bo 设备管理
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SysDeviceBo bo) {
+        SysDevice update = MapstructUtils.convert(bo, SysDevice.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysDevice entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除设备管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

+ 7 - 0
ruoyi-admin/src/main/resources/mapper/parameter/SysDeviceMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.web.mapper.SysDeviceMapper">
+
+</mapper>

+ 2 - 0
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/BizConst.java

@@ -27,6 +27,8 @@ public interface BizConst {
 
     String PRINT_STATUS = "print_status";//打印状态
 
+    String DEVICE_STATUS="device_status";
+
     String HOSPITAL_ROLE_TYPE = "hospital_role_type";
 
     String FOOD_UNIT = "food_unit";

+ 18 - 0
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/biz/DeviceStatus.java

@@ -0,0 +1,18 @@
+package org.dromara.common.core.enums.biz;
+
+import lombok.Getter;
+
+@Getter
+public enum DeviceStatus {
+    DEVICE_NORMAL("0", "正常使用"),
+    DEVICE_MAINTAIN("1", "维修"),
+    DEVICE_STOP("2", "停用");
+
+    private String code;
+    private String remark;
+
+    private DeviceStatus(String code, String remark) {
+        this.code = code;
+        this.remark = remark;
+    }
+}