From c50bf7206013d6bd323c166d3ccad9082a330a25 Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 12 Mar 2025 15:52:21 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DmsDeviceModeFunctionController.java | 116 ++++++++++++ .../dms/domain/DmsDeviceModeFunction.java | 128 +++++++++++++ .../domain/bo/DmsDeviceModeFunctionBo.java | 131 ++++++++++++++ .../domain/vo/DmsDeviceModeFunctionVo.java | 168 ++++++++++++++++++ .../mapper/DmsDeviceModeFunctionMapper.java | 15 ++ .../IDmsDeviceModeFunctionService.java | 69 +++++++ .../DmsDeviceModeFunctionServiceImpl.java | 151 ++++++++++++++++ .../dms/DmsDeviceModeFunctionMapper.xml | 7 + 8 files changed, 785 insertions(+) create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsDeviceModeFunctionController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceModeFunctionMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsDeviceModeFunctionService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsDeviceModeFunctionServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsDeviceModeFunctionMapper.xml diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsDeviceModeFunctionController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsDeviceModeFunctionController.java new file mode 100644 index 00000000..6e75766d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsDeviceModeFunctionController.java @@ -0,0 +1,116 @@ +package org.dromara.dms.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 org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +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.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.dms.domain.vo.DmsDeviceModeFunctionVo; +import org.dromara.dms.domain.bo.DmsDeviceModeFunctionBo; +import org.dromara.dms.service.IDmsDeviceModeFunctionService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 设备模型功能 + * 前端访问路由地址为:/dms/deviceModeFunction + * + * @author Yinq + * @date 2025-03-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/deviceModeFunction") +public class DmsDeviceModeFunctionController extends BaseController { + + private final IDmsDeviceModeFunctionService dmsDeviceModeFunctionService; + + /** + * 查询设备模型功能列表 + */ + @SaCheckPermission("dms:deviceModeFunction:list") + @GetMapping("/list") + public TableDataInfo list(DmsDeviceModeFunctionBo bo, PageQuery pageQuery) { + return dmsDeviceModeFunctionService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备模型功能列表 + */ + @SaCheckPermission("dms:deviceModeFunction:export") + @Log(title = "设备模型功能", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsDeviceModeFunctionBo bo, HttpServletResponse response) { + List list = dmsDeviceModeFunctionService.queryList(bo); + ExcelUtil.exportExcel(list, "设备模型功能", DmsDeviceModeFunctionVo.class, response); + } + + /** + * 获取设备模型功能详细信息 + * + * @param modeFunctionId 主键 + */ + @SaCheckPermission("dms:deviceModeFunction:query") + @GetMapping("/{modeFunctionId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long modeFunctionId) { + return R.ok(dmsDeviceModeFunctionService.queryById(modeFunctionId)); + } + + /** + * 新增设备模型功能 + */ + @SaCheckPermission("dms:deviceModeFunction:add") + @Log(title = "设备模型功能", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsDeviceModeFunctionBo bo) { + return toAjax(dmsDeviceModeFunctionService.insertByBo(bo)); + } + + /** + * 修改设备模型功能 + */ + @SaCheckPermission("dms:deviceModeFunction:edit") + @Log(title = "设备模型功能", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsDeviceModeFunctionBo bo) { + return toAjax(dmsDeviceModeFunctionService.updateByBo(bo)); + } + + /** + * 删除设备模型功能 + * + * @param modeFunctionIds 主键串 + */ + @SaCheckPermission("dms:deviceModeFunction:remove") + @Log(title = "设备模型功能", businessType = BusinessType.DELETE) + @DeleteMapping("/{modeFunctionIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] modeFunctionIds) { + return toAjax(dmsDeviceModeFunctionService.deleteWithValidByIds(List.of(modeFunctionIds), true)); + } + + + /** + * 下拉框查询设备模型功能列表 + */ + @GetMapping("/getDmsDeviceModeFunctionList") + public R> getDmsDeviceModeFunctionList(DmsDeviceModeFunctionBo bo) { + List list = dmsDeviceModeFunctionService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java new file mode 100644 index 00000000..c3eb829d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java @@ -0,0 +1,128 @@ +package org.dromara.dms.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.io.Serial; + +/** + * 设备模型功能对象 dms_device_mode_function + * + * @author Yinq + * @date 2025-03-12 + */ +@Data +@TableName("dms_device_mode_function") +public class DmsDeviceModeFunction { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 设备模型功能ID + */ + @TableId(value = "mode_function_id", type = IdType.AUTO) + private Long modeFunctionId; + + /** + * 设备模型ID，关联表hw_device_mode的device_mode_id + */ + private Long deviceModeId; + + /** + * 功能模式（1、属性，2、服务，3、事件） + */ + private String functionMode; + + /** + * 坐标标识（1、经度，2、纬度） + */ + private String coordinate; + + /** + * 功能名称 + */ + private String functionName; + + /** + * 标识符（支持大小写字母、数字和下划线，对外暂时不超过50个字符） + */ + private String functionIdentifier; + + /** + * 功能类型(1、直采变量 2、手录变量 3、运算性变量) + */ + private String functionType; + + /** + * 数据类型（2、int，4、float，5、double，6、binary(image/base64),9、bool，10、string） + */ + private Long dataType; + + /** + * 数据定义 + */ + private String dataDefinition; + + /** + * 运算性变量公式（标识符1*标识符2*100） + */ + private String functionFormula; + + /** + * 单位 + */ + private String propertyUnit; + + /** + * 显示标识（0、不显示，1、显示，2、可累积显示） + */ + private String displayFlag; + + /** + * 读写标识（1、读写，2、只读） + */ + private String rwFlag; + + /** + * 调用方式（1、异步，2、同步），当功能模式为服务时必填 + */ + private String invokeMethod; + + /** + * 事件类型（1、信息，2、告警，3、故障），当功能类型为事件时必填 + */ + private String eventType; + + /** + * 描述 + */ + private String remark; + + /** + * 获取公式 + */ + private String acquisitionFormula; + + /** + * 预留字段，顺序 + */ + private Long orderFlag; + + /** + * 预留字段，寄存器 + */ + private String deviceRegister; + + /** + * 预留字段，步长 + */ + private Long propertyStep; + + /** + * 预留字段 + */ + private String propertyField; + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java new file mode 100644 index 00000000..a8e68ff5 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java @@ -0,0 +1,131 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsDeviceModeFunction; +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.*; + +/** + * 设备模型功能业务对象 dms_device_mode_function + * + * @author Yinq + * @date 2025-03-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsDeviceModeFunction.class, reverseConvertGenerate = false) +public class DmsDeviceModeFunctionBo extends BaseEntity { + + /** + * 设备模型功能ID + */ + private Long modeFunctionId; + + /** + * 设备模型ID，关联表hw_device_mode的device_mode_id + */ + private Long deviceModeId; + + /** + * 功能模式（1、属性，2、服务，3、事件） + */ + @NotBlank(message = "功能模式（1、属性，2、服务，3、事件）不能为空", groups = {AddGroup.class, EditGroup.class}) + private String functionMode; + + /** + * 坐标标识（1、经度，2、纬度） + */ + private String coordinate; + + /** + * 功能名称 + */ + @NotBlank(message = "功能名称不能为空", groups = {AddGroup.class, EditGroup.class}) + private String functionName; + + /** + * 标识符（支持大小写字母、数字和下划线，对外暂时不超过50个字符） + */ + private String functionIdentifier; + + /** + * 功能类型(1、直采变量 2、手录变量 3、运算性变量) + */ + private String functionType; + + /** + * 数据类型（2、int，4、float，5、double，6、binary(image/base64),9、bool，10、string） + */ + private Long dataType; + + /** + * 数据定义 + */ + private String dataDefinition; + + /** + * 运算性变量公式（标识符1*标识符2*100） + */ + private String functionFormula; + + /** + * 单位 + */ + private String propertyUnit; + + /** + * 显示标识（0、不显示，1、显示，2、可累积显示） + */ + private String displayFlag; + + /** + * 读写标识（1、读写，2、只读） + */ + private String rwFlag; + + /** + * 调用方式（1、异步，2、同步），当功能模式为服务时必填 + */ + private String invokeMethod; + + /** + * 事件类型（1、信息，2、告警，3、故障），当功能类型为事件时必填 + */ + private String eventType; + + /** + * 描述 + */ + private String remark; + + /** + * 获取公式 + */ + private String acquisitionFormula; + + /** + * 预留字段，顺序 + */ + private Long orderFlag; + + /** + * 预留字段，寄存器 + */ + private String deviceRegister; + + /** + * 预留字段，步长 + */ + private Long propertyStep; + + /** + * 预留字段 + */ + private String propertyField; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java new file mode 100644 index 00000000..d4575f39 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java @@ -0,0 +1,168 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsDeviceModeFunction; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.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 java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 设备模型功能视图对象 dms_device_mode_function + * + * @author Yinq + * @date 2025-03-12 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsDeviceModeFunction.class) +public class DmsDeviceModeFunctionVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 设备模型功能ID + */ + @ExcelProperty(value = "设备模型功能ID") + private Long modeFunctionId; + + /** + * 设备模型ID，关联表hw_device_mode的device_mode_id + */ + @ExcelProperty(value = "设备模型ID，关联表hw_device_mode的device_mode_id") + private Long deviceModeId; + + /** + * 功能模式（1、属性，2、服务，3、事件） + */ + @ExcelProperty(value = "功能模式", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "dms_function_mode") + private String functionMode; + + /** + * 坐标标识（1、经度，2、纬度） + */ + @ExcelProperty(value = "坐标标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "dms_coordinate") + private String coordinate; + + /** + * 功能名称 + */ + @ExcelProperty(value = "功能名称") + private String functionName; + + /** + * 标识符（支持大小写字母、数字和下划线，对外暂时不超过50个字符） + */ + @ExcelProperty(value = "标识符", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "支=持大小写字母、数字和下划线，对外暂时不超过50个字符") + private String functionIdentifier; + + /** + * 功能类型(1、直采变量 2、手录变量 3、运算性变量) + */ + @ExcelProperty(value = "功能类型(1、直采变量 2、手录变量 3、运算性变量)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "dms_function_type") + private String functionType; + + /** + * 数据类型（2、int，4、float，5、double，6、binary(image/base64),9、bool，10、string） + */ + @ExcelProperty(value = "数据类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "dms_data_type") + private Long dataType; + + /** + * 数据定义 + */ + @ExcelProperty(value = "数据定义") + private String dataDefinition; + + /** + * 运算性变量公式（标识符1*标识符2*100） + */ + @ExcelProperty(value = "运算性变量公式", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "标=识符1*标识符2*100") + private String functionFormula; + + /** + * 单位 + */ + @ExcelProperty(value = "单位") + private String propertyUnit; + + /** + * 显示标识（0、不显示，1、显示，2、可累积显示） + */ + @ExcelProperty(value = "显示标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "dms_display_flag") + private String displayFlag; + + /** + * 读写标识（1、读写，2、只读） + */ + @ExcelProperty(value = "读写标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "dms_rw_flag") + private String rwFlag; + + /** + * 调用方式（1、异步，2、同步），当功能模式为服务时必填 + */ + @ExcelProperty(value = "调用方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "dms_invoke_method") + private String invokeMethod; + + /** + * 事件类型（1、信息，2、告警，3、故障），当功能类型为事件时必填 + */ + @ExcelProperty(value = "事件类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "dms_event_type") + private String eventType; + + /** + * 描述 + */ + @ExcelProperty(value = "描述") + private String remark; + + /** + * 获取公式 + */ + @ExcelProperty(value = "获取公式") + private String acquisitionFormula; + + /** + * 预留字段，顺序 + */ + @ExcelProperty(value = "预留字段，顺序") + private Long orderFlag; + + /** + * 预留字段，寄存器 + */ + @ExcelProperty(value = "预留字段，寄存器") + private String deviceRegister; + + /** + * 预留字段，步长 + */ + @ExcelProperty(value = "预留字段，步长") + private Long propertyStep; + + /** + * 预留字段 + */ + @ExcelProperty(value = "预留字段") + private String propertyField; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceModeFunctionMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceModeFunctionMapper.java new file mode 100644 index 00000000..6c7239d9 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceModeFunctionMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsDeviceModeFunction; +import org.dromara.dms.domain.vo.DmsDeviceModeFunctionVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备模型功能Mapper接口 + * + * @author Yinq + * @date 2025-03-12 + */ +public interface DmsDeviceModeFunctionMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsDeviceModeFunctionService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsDeviceModeFunctionService.java new file mode 100644 index 00000000..2919118c --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsDeviceModeFunctionService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsDeviceModeFunction; +import org.dromara.dms.domain.vo.DmsDeviceModeFunctionVo; +import org.dromara.dms.domain.bo.DmsDeviceModeFunctionBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 设备模型功能Service接口 + * + * @author Yinq + * @date 2025-03-12 + */ +public interface IDmsDeviceModeFunctionService { + + /** + * 查询设备模型功能 + * + * @param modeFunctionId 主键 + * @return 设备模型功能 + */ + DmsDeviceModeFunctionVo queryById(Long modeFunctionId); + + /** + * 分页查询设备模型功能列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备模型功能分页列表 + */ + TableDataInfo queryPageList(DmsDeviceModeFunctionBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备模型功能列表 + * + * @param bo 查询条件 + * @return 设备模型功能列表 + */ + List queryList(DmsDeviceModeFunctionBo bo); + + /** + * 新增设备模型功能 + * + * @param bo 设备模型功能 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsDeviceModeFunctionBo bo); + + /** + * 修改设备模型功能 + * + * @param bo 设备模型功能 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsDeviceModeFunctionBo bo); + + /** + * 校验并批量删除设备模型功能信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsDeviceModeFunctionServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsDeviceModeFunctionServiceImpl.java new file mode 100644 index 00000000..ddc2904b --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsDeviceModeFunctionServiceImpl.java @@ -0,0 +1,151 @@ +package org.dromara.dms.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.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsDeviceModeFunctionBo; +import org.dromara.dms.domain.vo.DmsDeviceModeFunctionVo; +import org.dromara.dms.domain.DmsDeviceModeFunction; +import org.dromara.dms.mapper.DmsDeviceModeFunctionMapper; +import org.dromara.dms.service.IDmsDeviceModeFunctionService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备模型功能Service业务层处理 + * + * @author Yinq + * @date 2025-03-12 + */ +@RequiredArgsConstructor +@Service +public class DmsDeviceModeFunctionServiceImpl implements IDmsDeviceModeFunctionService { + + private final DmsDeviceModeFunctionMapper baseMapper; + + /** + * 查询设备模型功能 + * + * @param modeFunctionId 主键 + * @return 设备模型功能 + */ + @Override + public DmsDeviceModeFunctionVo queryById(Long modeFunctionId) { + return baseMapper.selectVoById(modeFunctionId); + } + + /** + * 分页查询设备模型功能列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备模型功能分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsDeviceModeFunctionBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设备模型功能列表 + * + * @param bo 查询条件 + * @return 设备模型功能列表 + */ + @Override + public List queryList(DmsDeviceModeFunctionBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsDeviceModeFunctionBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsDeviceModeFunction.class) + .selectAll(DmsDeviceModeFunction.class) + .eq(bo.getModeFunctionId() != null, DmsDeviceModeFunction::getModeFunctionId, bo.getModeFunctionId()) + .eq(bo.getDeviceModeId() != null, DmsDeviceModeFunction::getDeviceModeId, bo.getDeviceModeId()) + .eq(StringUtils.isNotBlank(bo.getFunctionMode()), DmsDeviceModeFunction::getFunctionMode, bo.getFunctionMode()) + .eq(StringUtils.isNotBlank(bo.getCoordinate()), DmsDeviceModeFunction::getCoordinate, bo.getCoordinate()) + .like(StringUtils.isNotBlank(bo.getFunctionName()), DmsDeviceModeFunction::getFunctionName, bo.getFunctionName()) + .eq(StringUtils.isNotBlank(bo.getFunctionIdentifier()), DmsDeviceModeFunction::getFunctionIdentifier, bo.getFunctionIdentifier()) + .eq(StringUtils.isNotBlank(bo.getFunctionType()), DmsDeviceModeFunction::getFunctionType, bo.getFunctionType()) + .eq(bo.getDataType() != null, DmsDeviceModeFunction::getDataType, bo.getDataType()) + .eq(StringUtils.isNotBlank(bo.getDataDefinition()), DmsDeviceModeFunction::getDataDefinition, bo.getDataDefinition()) + .eq(StringUtils.isNotBlank(bo.getFunctionFormula()), DmsDeviceModeFunction::getFunctionFormula, bo.getFunctionFormula()) + .eq(StringUtils.isNotBlank(bo.getPropertyUnit()), DmsDeviceModeFunction::getPropertyUnit, bo.getPropertyUnit()) + .eq(StringUtils.isNotBlank(bo.getDisplayFlag()), DmsDeviceModeFunction::getDisplayFlag, bo.getDisplayFlag()) + .eq(StringUtils.isNotBlank(bo.getRwFlag()), DmsDeviceModeFunction::getRwFlag, bo.getRwFlag()) + .eq(StringUtils.isNotBlank(bo.getInvokeMethod()), DmsDeviceModeFunction::getInvokeMethod, bo.getInvokeMethod()) + .eq(StringUtils.isNotBlank(bo.getEventType()), DmsDeviceModeFunction::getEventType, bo.getEventType()) + .eq(StringUtils.isNotBlank(bo.getAcquisitionFormula()), DmsDeviceModeFunction::getAcquisitionFormula, bo.getAcquisitionFormula()) + .eq(bo.getOrderFlag() != null, DmsDeviceModeFunction::getOrderFlag, bo.getOrderFlag()) + .eq(StringUtils.isNotBlank(bo.getDeviceRegister()), DmsDeviceModeFunction::getDeviceRegister, bo.getDeviceRegister()) + .eq(bo.getPropertyStep() != null, DmsDeviceModeFunction::getPropertyStep, bo.getPropertyStep()) + .eq(StringUtils.isNotBlank(bo.getPropertyField()), DmsDeviceModeFunction::getPropertyField, bo.getPropertyField()) + .orderByAsc(DmsDeviceModeFunction::getModeFunctionId); + return lqw; + } + + /** + * 新增设备模型功能 + * + * @param bo 设备模型功能 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsDeviceModeFunctionBo bo) { + DmsDeviceModeFunction add = MapstructUtils.convert(bo, DmsDeviceModeFunction.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setModeFunctionId(add.getModeFunctionId()); + } + return flag; + } + + /** + * 修改设备模型功能 + * + * @param bo 设备模型功能 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsDeviceModeFunctionBo bo) { + DmsDeviceModeFunction update = MapstructUtils.convert(bo, DmsDeviceModeFunction.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsDeviceModeFunction 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/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsDeviceModeFunctionMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsDeviceModeFunctionMapper.xml new file mode 100644 index 00000000..376e60f1 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsDeviceModeFunctionMapper.xml @@ -0,0 +1,7 @@ + + + + +