xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 添加dms设备模块、添加设备模型功能、逻辑删除

Browse Source
master
yinq 2 weeks ago
parent 33a4847aa7
commit 7d4e568835
15 changed files with 741 additions and 0 deletions
Show Stats Download Patch File Download Diff File

137
ruoyi-modules/hwmom-dms/pom.xml
Unescape Escape View File

@ -0,0 +1,137 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-modules</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hwmom-dms</artifactId>
<description>
hwmom-dms设备模块
</description>
<dependencies>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-nacos</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sentinel</artifactId>
</dependency>
<!-- RuoYi Common Log -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-log</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-dict</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-doc</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-web</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mybatis</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-dubbo</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-seata</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-idempotent</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-tenant</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-security</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-translation</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sensitive</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-encrypt</artifactId>
</dependency>
<!-- RuoYi Api System -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-api-system</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-api-resource</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.mysql</groupId>-->
<!-- <artifactId>mysql-connector-j</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

22
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/HwMomDmsApplication.java
Unescape Escape View File

@ -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启动成功 ლ(´ڡ`ლ)ﾞ ");
}
}

117
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsDeviceModeController.java
Unescape Escape View File

@ -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<DmsDeviceModeVo> 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<DmsDeviceModeVo> list = dmsDeviceModeService.queryList(bo);
ExcelUtil.exportExcel(list, "设备模型", DmsDeviceModeVo.class, response);
}
/**
* 获取设备模型详细信息
*
* @param deviceModeId 主键
*/
@SaCheckPermission("dms:deviceMode:query")
@GetMapping("/{deviceModeId}")
public R<DmsDeviceModeVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] deviceModeIds) {
return toAjax(dmsDeviceModeService.deleteWithValidByIds(List.of(deviceModeIds), true));
}
/**
* 下拉框查询设备模型列表
*/
@GetMapping("/getDmsDeviceModeList")
public R<List<DmsDeviceModeVo>> getDmsDeviceModeList(DmsDeviceModeBo bo) {
List<DmsDeviceModeVo> list = dmsDeviceModeService.queryList(bo);
return R.ok(list);
}
}

52
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceMode.java
Unescape Escape View File

@ -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;
}

50
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeBo.java
Unescape Escape View File

@ -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;
}

63
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeVo.java
Unescape Escape View File

@ -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;
}

15
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceModeMapper.java
Unescape Escape View File

@ -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<DmsDeviceMode, DmsDeviceModeVo> {
}

69
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsDeviceModeService.java
Unescape Escape View File

@ -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<DmsDeviceModeVo> queryPageList(DmsDeviceModeBo bo, PageQuery pageQuery);
/**
* 查询符合条件的设备模型列表
*
* @param bo 查询条件
* @return 设备模型列表
*/
List<DmsDeviceModeVo> 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<Long> ids, Boolean isValid);
}

135
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsDeviceModeServiceImpl.java
Unescape Escape View File

@ -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<DmsDeviceModeVo> queryPageList(DmsDeviceModeBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<DmsDeviceMode> lqw = buildQueryWrapper(bo);
Page<DmsDeviceModeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的设备模型列表
*
* @param bo 查询条件
* @return 设备模型列表
*/
@Override
public List<DmsDeviceModeVo> queryList(DmsDeviceModeBo bo) {
MPJLambdaWrapper<DmsDeviceMode> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<DmsDeviceMode> buildQueryWrapper(DmsDeviceModeBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<DmsDeviceMode> 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<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

34
ruoyi-modules/hwmom-dms/src/main/resources/application.yml
Unescape Escape View File

@ -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

8
ruoyi-modules/hwmom-dms/src/main/resources/banner.txt
Unescape Escape View File

@ -0,0 +1,8 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}
_ _
| |____ ___ __ ___ ___ _ __ ___ __| |_ __ ___ ___
| '_ \ \ /\ / / '_ ` _ \ / _ \| '_ ` _ \ _____ / _` | '_ ` _ \/ __|
| | | \ V V /| | | | | | (_) | | | | | |_____| (_| | | | | | \__ \
|_| |_|\_/\_/ |_| |_| |_|\___/|_| |_| |_| \__,_|_| |_| |_|___/

28
ruoyi-modules/hwmom-dms/src/main/resources/logback-plus.xml
Unescape Escape View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 -->
<property name="log.path" value="logs/${project.artifactId}" />
<!-- 日志输出格式 -->
<property name="console.log.pattern"
value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${console.log.pattern}</pattern>
<charset>utf-8</charset>
</encoder>
</appender>
<include resource="logback-common.xml" />
<include resource="logback-logstash.xml" />
<!-- 开启 skywalking 日志收集 -->
<include resource="logback-skylog.xml" />
<!--系统操作日志-->
<root level="info">
<appender-ref ref="console" />
</root>
</configuration>

7
ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsDeviceModeMapper.xml
Unescape Escape View File

@ -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.DmsDeviceModeMapper">
</mapper>

3
ruoyi-modules/hwmom-dms/src/main/resources/mapper/package-info.md
Unescape Escape View File

@ -0,0 +1,3 @@
java包使用 `.` 分割 resource 目录使用 `/` 分割
<br>
此文件目的 防止文件夹粘连找不到 `xml` 文件

1
ruoyi-modules/pom.xml
Unescape Escape View File

@ -18,6 +18,7 @@
<module>hwmom-wms</module>
<module>hwmom-qms</module>
<module>hwmom-api</module>
<module>hwmom-dms</module>
</modules>
<artifactId>ruoyi-modules</artifactId>

Write Preview
Loading…
Cancel
Save