diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 610e9d706..9e08f88a9 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -81,10 +81,10 @@ - + de.codecentric diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index ea5cafac0..1c0e76b2e 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -10,7 +10,7 @@ spring.boot.admin.client: --- # snail-job 配置 snail-job: - enabled: true + enabled: false # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 group: "ruoyi_group" # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表 @@ -42,7 +42,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://localhost:3306/ry-vue-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root password: root # 从库数据源 @@ -97,7 +97,7 @@ spring.data: # 数据库索引 database: 0 # redis 密码必须配置 - password: ruoyi123 +# password: ruoyi123 # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 27de286f0..5dc680e7b 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -1,7 +1,7 @@ # 项目相关配置 ruoyi: # 名称 - name: RuoYi-Vue-Plus + name: rollingDoor # 版本 version: ${revision} # 版权年份 @@ -128,7 +128,7 @@ security: # 多租户配置 tenant: # 是否开启 - enable: true + enable: false # 排除表 excludes: - sys_menu diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqAreaController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqAreaController.java new file mode 100644 index 000000000..70753c25a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqAreaController.java @@ -0,0 +1,105 @@ +package org.dromara.system.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.system.domain.vo.EqAreaVo; +import org.dromara.system.domain.bo.EqAreaBo; +import org.dromara.system.service.IEqAreaService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 分布管理 + * + * @author Lion Li + * @date 2024-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/area") +public class EqAreaController extends BaseController { + + private final IEqAreaService eqAreaService; + + /** + * 查询分布管理列表 + */ + @SaCheckPermission("system:area:list") + @GetMapping("/list") + public TableDataInfo list(EqAreaBo bo, PageQuery pageQuery) { + return eqAreaService.queryPageList(bo, pageQuery); + } + + /** + * 导出分布管理列表 + */ + @SaCheckPermission("system:area:export") + @Log(title = "分布管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqAreaBo bo, HttpServletResponse response) { + List list = eqAreaService.queryList(bo); + ExcelUtil.exportExcel(list, "分布管理", EqAreaVo.class, response); + } + + /** + * 获取分布管理详细信息 + * + * @param areaId 主键 + */ + @SaCheckPermission("system:area:query") + @GetMapping("/{areaId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long areaId) { + return R.ok(eqAreaService.queryById(areaId)); + } + + /** + * 新增分布管理 + */ + @SaCheckPermission("system:area:add") + @Log(title = "分布管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqAreaBo bo) { + return toAjax(eqAreaService.insertByBo(bo)); + } + + /** + * 修改分布管理 + */ + @SaCheckPermission("system:area:edit") + @Log(title = "分布管理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqAreaBo bo) { + return toAjax(eqAreaService.updateByBo(bo)); + } + + /** + * 删除分布管理 + * + * @param areaIds 主键串 + */ + @SaCheckPermission("system:area:remove") + @Log(title = "分布管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{areaIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] areaIds) { + return toAjax(eqAreaService.deleteWithValidByIds(List.of(areaIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqAreaEquipmentController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqAreaEquipmentController.java new file mode 100644 index 000000000..6e4e7988b --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqAreaEquipmentController.java @@ -0,0 +1,105 @@ +package org.dromara.system.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.system.domain.vo.EqAreaEquipmentVo; +import org.dromara.system.domain.bo.EqAreaEquipmentBo; +import org.dromara.system.service.IEqAreaEquipmentService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 用户分布设备关联 + * + * @author Lion Li + * @date 2024-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/areaEquipment") +public class EqAreaEquipmentController extends BaseController { + + private final IEqAreaEquipmentService eqAreaEquipmentService; + + /** + * 查询用户分布设备关联列表 + */ + @SaCheckPermission("system:areaEquipment:list") + @GetMapping("/list") + public TableDataInfo list(EqAreaEquipmentBo bo, PageQuery pageQuery) { + return eqAreaEquipmentService.queryPageList(bo, pageQuery); + } + + /** + * 导出用户分布设备关联列表 + */ + @SaCheckPermission("system:areaEquipment:export") + @Log(title = "用户分布设备关联", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqAreaEquipmentBo bo, HttpServletResponse response) { + List list = eqAreaEquipmentService.queryList(bo); + ExcelUtil.exportExcel(list, "用户分布设备关联", EqAreaEquipmentVo.class, response); + } + + /** + * 获取用户分布设备关联详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("system:areaEquipment:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(eqAreaEquipmentService.queryById(id)); + } + + /** + * 新增用户分布设备关联 + */ + @SaCheckPermission("system:areaEquipment:add") + @Log(title = "用户分布设备关联", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqAreaEquipmentBo bo) { + return toAjax(eqAreaEquipmentService.insertByBo(bo)); + } + + /** + * 修改用户分布设备关联 + */ + @SaCheckPermission("system:areaEquipment:edit") + @Log(title = "用户分布设备关联", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqAreaEquipmentBo bo) { + return toAjax(eqAreaEquipmentService.updateByBo(bo)); + } + + /** + * 删除用户分布设备关联 + * + * @param ids 主键串 + */ + @SaCheckPermission("system:areaEquipment:remove") + @Log(title = "用户分布设备关联", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(eqAreaEquipmentService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqEquipmentController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqEquipmentController.java new file mode 100644 index 000000000..1ed8d9fbf --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqEquipmentController.java @@ -0,0 +1,105 @@ +package org.dromara.system.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.system.domain.vo.EqEquipmentVo; +import org.dromara.system.domain.bo.EqEquipmentBo; +import org.dromara.system.service.IEqEquipmentService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 设备信息 + * + * @author Lion Li + * @date 2024-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/equipment") +public class EqEquipmentController extends BaseController { + + private final IEqEquipmentService eqEquipmentService; + + /** + * 查询设备信息列表 + */ + @SaCheckPermission("system:equipment:list") + @GetMapping("/list") + public TableDataInfo list(EqEquipmentBo bo, PageQuery pageQuery) { + return eqEquipmentService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备信息列表 + */ + @SaCheckPermission("system:equipment:export") + @Log(title = "设备信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqEquipmentBo bo, HttpServletResponse response) { + List list = eqEquipmentService.queryList(bo); + ExcelUtil.exportExcel(list, "设备信息", EqEquipmentVo.class, response); + } + + /** + * 获取设备信息详细信息 + * + * @param equipmentId 主键 + */ + @SaCheckPermission("system:equipment:query") + @GetMapping("/{equipmentId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long equipmentId) { + return R.ok(eqEquipmentService.queryById(equipmentId)); + } + + /** + * 新增设备信息 + */ + @SaCheckPermission("system:equipment:add") + @Log(title = "设备信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqEquipmentBo bo) { + return toAjax(eqEquipmentService.insertByBo(bo)); + } + + /** + * 修改设备信息 + */ + @SaCheckPermission("system:equipment:edit") + @Log(title = "设备信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqEquipmentBo bo) { + return toAjax(eqEquipmentService.updateByBo(bo)); + } + + /** + * 删除设备信息 + * + * @param equipmentIds 主键串 + */ + @SaCheckPermission("system:equipment:remove") + @Log(title = "设备信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{equipmentIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] equipmentIds) { + return toAjax(eqEquipmentService.deleteWithValidByIds(List.of(equipmentIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqEquipmentLogController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqEquipmentLogController.java new file mode 100644 index 000000000..7fdfc32ce --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqEquipmentLogController.java @@ -0,0 +1,105 @@ +package org.dromara.system.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.system.domain.vo.EqEquipmentLogVo; +import org.dromara.system.domain.bo.EqEquipmentLogBo; +import org.dromara.system.service.IEqEquipmentLogService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 设备状态日志 + * + * @author Lion Li + * @date 2024-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/equipmentLog") +public class EqEquipmentLogController extends BaseController { + + private final IEqEquipmentLogService eqEquipmentLogService; + + /** + * 查询设备状态日志列表 + */ + @SaCheckPermission("system:equipmentLog:list") + @GetMapping("/list") + public TableDataInfo list(EqEquipmentLogBo bo, PageQuery pageQuery) { + return eqEquipmentLogService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备状态日志列表 + */ + @SaCheckPermission("system:equipmentLog:export") + @Log(title = "设备状态日志", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqEquipmentLogBo bo, HttpServletResponse response) { + List list = eqEquipmentLogService.queryList(bo); + ExcelUtil.exportExcel(list, "设备状态日志", EqEquipmentLogVo.class, response); + } + + /** + * 获取设备状态日志详细信息 + * + * @param logId 主键 + */ + @SaCheckPermission("system:equipmentLog:query") + @GetMapping("/{logId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long logId) { + return R.ok(eqEquipmentLogService.queryById(logId)); + } + + /** + * 新增设备状态日志 + */ + @SaCheckPermission("system:equipmentLog:add") + @Log(title = "设备状态日志", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqEquipmentLogBo bo) { + return toAjax(eqEquipmentLogService.insertByBo(bo)); + } + + /** + * 修改设备状态日志 + */ + @SaCheckPermission("system:equipmentLog:edit") + @Log(title = "设备状态日志", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqEquipmentLogBo bo) { + return toAjax(eqEquipmentLogService.updateByBo(bo)); + } + + /** + * 删除设备状态日志 + * + * @param logIds 主键串 + */ + @SaCheckPermission("system:equipmentLog:remove") + @Log(title = "设备状态日志", businessType = BusinessType.DELETE) + @DeleteMapping("/{logIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] logIds) { + return toAjax(eqEquipmentLogService.deleteWithValidByIds(List.of(logIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqFamilyController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqFamilyController.java new file mode 100644 index 000000000..fc41c6de3 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqFamilyController.java @@ -0,0 +1,105 @@ +package org.dromara.system.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.system.domain.vo.EqFamilyVo; +import org.dromara.system.domain.bo.EqFamilyBo; +import org.dromara.system.service.IEqFamilyService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/family") +public class EqFamilyController extends BaseController { + + private final IEqFamilyService eqFamilyService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("system:family:list") + @GetMapping("/list") + public TableDataInfo list(EqFamilyBo bo, PageQuery pageQuery) { + return eqFamilyService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("system:family:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqFamilyBo bo, HttpServletResponse response) { + List list = eqFamilyService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", EqFamilyVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param familyId 主键 + */ + @SaCheckPermission("system:family:query") + @GetMapping("/{familyId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long familyId) { + return R.ok(eqFamilyService.queryById(familyId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("system:family:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqFamilyBo bo) { + return toAjax(eqFamilyService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("system:family:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqFamilyBo bo) { + return toAjax(eqFamilyService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param familyIds 主键串 + */ + @SaCheckPermission("system:family:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{familyIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] familyIds) { + return toAjax(eqFamilyService.deleteWithValidByIds(List.of(familyIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqShareController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqShareController.java new file mode 100644 index 000000000..396619cd9 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqShareController.java @@ -0,0 +1,105 @@ +package org.dromara.system.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.system.domain.vo.EqShareVo; +import org.dromara.system.domain.bo.EqShareBo; +import org.dromara.system.service.IEqShareService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 分享 + * + * @author Lion Li + * @date 2024-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/share") +public class EqShareController extends BaseController { + + private final IEqShareService eqShareService; + + /** + * 查询分享列表 + */ + @SaCheckPermission("system:share:list") + @GetMapping("/list") + public TableDataInfo list(EqShareBo bo, PageQuery pageQuery) { + return eqShareService.queryPageList(bo, pageQuery); + } + + /** + * 导出分享列表 + */ + @SaCheckPermission("system:share:export") + @Log(title = "分享", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqShareBo bo, HttpServletResponse response) { + List list = eqShareService.queryList(bo); + ExcelUtil.exportExcel(list, "分享", EqShareVo.class, response); + } + + /** + * 获取分享详细信息 + * + * @param shareId 主键 + */ + @SaCheckPermission("system:share:query") + @GetMapping("/{shareId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long shareId) { + return R.ok(eqShareService.queryById(shareId)); + } + + /** + * 新增分享 + */ + @SaCheckPermission("system:share:add") + @Log(title = "分享", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqShareBo bo) { + return toAjax(eqShareService.insertByBo(bo)); + } + + /** + * 修改分享 + */ + @SaCheckPermission("system:share:edit") + @Log(title = "分享", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqShareBo bo) { + return toAjax(eqShareService.updateByBo(bo)); + } + + /** + * 删除分享 + * + * @param shareIds 主键串 + */ + @SaCheckPermission("system:share:remove") + @Log(title = "分享", businessType = BusinessType.DELETE) + @DeleteMapping("/{shareIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] shareIds) { + return toAjax(eqShareService.deleteWithValidByIds(List.of(shareIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqUserConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqUserConfigController.java new file mode 100644 index 000000000..f5dde870e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqUserConfigController.java @@ -0,0 +1,105 @@ +package org.dromara.system.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.system.domain.vo.EqUserConfigVo; +import org.dromara.system.domain.bo.EqUserConfigBo; +import org.dromara.system.service.IEqUserConfigService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 用户配置 + * + * @author Lion Li + * @date 2024-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/userConfig") +public class EqUserConfigController extends BaseController { + + private final IEqUserConfigService eqUserConfigService; + + /** + * 查询用户配置列表 + */ + @SaCheckPermission("system:userConfig:list") + @GetMapping("/list") + public TableDataInfo list(EqUserConfigBo bo, PageQuery pageQuery) { + return eqUserConfigService.queryPageList(bo, pageQuery); + } + + /** + * 导出用户配置列表 + */ + @SaCheckPermission("system:userConfig:export") + @Log(title = "用户配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqUserConfigBo bo, HttpServletResponse response) { + List list = eqUserConfigService.queryList(bo); + ExcelUtil.exportExcel(list, "用户配置", EqUserConfigVo.class, response); + } + + /** + * 获取用户配置详细信息 + * + * @param configId 主键 + */ + @SaCheckPermission("system:userConfig:query") + @GetMapping("/{configId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long configId) { + return R.ok(eqUserConfigService.queryById(configId)); + } + + /** + * 新增用户配置 + */ + @SaCheckPermission("system:userConfig:add") + @Log(title = "用户配置", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqUserConfigBo bo) { + return toAjax(eqUserConfigService.insertByBo(bo)); + } + + /** + * 修改用户配置 + */ + @SaCheckPermission("system:userConfig:edit") + @Log(title = "用户配置", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqUserConfigBo bo) { + return toAjax(eqUserConfigService.updateByBo(bo)); + } + + /** + * 删除用户配置 + * + * @param configIds 主键串 + */ + @SaCheckPermission("system:userConfig:remove") + @Log(title = "用户配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{configIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] configIds) { + return toAjax(eqUserConfigService.deleteWithValidByIds(List.of(configIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqArea.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqArea.java new file mode 100644 index 000000000..4838552a9 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqArea.java @@ -0,0 +1,46 @@ +package org.dromara.system.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 分布管理对象 eq_area + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eq_area") +public class EqArea extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "area_id") + private Long areaId; + + /** + * 用户ID + */ + private Long userId; + + /** + * 分布位置名称 + */ + private String areaName; + + /** + * 位置描述 + */ + private String description; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqAreaEquipment.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqAreaEquipment.java new file mode 100644 index 000000000..d816a74c4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqAreaEquipment.java @@ -0,0 +1,41 @@ +package org.dromara.system.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 用户分布设备关联对象 eq_area_equipment + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eq_area_equipment") +public class EqAreaEquipment extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 分布位置ID + */ + private Long areaId; + + /** + * 设备ID + */ + private Long equipmentId; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqEquipment.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqEquipment.java new file mode 100644 index 000000000..640e79ad9 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqEquipment.java @@ -0,0 +1,73 @@ +package org.dromara.system.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 设备信息对象 eq_equipment + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eq_equipment") +public class EqEquipment extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "equipment_id") + private Long equipmentId; + + /** + * 设备类型(0 卷帘门) + */ + private Integer type; + + /** + * 绑定账号，即登录账号 + */ + private String userName; + + /** + * 绑定人，即登录账号昵称 + */ + private String nickName; + + /** + * 设备编码，唯一 + */ + private String equipmentCode; + + /** + * 设备状态（1:开门停止 2:关门停止 3:开门故障停止 4:关门故障停止 5:开门故障反弹 6:关门故障反弹 ） + */ + private Integer status; + + /** + * 离线状态 + */ + private Integer lineStatus; + + /** + * 绑定时间 + */ + private Date bindTime; + + /** + * 操作次数 + */ + private Long operationCount; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqEquipmentLog.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqEquipmentLog.java new file mode 100644 index 000000000..7cef15066 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqEquipmentLog.java @@ -0,0 +1,63 @@ +package org.dromara.system.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 设备状态日志对象 eq_equipment_log + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eq_equipment_log") +public class EqEquipmentLog extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "log_id") + private Long logId; + + /** + * 设备ID + */ + private Long equipmentId; + + /** + * 创建时间（年月日时分秒） + */ + private Date createdDatetime; + + /** + * 创建年月日 + */ + private Date createdYearDay; + + /** + * 创建时分秒 + */ + private Date createdHourSecond; + + /** + * 状态 + */ + private Integer status; + + /** + * 星期几 + */ + private Integer dayOfWeek; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqFamily.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqFamily.java new file mode 100644 index 000000000..2210802b2 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqFamily.java @@ -0,0 +1,41 @@ +package org.dromara.system.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 eq_family + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eq_family") +public class EqFamily extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 家庭id + */ + @TableId(value = "family_id") + private Long familyId; + + /** + * 用户id + */ + private Long userId; + + /** + * 家庭名称 + */ + private String familyName; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqShare.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqShare.java new file mode 100644 index 000000000..d636bb885 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqShare.java @@ -0,0 +1,51 @@ +package org.dromara.system.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 分享对象 eq_share + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eq_share") +public class EqShare extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "share_id") + private Long shareId; + + /** + * 分享者用户ID + */ + private Long shareUserId; + + /** + * 分享者用户名称 + */ + private String shareUserName; + + /** + * 被分享者用户ID + */ + private Long sharedUserId; + + /** + * 被分享者用户名称 + */ + private String sharedUserName; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqUserConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqUserConfig.java new file mode 100644 index 000000000..5d059ebe6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqUserConfig.java @@ -0,0 +1,51 @@ +package org.dromara.system.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 用户配置对象 eq_user_config + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eq_user_config") +public class EqUserConfig extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "config_id") + private Long configId; + + /** + * 用户ID + */ + private Long userId; + + /** + * 时区类型 + */ + private Integer timezoneType; + + /** + * 时间格式 + */ + private Integer timeFormat; + + /** + * 语言种类 + */ + private Integer languageType; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAreaBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAreaBo.java new file mode 100644 index 000000000..933972b8f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAreaBo.java @@ -0,0 +1,48 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.EqArea; +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.*; + +/** + * 分布管理业务对象 eq_area + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EqArea.class, reverseConvertGenerate = false) +public class EqAreaBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long areaId; + + /** + * 用户ID + */ + @NotNull(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 分布位置名称 + */ + @NotBlank(message = "分布位置名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String areaName; + + /** + * 位置描述 + */ + @NotBlank(message = "位置描述不能为空", groups = { AddGroup.class, EditGroup.class }) + private String description; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAreaEquipmentBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAreaEquipmentBo.java new file mode 100644 index 000000000..bf7efff6b --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAreaEquipmentBo.java @@ -0,0 +1,42 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.EqAreaEquipment; +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.*; + +/** + * 用户分布设备关联业务对象 eq_area_equipment + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EqAreaEquipment.class, reverseConvertGenerate = false) +public class EqAreaEquipmentBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 分布位置ID + */ + @NotNull(message = "分布位置ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long areaId; + + /** + * 设备ID + */ + @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long equipmentId; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqEquipmentBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqEquipmentBo.java new file mode 100644 index 000000000..76e032926 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqEquipmentBo.java @@ -0,0 +1,80 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.EqEquipment; +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 java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 设备信息业务对象 eq_equipment + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EqEquipment.class, reverseConvertGenerate = false) +public class EqEquipmentBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long equipmentId; + + /** + * 设备类型(0 卷帘门) + */ + @NotNull(message = "设备类型(0 卷帘门)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer type; + + /** + * 绑定账号，即登录账号 + */ + @NotBlank(message = "绑定账号，即登录账号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userName; + + /** + * 绑定人，即登录账号昵称 + */ + @NotBlank(message = "绑定人，即登录账号昵称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String nickName; + + /** + * 设备编码，唯一 + */ + @NotBlank(message = "设备编码，唯一不能为空", groups = { AddGroup.class, EditGroup.class }) + private String equipmentCode; + + /** + * 设备状态（1:开门停止 2:关门停止 3:开门故障停止 4:关门故障停止 5:开门故障反弹 6:关门故障反弹 ） + */ + @NotNull(message = "设备状态（1:开门停止 2:关门停止 3:开门故障停止 4:关门故障停止 5:开门故障反弹 6:关门故障反弹 ）不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer status; + + /** + * 离线状态 + */ + @NotNull(message = "离线状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer lineStatus; + + /** + * 绑定时间 + */ + @NotNull(message = "绑定时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date bindTime; + + /** + * 操作次数 + */ + @NotNull(message = "操作次数不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long operationCount; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqEquipmentLogBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqEquipmentLogBo.java new file mode 100644 index 000000000..dda88bf9a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqEquipmentLogBo.java @@ -0,0 +1,68 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.EqEquipmentLog; +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 java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 设备状态日志业务对象 eq_equipment_log + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EqEquipmentLog.class, reverseConvertGenerate = false) +public class EqEquipmentLogBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long logId; + + /** + * 设备ID + */ + @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long equipmentId; + + /** + * 创建时间（年月日时分秒） + */ + @NotNull(message = "创建时间（年月日时分秒）不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date createdDatetime; + + /** + * 创建年月日 + */ + @NotNull(message = "创建年月日不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date createdYearDay; + + /** + * 创建时分秒 + */ + @NotNull(message = "创建时分秒不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date createdHourSecond; + + /** + * 状态 + */ + @NotNull(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer status; + + /** + * 星期几 + */ + @NotNull(message = "星期几不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer dayOfWeek; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqFamilyBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqFamilyBo.java new file mode 100644 index 000000000..3dff10027 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqFamilyBo.java @@ -0,0 +1,42 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.EqFamily; +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.*; + +/** + * 【请填写功能名称】业务对象 eq_family + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EqFamily.class, reverseConvertGenerate = false) +public class EqFamilyBo extends BaseEntity { + + /** + * 家庭id + */ + @NotNull(message = "家庭id不能为空", groups = { EditGroup.class }) + private Long familyId; + + /** + * 用户id + */ + @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 家庭名称 + */ + @NotBlank(message = "家庭名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String familyName; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqShareBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqShareBo.java new file mode 100644 index 000000000..53fcccac8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqShareBo.java @@ -0,0 +1,54 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.EqShare; +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.*; + +/** + * 分享业务对象 eq_share + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EqShare.class, reverseConvertGenerate = false) +public class EqShareBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long shareId; + + /** + * 分享者用户ID + */ + @NotNull(message = "分享者用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long shareUserId; + + /** + * 分享者用户名称 + */ + @NotBlank(message = "分享者用户名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shareUserName; + + /** + * 被分享者用户ID + */ + @NotNull(message = "被分享者用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long sharedUserId; + + /** + * 被分享者用户名称 + */ + @NotBlank(message = "被分享者用户名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String sharedUserName; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqUserConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqUserConfigBo.java new file mode 100644 index 000000000..9a3ed0509 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqUserConfigBo.java @@ -0,0 +1,54 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.EqUserConfig; +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.*; + +/** + * 用户配置业务对象 eq_user_config + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EqUserConfig.class, reverseConvertGenerate = false) +public class EqUserConfigBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long configId; + + /** + * 用户ID + */ + @NotNull(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 时区类型 + */ + @NotNull(message = "时区类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer timezoneType; + + /** + * 时间格式 + */ + @NotNull(message = "时间格式不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer timeFormat; + + /** + * 语言种类 + */ + @NotNull(message = "语言种类不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer languageType; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqAreaEquipmentVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqAreaEquipmentVo.java new file mode 100644 index 000000000..14a012bed --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqAreaEquipmentVo.java @@ -0,0 +1,50 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.EqAreaEquipment; +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; + + + +/** + * 用户分布设备关联视图对象 eq_area_equipment + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EqAreaEquipment.class) +public class EqAreaEquipmentVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 分布位置ID + */ + @ExcelProperty(value = "分布位置ID") + private Long areaId; + + /** + * 设备ID + */ + @ExcelProperty(value = "设备ID") + private Long equipmentId; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqAreaVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqAreaVo.java new file mode 100644 index 000000000..412c6bcf5 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqAreaVo.java @@ -0,0 +1,56 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.EqArea; +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; + + + +/** + * 分布管理视图对象 eq_area + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EqArea.class) +public class EqAreaVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long areaId; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private Long userId; + + /** + * 分布位置名称 + */ + @ExcelProperty(value = "分布位置名称") + private String areaName; + + /** + * 位置描述 + */ + @ExcelProperty(value = "位置描述") + private String description; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqEquipmentLogVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqEquipmentLogVo.java new file mode 100644 index 000000000..047ad9d31 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqEquipmentLogVo.java @@ -0,0 +1,79 @@ +package org.dromara.system.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.system.domain.EqEquipmentLog; +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; + + + +/** + * 设备状态日志视图对象 eq_equipment_log + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EqEquipmentLog.class) +public class EqEquipmentLogVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long logId; + + /** + * 设备ID + */ + @ExcelProperty(value = "设备ID") + private Long equipmentId; + + /** + * 创建时间（年月日时分秒） + */ + @ExcelProperty(value = "创建时间", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "年=月日时分秒") + private Date createdDatetime; + + /** + * 创建年月日 + */ + @ExcelProperty(value = "创建年月日") + private Date createdYearDay; + + /** + * 创建时分秒 + */ + @ExcelProperty(value = "创建时分秒") + private Date createdHourSecond; + + /** + * 状态 + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_status_type") + private Integer status; + + /** + * 星期几 + */ + @ExcelProperty(value = "星期几", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_week_type") + private Integer dayOfWeek; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqEquipmentVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqEquipmentVo.java new file mode 100644 index 000000000..ccd27952f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqEquipmentVo.java @@ -0,0 +1,91 @@ +package org.dromara.system.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.system.domain.EqEquipment; +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; + + + +/** + * 设备信息视图对象 eq_equipment + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EqEquipment.class) +public class EqEquipmentVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long equipmentId; + + /** + * 设备类型(0 卷帘门) + */ + @ExcelProperty(value = "设备类型(0 卷帘门)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_equipment_type") + private Integer type; + + /** + * 绑定账号，即登录账号 + */ + @ExcelProperty(value = "绑定账号，即登录账号") + private String userName; + + /** + * 绑定人，即登录账号昵称 + */ + @ExcelProperty(value = "绑定人，即登录账号昵称") + private String nickName; + + /** + * 设备编码，唯一 + */ + @ExcelProperty(value = "设备编码，唯一") + private String equipmentCode; + + /** + * 设备状态（1:开门停止 2:关门停止 3:开门故障停止 4:关门故障停止 5:开门故障反弹 6:关门故障反弹 ） + */ + @ExcelProperty(value = "设备状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_status_type") + private Integer status; + + /** + * 离线状态 + */ + @ExcelProperty(value = "离线状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_line_status") + private Integer lineStatus; + + /** + * 绑定时间 + */ + @ExcelProperty(value = "绑定时间") + private Date bindTime; + + /** + * 操作次数 + */ + @ExcelProperty(value = "操作次数") + private Long operationCount; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqFamilyVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqFamilyVo.java new file mode 100644 index 000000000..6ff86192a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqFamilyVo.java @@ -0,0 +1,50 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.EqFamily; +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; + + + +/** + * 【请填写功能名称】视图对象 eq_family + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EqFamily.class) +public class EqFamilyVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 家庭id + */ + @ExcelProperty(value = "家庭id") + private Long familyId; + + /** + * 用户id + */ + @ExcelProperty(value = "用户id") + private Long userId; + + /** + * 家庭名称 + */ + @ExcelProperty(value = "家庭名称") + private String familyName; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqShareVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqShareVo.java new file mode 100644 index 000000000..0f74152d0 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqShareVo.java @@ -0,0 +1,62 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.EqShare; +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; + + + +/** + * 分享视图对象 eq_share + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EqShare.class) +public class EqShareVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long shareId; + + /** + * 分享者用户ID + */ + @ExcelProperty(value = "分享者用户ID") + private Long shareUserId; + + /** + * 分享者用户名称 + */ + @ExcelProperty(value = "分享者用户名称") + private String shareUserName; + + /** + * 被分享者用户ID + */ + @ExcelProperty(value = "被分享者用户ID") + private Long sharedUserId; + + /** + * 被分享者用户名称 + */ + @ExcelProperty(value = "被分享者用户名称") + private String sharedUserName; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqUserConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqUserConfigVo.java new file mode 100644 index 000000000..4d0222ea1 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqUserConfigVo.java @@ -0,0 +1,62 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.EqUserConfig; +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; + + + +/** + * 用户配置视图对象 eq_user_config + * + * @author Lion Li + * @date 2024-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EqUserConfig.class) +public class EqUserConfigVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long configId; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private Long userId; + + /** + * 时区类型 + */ + @ExcelProperty(value = "时区类型") + private Integer timezoneType; + + /** + * 时间格式 + */ + @ExcelProperty(value = "时间格式") + private Integer timeFormat; + + /** + * 语言种类 + */ + @ExcelProperty(value = "语言种类") + private Integer languageType; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqAreaEquipmentMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqAreaEquipmentMapper.java new file mode 100644 index 000000000..e27b40859 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqAreaEquipmentMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.EqAreaEquipment; +import org.dromara.system.domain.vo.EqAreaEquipmentVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 用户分布设备关联Mapper接口 + * + * @author Lion Li + * @date 2024-07-14 + */ +public interface EqAreaEquipmentMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqAreaMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqAreaMapper.java new file mode 100644 index 000000000..81f59302e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqAreaMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.EqArea; +import org.dromara.system.domain.vo.EqAreaVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 分布管理Mapper接口 + * + * @author Lion Li + * @date 2024-07-14 + */ +public interface EqAreaMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqEquipmentLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqEquipmentLogMapper.java new file mode 100644 index 000000000..ab5d1b003 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqEquipmentLogMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.EqEquipmentLog; +import org.dromara.system.domain.vo.EqEquipmentLogVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备状态日志Mapper接口 + * + * @author Lion Li + * @date 2024-07-14 + */ +public interface EqEquipmentLogMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqEquipmentMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqEquipmentMapper.java new file mode 100644 index 000000000..1ff1bdf5b --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqEquipmentMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.EqEquipment; +import org.dromara.system.domain.vo.EqEquipmentVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备信息Mapper接口 + * + * @author Lion Li + * @date 2024-07-14 + */ +public interface EqEquipmentMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqFamilyMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqFamilyMapper.java new file mode 100644 index 000000000..a46153177 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqFamilyMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.EqFamily; +import org.dromara.system.domain.vo.EqFamilyVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-14 + */ +public interface EqFamilyMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqShareMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqShareMapper.java new file mode 100644 index 000000000..ac56be82d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqShareMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.EqShare; +import org.dromara.system.domain.vo.EqShareVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 分享Mapper接口 + * + * @author Lion Li + * @date 2024-07-14 + */ +public interface EqShareMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqUserConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqUserConfigMapper.java new file mode 100644 index 000000000..2c3caa086 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqUserConfigMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.EqUserConfig; +import org.dromara.system.domain.vo.EqUserConfigVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 用户配置Mapper接口 + * + * @author Lion Li + * @date 2024-07-14 + */ +public interface EqUserConfigMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqAreaEquipmentService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqAreaEquipmentService.java new file mode 100644 index 000000000..35ba2bd91 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqAreaEquipmentService.java @@ -0,0 +1,68 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.vo.EqAreaEquipmentVo; +import org.dromara.system.domain.bo.EqAreaEquipmentBo; +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 Lion Li + * @date 2024-07-14 + */ +public interface IEqAreaEquipmentService { + + /** + * 查询用户分布设备关联 + * + * @param id 主键 + * @return 用户分布设备关联 + */ + EqAreaEquipmentVo queryById(Long id); + + /** + * 分页查询用户分布设备关联列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户分布设备关联分页列表 + */ + TableDataInfo queryPageList(EqAreaEquipmentBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的用户分布设备关联列表 + * + * @param bo 查询条件 + * @return 用户分布设备关联列表 + */ + List queryList(EqAreaEquipmentBo bo); + + /** + * 新增用户分布设备关联 + * + * @param bo 用户分布设备关联 + * @return 是否新增成功 + */ + Boolean insertByBo(EqAreaEquipmentBo bo); + + /** + * 修改用户分布设备关联 + * + * @param bo 用户分布设备关联 + * @return 是否修改成功 + */ + Boolean updateByBo(EqAreaEquipmentBo bo); + + /** + * 校验并批量删除用户分布设备关联信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqAreaService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqAreaService.java new file mode 100644 index 000000000..3990599e4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqAreaService.java @@ -0,0 +1,68 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.vo.EqAreaVo; +import org.dromara.system.domain.bo.EqAreaBo; +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 Lion Li + * @date 2024-07-14 + */ +public interface IEqAreaService { + + /** + * 查询分布管理 + * + * @param areaId 主键 + * @return 分布管理 + */ + EqAreaVo queryById(Long areaId); + + /** + * 分页查询分布管理列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 分布管理分页列表 + */ + TableDataInfo queryPageList(EqAreaBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的分布管理列表 + * + * @param bo 查询条件 + * @return 分布管理列表 + */ + List queryList(EqAreaBo bo); + + /** + * 新增分布管理 + * + * @param bo 分布管理 + * @return 是否新增成功 + */ + Boolean insertByBo(EqAreaBo bo); + + /** + * 修改分布管理 + * + * @param bo 分布管理 + * @return 是否修改成功 + */ + Boolean updateByBo(EqAreaBo bo); + + /** + * 校验并批量删除分布管理信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqEquipmentLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqEquipmentLogService.java new file mode 100644 index 000000000..81ce9c571 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqEquipmentLogService.java @@ -0,0 +1,68 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.vo.EqEquipmentLogVo; +import org.dromara.system.domain.bo.EqEquipmentLogBo; +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 Lion Li + * @date 2024-07-14 + */ +public interface IEqEquipmentLogService { + + /** + * 查询设备状态日志 + * + * @param logId 主键 + * @return 设备状态日志 + */ + EqEquipmentLogVo queryById(Long logId); + + /** + * 分页查询设备状态日志列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备状态日志分页列表 + */ + TableDataInfo queryPageList(EqEquipmentLogBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备状态日志列表 + * + * @param bo 查询条件 + * @return 设备状态日志列表 + */ + List queryList(EqEquipmentLogBo bo); + + /** + * 新增设备状态日志 + * + * @param bo 设备状态日志 + * @return 是否新增成功 + */ + Boolean insertByBo(EqEquipmentLogBo bo); + + /** + * 修改设备状态日志 + * + * @param bo 设备状态日志 + * @return 是否修改成功 + */ + Boolean updateByBo(EqEquipmentLogBo bo); + + /** + * 校验并批量删除设备状态日志信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqEquipmentService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqEquipmentService.java new file mode 100644 index 000000000..b6cd740e5 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqEquipmentService.java @@ -0,0 +1,68 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.vo.EqEquipmentVo; +import org.dromara.system.domain.bo.EqEquipmentBo; +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 Lion Li + * @date 2024-07-14 + */ +public interface IEqEquipmentService { + + /** + * 查询设备信息 + * + * @param equipmentId 主键 + * @return 设备信息 + */ + EqEquipmentVo queryById(Long equipmentId); + + /** + * 分页查询设备信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备信息分页列表 + */ + TableDataInfo queryPageList(EqEquipmentBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备信息列表 + * + * @param bo 查询条件 + * @return 设备信息列表 + */ + List queryList(EqEquipmentBo bo); + + /** + * 新增设备信息 + * + * @param bo 设备信息 + * @return 是否新增成功 + */ + Boolean insertByBo(EqEquipmentBo bo); + + /** + * 修改设备信息 + * + * @param bo 设备信息 + * @return 是否修改成功 + */ + Boolean updateByBo(EqEquipmentBo bo); + + /** + * 校验并批量删除设备信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqFamilyService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqFamilyService.java new file mode 100644 index 000000000..79f4db086 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqFamilyService.java @@ -0,0 +1,68 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.vo.EqFamilyVo; +import org.dromara.system.domain.bo.EqFamilyBo; +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 Lion Li + * @date 2024-07-14 + */ +public interface IEqFamilyService { + + /** + * 查询【请填写功能名称】 + * + * @param familyId 主键 + * @return 【请填写功能名称】 + */ + EqFamilyVo queryById(Long familyId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(EqFamilyBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(EqFamilyBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(EqFamilyBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(EqFamilyBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqShareService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqShareService.java new file mode 100644 index 000000000..a013381e6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqShareService.java @@ -0,0 +1,68 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.vo.EqShareVo; +import org.dromara.system.domain.bo.EqShareBo; +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 Lion Li + * @date 2024-07-14 + */ +public interface IEqShareService { + + /** + * 查询分享 + * + * @param shareId 主键 + * @return 分享 + */ + EqShareVo queryById(Long shareId); + + /** + * 分页查询分享列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 分享分页列表 + */ + TableDataInfo queryPageList(EqShareBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的分享列表 + * + * @param bo 查询条件 + * @return 分享列表 + */ + List queryList(EqShareBo bo); + + /** + * 新增分享 + * + * @param bo 分享 + * @return 是否新增成功 + */ + Boolean insertByBo(EqShareBo bo); + + /** + * 修改分享 + * + * @param bo 分享 + * @return 是否修改成功 + */ + Boolean updateByBo(EqShareBo bo); + + /** + * 校验并批量删除分享信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqUserConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqUserConfigService.java new file mode 100644 index 000000000..02420bec8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqUserConfigService.java @@ -0,0 +1,68 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.vo.EqUserConfigVo; +import org.dromara.system.domain.bo.EqUserConfigBo; +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 Lion Li + * @date 2024-07-14 + */ +public interface IEqUserConfigService { + + /** + * 查询用户配置 + * + * @param configId 主键 + * @return 用户配置 + */ + EqUserConfigVo queryById(Long configId); + + /** + * 分页查询用户配置列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户配置分页列表 + */ + TableDataInfo queryPageList(EqUserConfigBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的用户配置列表 + * + * @param bo 查询条件 + * @return 用户配置列表 + */ + List queryList(EqUserConfigBo bo); + + /** + * 新增用户配置 + * + * @param bo 用户配置 + * @return 是否新增成功 + */ + Boolean insertByBo(EqUserConfigBo bo); + + /** + * 修改用户配置 + * + * @param bo 用户配置 + * @return 是否修改成功 + */ + Boolean updateByBo(EqUserConfigBo bo); + + /** + * 校验并批量删除用户配置信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqAreaEquipmentServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqAreaEquipmentServiceImpl.java new file mode 100644 index 000000000..1b9340be8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqAreaEquipmentServiceImpl.java @@ -0,0 +1,130 @@ +package org.dromara.system.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 org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.EqAreaEquipmentBo; +import org.dromara.system.domain.vo.EqAreaEquipmentVo; +import org.dromara.system.domain.EqAreaEquipment; +import org.dromara.system.mapper.EqAreaEquipmentMapper; +import org.dromara.system.service.IEqAreaEquipmentService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 用户分布设备关联Service业务层处理 + * + * @author Lion Li + * @date 2024-07-14 + */ +@RequiredArgsConstructor +@Service +public class EqAreaEquipmentServiceImpl implements IEqAreaEquipmentService { + + private final EqAreaEquipmentMapper baseMapper; + + /** + * 查询用户分布设备关联 + * + * @param id 主键 + * @return 用户分布设备关联 + */ + @Override + public EqAreaEquipmentVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询用户分布设备关联列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户分布设备关联分页列表 + */ + @Override + public TableDataInfo queryPageList(EqAreaEquipmentBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的用户分布设备关联列表 + * + * @param bo 查询条件 + * @return 用户分布设备关联列表 + */ + @Override + public List queryList(EqAreaEquipmentBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqAreaEquipmentBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getAreaId() != null, EqAreaEquipment::getAreaId, bo.getAreaId()); + lqw.eq(bo.getEquipmentId() != null, EqAreaEquipment::getEquipmentId, bo.getEquipmentId()); + return lqw; + } + + /** + * 新增用户分布设备关联 + * + * @param bo 用户分布设备关联 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EqAreaEquipmentBo bo) { + EqAreaEquipment add = MapstructUtils.convert(bo, EqAreaEquipment.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改用户分布设备关联 + * + * @param bo 用户分布设备关联 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EqAreaEquipmentBo bo) { + EqAreaEquipment update = MapstructUtils.convert(bo, EqAreaEquipment.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqAreaEquipment 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/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqAreaServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqAreaServiceImpl.java new file mode 100644 index 000000000..a46f57e46 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqAreaServiceImpl.java @@ -0,0 +1,131 @@ +package org.dromara.system.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 org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.EqAreaBo; +import org.dromara.system.domain.vo.EqAreaVo; +import org.dromara.system.domain.EqArea; +import org.dromara.system.mapper.EqAreaMapper; +import org.dromara.system.service.IEqAreaService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 分布管理Service业务层处理 + * + * @author Lion Li + * @date 2024-07-14 + */ +@RequiredArgsConstructor +@Service +public class EqAreaServiceImpl implements IEqAreaService { + + private final EqAreaMapper baseMapper; + + /** + * 查询分布管理 + * + * @param areaId 主键 + * @return 分布管理 + */ + @Override + public EqAreaVo queryById(Long areaId){ + return baseMapper.selectVoById(areaId); + } + + /** + * 分页查询分布管理列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 分布管理分页列表 + */ + @Override + public TableDataInfo queryPageList(EqAreaBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的分布管理列表 + * + * @param bo 查询条件 + * @return 分布管理列表 + */ + @Override + public List queryList(EqAreaBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqAreaBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, EqArea::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getAreaName()), EqArea::getAreaName, bo.getAreaName()); + lqw.eq(StringUtils.isNotBlank(bo.getDescription()), EqArea::getDescription, bo.getDescription()); + return lqw; + } + + /** + * 新增分布管理 + * + * @param bo 分布管理 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EqAreaBo bo) { + EqArea add = MapstructUtils.convert(bo, EqArea.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setAreaId(add.getAreaId()); + } + return flag; + } + + /** + * 修改分布管理 + * + * @param bo 分布管理 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EqAreaBo bo) { + EqArea update = MapstructUtils.convert(bo, EqArea.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqArea 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/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentLogServiceImpl.java new file mode 100644 index 000000000..369261b06 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentLogServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.system.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 org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.EqEquipmentLogBo; +import org.dromara.system.domain.vo.EqEquipmentLogVo; +import org.dromara.system.domain.EqEquipmentLog; +import org.dromara.system.mapper.EqEquipmentLogMapper; +import org.dromara.system.service.IEqEquipmentLogService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备状态日志Service业务层处理 + * + * @author Lion Li + * @date 2024-07-14 + */ +@RequiredArgsConstructor +@Service +public class EqEquipmentLogServiceImpl implements IEqEquipmentLogService { + + private final EqEquipmentLogMapper baseMapper; + + /** + * 查询设备状态日志 + * + * @param logId 主键 + * @return 设备状态日志 + */ + @Override + public EqEquipmentLogVo queryById(Long logId){ + return baseMapper.selectVoById(logId); + } + + /** + * 分页查询设备状态日志列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备状态日志分页列表 + */ + @Override + public TableDataInfo queryPageList(EqEquipmentLogBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设备状态日志列表 + * + * @param bo 查询条件 + * @return 设备状态日志列表 + */ + @Override + public List queryList(EqEquipmentLogBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqEquipmentLogBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getEquipmentId() != null, EqEquipmentLog::getEquipmentId, bo.getEquipmentId()); + lqw.eq(bo.getCreatedDatetime() != null, EqEquipmentLog::getCreatedDatetime, bo.getCreatedDatetime()); + lqw.eq(bo.getCreatedYearDay() != null, EqEquipmentLog::getCreatedYearDay, bo.getCreatedYearDay()); + lqw.eq(bo.getCreatedHourSecond() != null, EqEquipmentLog::getCreatedHourSecond, bo.getCreatedHourSecond()); + lqw.eq(bo.getStatus() != null, EqEquipmentLog::getStatus, bo.getStatus()); + lqw.eq(bo.getDayOfWeek() != null, EqEquipmentLog::getDayOfWeek, bo.getDayOfWeek()); + return lqw; + } + + /** + * 新增设备状态日志 + * + * @param bo 设备状态日志 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EqEquipmentLogBo bo) { + EqEquipmentLog add = MapstructUtils.convert(bo, EqEquipmentLog.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setLogId(add.getLogId()); + } + return flag; + } + + /** + * 修改设备状态日志 + * + * @param bo 设备状态日志 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EqEquipmentLogBo bo) { + EqEquipmentLog update = MapstructUtils.convert(bo, EqEquipmentLog.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqEquipmentLog 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/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentServiceImpl.java new file mode 100644 index 000000000..27f594b69 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.system.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 org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.EqEquipmentBo; +import org.dromara.system.domain.vo.EqEquipmentVo; +import org.dromara.system.domain.EqEquipment; +import org.dromara.system.mapper.EqEquipmentMapper; +import org.dromara.system.service.IEqEquipmentService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备信息Service业务层处理 + * + * @author Lion Li + * @date 2024-07-14 + */ +@RequiredArgsConstructor +@Service +public class EqEquipmentServiceImpl implements IEqEquipmentService { + + private final EqEquipmentMapper baseMapper; + + /** + * 查询设备信息 + * + * @param equipmentId 主键 + * @return 设备信息 + */ + @Override + public EqEquipmentVo queryById(Long equipmentId){ + return baseMapper.selectVoById(equipmentId); + } + + /** + * 分页查询设备信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备信息分页列表 + */ + @Override + public TableDataInfo queryPageList(EqEquipmentBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设备信息列表 + * + * @param bo 查询条件 + * @return 设备信息列表 + */ + @Override + public List queryList(EqEquipmentBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqEquipmentBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getType() != null, EqEquipment::getType, bo.getType()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), EqEquipment::getUserName, bo.getUserName()); + lqw.like(StringUtils.isNotBlank(bo.getNickName()), EqEquipment::getNickName, bo.getNickName()); + lqw.like(StringUtils.isNotBlank(bo.getEquipmentCode()), EqEquipment::getEquipmentCode, bo.getEquipmentCode()); + lqw.eq(bo.getStatus() != null, EqEquipment::getStatus, bo.getStatus()); + lqw.eq(bo.getLineStatus() != null, EqEquipment::getLineStatus, bo.getLineStatus()); + return lqw; + } + + /** + * 新增设备信息 + * + * @param bo 设备信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EqEquipmentBo bo) { + EqEquipment add = MapstructUtils.convert(bo, EqEquipment.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setEquipmentId(add.getEquipmentId()); + } + return flag; + } + + /** + * 修改设备信息 + * + * @param bo 设备信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EqEquipmentBo bo) { + EqEquipment update = MapstructUtils.convert(bo, EqEquipment.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqEquipment 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/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqFamilyServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqFamilyServiceImpl.java new file mode 100644 index 000000000..bae87f982 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqFamilyServiceImpl.java @@ -0,0 +1,130 @@ +package org.dromara.system.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 org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.EqFamilyBo; +import org.dromara.system.domain.vo.EqFamilyVo; +import org.dromara.system.domain.EqFamily; +import org.dromara.system.mapper.EqFamilyMapper; +import org.dromara.system.service.IEqFamilyService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-14 + */ +@RequiredArgsConstructor +@Service +public class EqFamilyServiceImpl implements IEqFamilyService { + + private final EqFamilyMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param familyId 主键 + * @return 【请填写功能名称】 + */ + @Override + public EqFamilyVo queryById(Long familyId){ + return baseMapper.selectVoById(familyId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(EqFamilyBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(EqFamilyBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqFamilyBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, EqFamily::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getFamilyName()), EqFamily::getFamilyName, bo.getFamilyName()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EqFamilyBo bo) { + EqFamily add = MapstructUtils.convert(bo, EqFamily.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setFamilyId(add.getFamilyId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EqFamilyBo bo) { + EqFamily update = MapstructUtils.convert(bo, EqFamily.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqFamily 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/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqShareServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqShareServiceImpl.java new file mode 100644 index 000000000..b0de1f91d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqShareServiceImpl.java @@ -0,0 +1,132 @@ +package org.dromara.system.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 org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.EqShareBo; +import org.dromara.system.domain.vo.EqShareVo; +import org.dromara.system.domain.EqShare; +import org.dromara.system.mapper.EqShareMapper; +import org.dromara.system.service.IEqShareService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 分享Service业务层处理 + * + * @author Lion Li + * @date 2024-07-14 + */ +@RequiredArgsConstructor +@Service +public class EqShareServiceImpl implements IEqShareService { + + private final EqShareMapper baseMapper; + + /** + * 查询分享 + * + * @param shareId 主键 + * @return 分享 + */ + @Override + public EqShareVo queryById(Long shareId){ + return baseMapper.selectVoById(shareId); + } + + /** + * 分页查询分享列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 分享分页列表 + */ + @Override + public TableDataInfo queryPageList(EqShareBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的分享列表 + * + * @param bo 查询条件 + * @return 分享列表 + */ + @Override + public List queryList(EqShareBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqShareBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getShareUserId() != null, EqShare::getShareUserId, bo.getShareUserId()); + lqw.like(StringUtils.isNotBlank(bo.getShareUserName()), EqShare::getShareUserName, bo.getShareUserName()); + lqw.eq(bo.getSharedUserId() != null, EqShare::getSharedUserId, bo.getSharedUserId()); + lqw.like(StringUtils.isNotBlank(bo.getSharedUserName()), EqShare::getSharedUserName, bo.getSharedUserName()); + return lqw; + } + + /** + * 新增分享 + * + * @param bo 分享 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EqShareBo bo) { + EqShare add = MapstructUtils.convert(bo, EqShare.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setShareId(add.getShareId()); + } + return flag; + } + + /** + * 修改分享 + * + * @param bo 分享 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EqShareBo bo) { + EqShare update = MapstructUtils.convert(bo, EqShare.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqShare 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/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqUserConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqUserConfigServiceImpl.java new file mode 100644 index 000000000..f5e2c3321 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqUserConfigServiceImpl.java @@ -0,0 +1,132 @@ +package org.dromara.system.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 org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.EqUserConfigBo; +import org.dromara.system.domain.vo.EqUserConfigVo; +import org.dromara.system.domain.EqUserConfig; +import org.dromara.system.mapper.EqUserConfigMapper; +import org.dromara.system.service.IEqUserConfigService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 用户配置Service业务层处理 + * + * @author Lion Li + * @date 2024-07-14 + */ +@RequiredArgsConstructor +@Service +public class EqUserConfigServiceImpl implements IEqUserConfigService { + + private final EqUserConfigMapper baseMapper; + + /** + * 查询用户配置 + * + * @param configId 主键 + * @return 用户配置 + */ + @Override + public EqUserConfigVo queryById(Long configId){ + return baseMapper.selectVoById(configId); + } + + /** + * 分页查询用户配置列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户配置分页列表 + */ + @Override + public TableDataInfo queryPageList(EqUserConfigBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的用户配置列表 + * + * @param bo 查询条件 + * @return 用户配置列表 + */ + @Override + public List queryList(EqUserConfigBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqUserConfigBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, EqUserConfig::getUserId, bo.getUserId()); + lqw.eq(bo.getTimezoneType() != null, EqUserConfig::getTimezoneType, bo.getTimezoneType()); + lqw.eq(bo.getTimeFormat() != null, EqUserConfig::getTimeFormat, bo.getTimeFormat()); + lqw.eq(bo.getLanguageType() != null, EqUserConfig::getLanguageType, bo.getLanguageType()); + return lqw; + } + + /** + * 新增用户配置 + * + * @param bo 用户配置 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EqUserConfigBo bo) { + EqUserConfig add = MapstructUtils.convert(bo, EqUserConfig.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setConfigId(add.getConfigId()); + } + return flag; + } + + /** + * 修改用户配置 + * + * @param bo 用户配置 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EqUserConfigBo bo) { + EqUserConfig update = MapstructUtils.convert(bo, EqUserConfig.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqUserConfig 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/ruoyi-system/src/main/resources/mapper/EqAreaEquipmentMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaEquipmentMapper.xml new file mode 100644 index 000000000..f8b0a6c6f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaEquipmentMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaMapper.xml new file mode 100644 index 000000000..9ad13eb4f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqEquipmentLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqEquipmentLogMapper.xml new file mode 100644 index 000000000..03fbe471a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqEquipmentLogMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqEquipmentMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqEquipmentMapper.xml new file mode 100644 index 000000000..0fad8aa9a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqEquipmentMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqFamilyMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqFamilyMapper.xml new file mode 100644 index 000000000..a7590e292 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqFamilyMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqShareMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqShareMapper.xml new file mode 100644 index 000000000..02bacbe5c --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqShareMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqUserConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqUserConfigMapper.xml new file mode 100644 index 000000000..6186cac25 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqUserConfigMapper.xml @@ -0,0 +1,7 @@ + + + + +