update 添加设备模型功能

master
yinq 2 weeks ago
parent 10113b4a47
commit c50bf72060

@ -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<DmsDeviceModeFunctionVo> 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<DmsDeviceModeFunctionVo> list = dmsDeviceModeFunctionService.queryList(bo);
ExcelUtil.exportExcel(list, "设备模型功能", DmsDeviceModeFunctionVo.class, response);
}
/**
*
*
* @param modeFunctionId
*/
@SaCheckPermission("dms:deviceModeFunction:query")
@GetMapping("/{modeFunctionId}")
public R<DmsDeviceModeFunctionVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] modeFunctionIds) {
return toAjax(dmsDeviceModeFunctionService.deleteWithValidByIds(List.of(modeFunctionIds), true));
}
/**
*
*/
@GetMapping("/getDmsDeviceModeFunctionList")
public R<List<DmsDeviceModeFunctionVo>> getDmsDeviceModeFunctionList(DmsDeviceModeFunctionBo bo) {
List<DmsDeviceModeFunctionVo> list = dmsDeviceModeFunctionService.queryList(bo);
return R.ok(list);
}
}

@ -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;
/**
* IDhw_device_modedevice_mode_id
*/
private Long deviceModeId;
/**
* 123
*/
private String functionMode;
/**
* 12
*/
private String coordinate;
/**
*
*/
private String functionName;
/**
* 线50
*/
private String functionIdentifier;
/**
* (1 2 3)
*/
private String functionType;
/**
* 2int4float5double6binary(image/base64),9bool10string
*/
private Long dataType;
/**
*
*/
private String dataDefinition;
/**
* 1*2*100
*/
private String functionFormula;
/**
*
*/
private String propertyUnit;
/**
* 012
*/
private String displayFlag;
/**
* 12
*/
private String rwFlag;
/**
* 12
*/
private String invokeMethod;
/**
* 123
*/
private String eventType;
/**
*
*/
private String remark;
/**
*
*/
private String acquisitionFormula;
/**
*
*/
private Long orderFlag;
/**
*
*/
private String deviceRegister;
/**
*
*/
private Long propertyStep;
/**
*
*/
private String propertyField;
}

@ -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;
/**
* IDhw_device_modedevice_mode_id
*/
private Long deviceModeId;
/**
* 123
*/
@NotBlank(message = "功能模式1、属性2、服务3、事件不能为空", groups = {AddGroup.class, EditGroup.class})
private String functionMode;
/**
* 12
*/
private String coordinate;
/**
*
*/
@NotBlank(message = "功能名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String functionName;
/**
* 线50
*/
private String functionIdentifier;
/**
* (1 2 3)
*/
private String functionType;
/**
* 2int4float5double6binary(image/base64),9bool10string
*/
private Long dataType;
/**
*
*/
private String dataDefinition;
/**
* 1*2*100
*/
private String functionFormula;
/**
*
*/
private String propertyUnit;
/**
* 012
*/
private String displayFlag;
/**
* 12
*/
private String rwFlag;
/**
* 12
*/
private String invokeMethod;
/**
* 123
*/
private String eventType;
/**
*
*/
private String remark;
/**
*
*/
private String acquisitionFormula;
/**
*
*/
private Long orderFlag;
/**
*
*/
private String deviceRegister;
/**
*
*/
private Long propertyStep;
/**
*
*/
private String propertyField;
}

@ -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;
/**
* IDhw_device_modedevice_mode_id
*/
@ExcelProperty(value = "设备模型ID关联表hw_device_mode的device_mode_id")
private Long deviceModeId;
/**
* 123
*/
@ExcelProperty(value = "功能模式", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "dms_function_mode")
private String functionMode;
/**
* 12
*/
@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;
/**
* 2int4float5double6binary(image/base64),9bool10string
*/
@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;
/**
* 012
*/
@ExcelProperty(value = "显示标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "dms_display_flag")
private String displayFlag;
/**
* 12
*/
@ExcelProperty(value = "读写标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "dms_rw_flag")
private String rwFlag;
/**
* 12
*/
@ExcelProperty(value = "调用方式", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "dms_invoke_method")
private String invokeMethod;
/**
* 123
*/
@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;
}

@ -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<DmsDeviceModeFunction, DmsDeviceModeFunctionVo> {
}

@ -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<DmsDeviceModeFunctionVo> queryPageList(DmsDeviceModeFunctionBo bo, PageQuery pageQuery);
/**
*
*
* @param bo
* @return
*/
List<DmsDeviceModeFunctionVo> 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<Long> ids, Boolean isValid);
}

@ -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<DmsDeviceModeFunctionVo> queryPageList(DmsDeviceModeFunctionBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<DmsDeviceModeFunction> lqw = buildQueryWrapper(bo);
Page<DmsDeviceModeFunctionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
*
*
* @param bo
* @return
*/
@Override
public List<DmsDeviceModeFunctionVo> queryList(DmsDeviceModeFunctionBo bo) {
MPJLambdaWrapper<DmsDeviceModeFunction> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<DmsDeviceModeFunction> buildQueryWrapper(DmsDeviceModeFunctionBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<DmsDeviceModeFunction> 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<Long> ids, Boolean isValid) {
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

@ -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.dms.mapper.DmsDeviceModeFunctionMapper">
</mapper>
Loading…
Cancel
Save