diff --git a/ruoyi-modules/hwmom-dms/pom.xml b/ruoyi-modules/hwmom-dms/pom.xml new file mode 100644 index 0000000..2dda904 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/pom.xml @@ -0,0 +1,137 @@ + + + + org.dromara + ruoyi-modules + ${revision} + + 4.0.0 + + hwmom-dms + + + hwmom-dms设备模块 + + + + + + org.dromara + ruoyi-common-nacos + + + + org.dromara + ruoyi-common-sentinel + + + + + org.dromara + ruoyi-common-log + + + + org.dromara + ruoyi-common-dict + + + + org.dromara + ruoyi-common-doc + + + + org.dromara + ruoyi-common-web + + + + org.dromara + ruoyi-common-mybatis + + + + org.dromara + ruoyi-common-dubbo + + + + org.dromara + ruoyi-common-seata + + + + org.dromara + ruoyi-common-idempotent + + + + org.dromara + ruoyi-common-tenant + + + + org.dromara + ruoyi-common-security + + + + org.dromara + ruoyi-common-translation + + + + org.dromara + ruoyi-common-sensitive + + + + org.dromara + ruoyi-common-encrypt + + + + + org.dromara + ruoyi-api-system + + + + org.dromara + ruoyi-api-resource + + + + + + + + + com.microsoft.sqlserver + mssql-jdbc + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/HwMomDmsApplication.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/HwMomDmsApplication.java new file mode 100644 index 0000000..b2560f6 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/HwMomDmsApplication.java @@ -0,0 +1,22 @@ +package org.dromara.dms; + +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; + +/** + * DMS设备模块 + * + * @author ruoyi + */ +@EnableDubbo +@SpringBootApplication +public class HwMomDmsApplication { + public static void main(String[] args) { + SpringApplication application = new SpringApplication(HwMomDmsApplication.class); + application.setApplicationStartup(new BufferingApplicationStartup(2048)); + application.run(args); + System.out.println("(♥◠‿◠)ﾉﾞ HwDms启动成功 ლ(´ڡ`ლ)ﾞ "); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsDeviceModeController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsDeviceModeController.java new file mode 100644 index 0000000..21e595a --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsDeviceModeController.java @@ -0,0 +1,117 @@ +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.DmsDeviceModeVo; +import org.dromara.dms.domain.bo.DmsDeviceModeBo; +import org.dromara.dms.service.IDmsDeviceModeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 设备模型 + * 前端访问路由地址为:/dms/deviceMode + * + * @author Yinq + * @date 2025-03-11 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/deviceMode") +public class DmsDeviceModeController extends BaseController { + + private final IDmsDeviceModeService dmsDeviceModeService; + + /** + * 查询设备模型列表 + */ + @SaCheckPermission("dms:deviceMode:list") + @GetMapping("/list") + public TableDataInfo list(DmsDeviceModeBo bo, PageQuery pageQuery) { + return dmsDeviceModeService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备模型列表 + */ + @SaCheckPermission("dms:deviceMode:export") + @Log(title = "设备模型", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsDeviceModeBo bo, HttpServletResponse response) { + List list = dmsDeviceModeService.queryList(bo); + ExcelUtil.exportExcel(list, "设备模型", DmsDeviceModeVo.class, response); + } + + /** + * 获取设备模型详细信息 + * + * @param deviceModeId 主键 + */ + @SaCheckPermission("dms:deviceMode:query") + @GetMapping("/{deviceModeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long deviceModeId) { + return R.ok(dmsDeviceModeService.queryById(deviceModeId)); + } + + /** + * 新增设备模型 + */ + @SaCheckPermission("dms:deviceMode:add") + @Log(title = "设备模型", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsDeviceModeBo bo) { + return toAjax(dmsDeviceModeService.insertByBo(bo)); + } + + /** + * 修改设备模型 + */ + @SaCheckPermission("dms:deviceMode:edit") + @Log(title = "设备模型", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsDeviceModeBo bo) { + return toAjax(dmsDeviceModeService.updateByBo(bo)); + } + + /** + * 删除设备模型 + * + * @param deviceModeIds 主键串 + */ + @SaCheckPermission("dms:deviceMode:remove") + @Log(title = "设备模型", businessType = BusinessType.DELETE) + @DeleteMapping("/{deviceModeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] deviceModeIds) { + return toAjax(dmsDeviceModeService.deleteWithValidByIds(List.of(deviceModeIds), true)); + } + + + /** + * 下拉框查询设备模型列表 + */ + + @GetMapping("/getDmsDeviceModeList") + public R> getDmsDeviceModeList(DmsDeviceModeBo bo) { + List list = dmsDeviceModeService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceMode.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceMode.java new file mode 100644 index 0000000..1ed27f8 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceMode.java @@ -0,0 +1,52 @@ +package org.dromara.dms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 设备模型对象 dms_device_mode + * + * @author Yinq + * @date 2025-03-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_device_mode") +public class DmsDeviceMode extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 设备模型ID + */ + @TableId(value = "device_mode_id", type = IdType.AUTO) + private Long deviceModeId; + + /** + * 设备模型名称 + */ + private String deviceModeName; + + /** + * 设备模型状态（1：启用，9：删除） + */ + @TableLogic(value="1", delval="9") + private String deviceModeStatus; + + /** + * 设备模型图片地址 + */ + private String deviceModePic; + + /** + * 场景描述 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeBo.java new file mode 100644 index 0000000..ebc170e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeBo.java @@ -0,0 +1,50 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsDeviceMode; +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 + * + * @author Yinq + * @date 2025-03-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsDeviceMode.class, reverseConvertGenerate = false) +public class DmsDeviceModeBo extends BaseEntity { + + /** + * 设备模型ID + */ + private Long deviceModeId; + + /** + * 设备模型名称 + */ + @NotBlank(message = "设备模型名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deviceModeName; + + /** + * 设备模型状态（1：启用，9：删除） + */ + private String deviceModeStatus; + + /** + * 设备模型图片地址 + */ + private String deviceModePic; + + /** + * 场景描述 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeVo.java new file mode 100644 index 0000000..e036b9e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeVo.java @@ -0,0 +1,63 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsDeviceMode; +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 + * + * @author Yinq + * @date 2025-03-11 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsDeviceMode.class) +public class DmsDeviceModeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 设备模型ID + */ + @ExcelProperty(value = "设备模型ID") + private Long deviceModeId; + + /** + * 设备模型名称 + */ + @ExcelProperty(value = "设备模型名称") + private String deviceModeName; + + /** + * 设备模型状态（1：启用，9：删除） + */ + @ExcelProperty(value = "设备模型状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "dms_device_mode_status") + private String deviceModeStatus; + + /** + * 设备模型图片地址 + */ + @ExcelProperty(value = "设备模型图片地址") + private String deviceModePic; + + /** + * 场景描述 + */ + @ExcelProperty(value = "场景描述") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceModeMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceModeMapper.java new file mode 100644 index 0000000..0f7005e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceModeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsDeviceMode; +import org.dromara.dms.domain.vo.DmsDeviceModeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备模型Mapper接口 + * + * @author Yinq + * @date 2025-03-11 + */ +public interface DmsDeviceModeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsDeviceModeService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsDeviceModeService.java new file mode 100644 index 0000000..df89434 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsDeviceModeService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsDeviceMode; +import org.dromara.dms.domain.vo.DmsDeviceModeVo; +import org.dromara.dms.domain.bo.DmsDeviceModeBo; +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-11 + */ +public interface IDmsDeviceModeService { + + /** + * 查询设备模型 + * + * @param deviceModeId 主键 + * @return 设备模型 + */ + DmsDeviceModeVo queryById(Long deviceModeId); + + /** + * 分页查询设备模型列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备模型分页列表 + */ + TableDataInfo queryPageList(DmsDeviceModeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备模型列表 + * + * @param bo 查询条件 + * @return 设备模型列表 + */ + List queryList(DmsDeviceModeBo bo); + + /** + * 新增设备模型 + * + * @param bo 设备模型 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsDeviceModeBo bo); + + /** + * 修改设备模型 + * + * @param bo 设备模型 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsDeviceModeBo 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/DmsDeviceModeServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsDeviceModeServiceImpl.java new file mode 100644 index 0000000..c861d07 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsDeviceModeServiceImpl.java @@ -0,0 +1,135 @@ +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.DmsDeviceModeBo; +import org.dromara.dms.domain.vo.DmsDeviceModeVo; +import org.dromara.dms.domain.DmsDeviceMode; +import org.dromara.dms.mapper.DmsDeviceModeMapper; +import org.dromara.dms.service.IDmsDeviceModeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备模型Service业务层处理 + * + * @author Yinq + * @date 2025-03-11 + */ +@RequiredArgsConstructor +@Service +public class DmsDeviceModeServiceImpl implements IDmsDeviceModeService { + + private final DmsDeviceModeMapper baseMapper; + + /** + * 查询设备模型 + * + * @param deviceModeId 主键 + * @return 设备模型 + */ + @Override + public DmsDeviceModeVo queryById(Long deviceModeId){ + return baseMapper.selectVoById(deviceModeId); + } + + /** + * 分页查询设备模型列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备模型分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsDeviceModeBo 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(DmsDeviceModeBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsDeviceModeBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsDeviceMode.class) + .selectAll(DmsDeviceMode.class) + .eq(bo.getDeviceModeId() != null, DmsDeviceMode::getDeviceModeId, bo.getDeviceModeId()) + .like(StringUtils.isNotBlank(bo.getDeviceModeName()), DmsDeviceMode::getDeviceModeName, bo.getDeviceModeName()) + .eq(StringUtils.isNotBlank(bo.getDeviceModeStatus()), DmsDeviceMode::getDeviceModeStatus, bo.getDeviceModeStatus()) + .eq(StringUtils.isNotBlank(bo.getDeviceModePic()), DmsDeviceMode::getDeviceModePic, bo.getDeviceModePic()) + .orderByAsc(DmsDeviceMode::getCreateTime); + return lqw; + } + + /** + * 新增设备模型 + * + * @param bo 设备模型 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsDeviceModeBo bo) { + DmsDeviceMode add = MapstructUtils.convert(bo, DmsDeviceMode.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setDeviceModeId(add.getDeviceModeId()); + } + return flag; + } + + /** + * 修改设备模型 + * + * @param bo 设备模型 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsDeviceModeBo bo) { + DmsDeviceMode update = MapstructUtils.convert(bo, DmsDeviceMode.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsDeviceMode 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/application.yml b/ruoyi-modules/hwmom-dms/src/main/resources/application.yml new file mode 100644 index 0000000..d4d1ed7 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/application.yml @@ -0,0 +1,34 @@ +# Tomcat +server: + port: 6017 + +# Spring +spring: + application: + # 应用名称 + name: hwmom-dms + profiles: + # 环境配置 + active: @profiles.active@ + +--- # nacos 配置 +spring: + cloud: + nacos: + # nacos 服务地址 + server-addr: @nacos.server@ + username: @nacos.username@ + password: @nacos.password@ + discovery: + # 注册组 + group: @nacos.discovery.group@ + namespace: ${spring.profiles.active} + config: + # 配置组 + group: @nacos.config.group@ + namespace: ${spring.profiles.active} + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:datasource.yml + - optional:nacos:${spring.application.name}.yml diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/banner.txt b/ruoyi-modules/hwmom-dms/src/main/resources/banner.txt new file mode 100644 index 0000000..6bf0115 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/banner.txt @@ -0,0 +1,8 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ + | |____ ___ __ ___ ___ _ __ ___ __| |_ __ ___ ___ + | '_ \ \ /\ / / '_ ` _ \ / _ \| '_ ` _ \ _____ / _` | '_ ` _ \/ __| + | | | \ V V /| | | | | | (_) | | | | | |_____| (_| | | | | | \__ \ + |_| |_|\_/\_/ |_| |_| |_|\___/|_| |_| |_| \__,_|_| |_| |_|___/ + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/logback-plus.xml b/ruoyi-modules/hwmom-dms/src/main/resources/logback-plus.xml new file mode 100644 index 0000000..caaa345 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/logback-plus.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + ${console.log.pattern} + utf-8 + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsDeviceModeMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsDeviceModeMapper.xml new file mode 100644 index 0000000..4fcc82d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsDeviceModeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/package-info.md b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/package-info.md new file mode 100644 index 0000000..c938b1e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/package-info.md @@ -0,0 +1,3 @@ +java包使用 `.` 分割 resource 目录使用 `/` 分割 +
+此文件目的 防止文件夹粘连找不到 `xml` 文件 \ No newline at end of file diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index ba7a4ae..c1bd1ca 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -18,6 +18,7 @@ hwmom-wms hwmom-qms hwmom-api + hwmom-dms ruoyi-modules