diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqAreaController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/EqAreaController.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqAreaController.java rename to ruoyi-admin/src/main/java/org/dromara/web/controller/EqAreaController.java index 70753c25a..2e9da25ef 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqAreaController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/EqAreaController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller; +package org.dromara.web.controller; import java.util.List; @@ -17,21 +17,21 @@ 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.web.domain.vo.EqAreaVo; +import org.dromara.web.domain.bo.EqAreaBo; +import org.dromara.web.service.IEqAreaService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** * 分布管理 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/area") +@RequestMapping("/device/area") public class EqAreaController extends BaseController { private final IEqAreaService eqAreaService; @@ -39,7 +39,7 @@ public class EqAreaController extends BaseController { /** * 查询分布管理列表 */ - @SaCheckPermission("system:area:list") + @SaCheckPermission("device:area:list") @GetMapping("/list") public TableDataInfo list(EqAreaBo bo, PageQuery pageQuery) { return eqAreaService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class EqAreaController extends BaseController { /** * 导出分布管理列表 */ - @SaCheckPermission("system:area:export") + @SaCheckPermission("device:area:export") @Log(title = "分布管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(EqAreaBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class EqAreaController extends BaseController { * * @param areaId 主键 */ - @SaCheckPermission("system:area:query") + @SaCheckPermission("device:area:query") @GetMapping("/{areaId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long areaId) { @@ -71,7 +71,7 @@ public class EqAreaController extends BaseController { /** * 新增分布管理 */ - @SaCheckPermission("system:area:add") + @SaCheckPermission("device:area:add") @Log(title = "分布管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class EqAreaController extends BaseController { /** * 修改分布管理 */ - @SaCheckPermission("system:area:edit") + @SaCheckPermission("device:area:edit") @Log(title = "分布管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class EqAreaController extends BaseController { * * @param areaIds 主键串 */ - @SaCheckPermission("system:area:remove") + @SaCheckPermission("device:area:remove") @Log(title = "分布管理", businessType = BusinessType.DELETE) @DeleteMapping("/{areaIds}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqEquipmentController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/EqEquipmentController.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqEquipmentController.java rename to ruoyi-admin/src/main/java/org/dromara/web/controller/EqEquipmentController.java index 1ed8d9fbf..313c5ee70 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqEquipmentController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/EqEquipmentController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller; +package org.dromara.web.controller; import java.util.List; @@ -17,21 +17,21 @@ 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.web.domain.vo.EqEquipmentVo; +import org.dromara.web.domain.bo.EqEquipmentBo; +import org.dromara.web.service.IEqEquipmentService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** * 设备信息 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/equipment") +@RequestMapping("/device/equipment") public class EqEquipmentController extends BaseController { private final IEqEquipmentService eqEquipmentService; @@ -39,7 +39,7 @@ public class EqEquipmentController extends BaseController { /** * 查询设备信息列表 */ - @SaCheckPermission("system:equipment:list") + @SaCheckPermission("device:equipment:list") @GetMapping("/list") public TableDataInfo list(EqEquipmentBo bo, PageQuery pageQuery) { return eqEquipmentService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class EqEquipmentController extends BaseController { /** * 导出设备信息列表 */ - @SaCheckPermission("system:equipment:export") + @SaCheckPermission("device:equipment:export") @Log(title = "设备信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(EqEquipmentBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class EqEquipmentController extends BaseController { * * @param equipmentId 主键 */ - @SaCheckPermission("system:equipment:query") + @SaCheckPermission("device:equipment:query") @GetMapping("/{equipmentId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long equipmentId) { @@ -71,7 +71,7 @@ public class EqEquipmentController extends BaseController { /** * 新增设备信息 */ - @SaCheckPermission("system:equipment:add") + @SaCheckPermission("device:equipment:add") @Log(title = "设备信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class EqEquipmentController extends BaseController { /** * 修改设备信息 */ - @SaCheckPermission("system:equipment:edit") + @SaCheckPermission("device:equipment:edit") @Log(title = "设备信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class EqEquipmentController extends BaseController { * * @param equipmentIds 主键串 */ - @SaCheckPermission("system:equipment:remove") + @SaCheckPermission("device:equipment:remove") @Log(title = "设备信息", businessType = BusinessType.DELETE) @DeleteMapping("/{equipmentIds}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqEquipmentLogController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/EqEquipmentLogController.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqEquipmentLogController.java rename to ruoyi-admin/src/main/java/org/dromara/web/controller/EqEquipmentLogController.java index 7fdfc32ce..763e55359 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqEquipmentLogController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/EqEquipmentLogController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller; +package org.dromara.web.controller; import java.util.List; @@ -17,21 +17,21 @@ 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.web.domain.vo.EqEquipmentLogVo; +import org.dromara.web.domain.bo.EqEquipmentLogBo; +import org.dromara.web.service.IEqEquipmentLogService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** * 设备状态日志 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/equipmentLog") +@RequestMapping("/device/equipmentLog") public class EqEquipmentLogController extends BaseController { private final IEqEquipmentLogService eqEquipmentLogService; @@ -39,7 +39,7 @@ public class EqEquipmentLogController extends BaseController { /** * 查询设备状态日志列表 */ - @SaCheckPermission("system:equipmentLog:list") + @SaCheckPermission("device:equipmentLog:list") @GetMapping("/list") public TableDataInfo list(EqEquipmentLogBo bo, PageQuery pageQuery) { return eqEquipmentLogService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class EqEquipmentLogController extends BaseController { /** * 导出设备状态日志列表 */ - @SaCheckPermission("system:equipmentLog:export") + @SaCheckPermission("device:equipmentLog:export") @Log(title = "设备状态日志", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(EqEquipmentLogBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class EqEquipmentLogController extends BaseController { * * @param logId 主键 */ - @SaCheckPermission("system:equipmentLog:query") + @SaCheckPermission("device:equipmentLog:query") @GetMapping("/{logId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long logId) { @@ -71,7 +71,7 @@ public class EqEquipmentLogController extends BaseController { /** * 新增设备状态日志 */ - @SaCheckPermission("system:equipmentLog:add") + @SaCheckPermission("device:equipmentLog:add") @Log(title = "设备状态日志", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class EqEquipmentLogController extends BaseController { /** * 修改设备状态日志 */ - @SaCheckPermission("system:equipmentLog:edit") + @SaCheckPermission("device:equipmentLog:edit") @Log(title = "设备状态日志", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class EqEquipmentLogController extends BaseController { * * @param logIds 主键串 */ - @SaCheckPermission("system:equipmentLog:remove") + @SaCheckPermission("device:equipmentLog:remove") @Log(title = "设备状态日志", businessType = BusinessType.DELETE) @DeleteMapping("/{logIds}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqFamilyController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/EqFamilyController.java similarity index 69% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqFamilyController.java rename to ruoyi-admin/src/main/java/org/dromara/web/controller/EqFamilyController.java index 5d0e86319..ca0b41cd7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqFamilyController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/EqFamilyController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller; +package org.dromara.web.controller; import java.util.List; @@ -17,51 +17,51 @@ 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.web.domain.vo.EqFamilyVo; +import org.dromara.web.domain.bo.EqFamilyBo; +import org.dromara.web.service.IEqFamilyService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** - * 家庭管理 + * 我的家庭 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/family") +@RequestMapping("/device/family") public class EqFamilyController extends BaseController { private final IEqFamilyService eqFamilyService; /** - * 查询家庭管理列表 + * 查询我的家庭列表 */ - @SaCheckPermission("system:family:list") + @SaCheckPermission("device: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) + @SaCheckPermission("device: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); + ExcelUtil.exportExcel(list, "我的家庭", EqFamilyVo.class, response); } /** - * 获取家庭管理详细信息 + * 获取我的家庭详细信息 * * @param familyId 主键 */ - @SaCheckPermission("system:family:query") + @SaCheckPermission("device:family:query") @GetMapping("/{familyId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long familyId) { @@ -69,10 +69,10 @@ public class EqFamilyController extends BaseController { } /** - * 新增家庭管理 + * 新增我的家庭 */ - @SaCheckPermission("system:family:add") - @Log(title = "家庭管理", businessType = BusinessType.INSERT) + @SaCheckPermission("device:family:add") + @Log(title = "我的家庭", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody EqFamilyBo bo) { @@ -80,10 +80,10 @@ public class EqFamilyController extends BaseController { } /** - * 修改家庭管理 + * 修改我的家庭 */ - @SaCheckPermission("system:family:edit") - @Log(title = "家庭管理", businessType = BusinessType.UPDATE) + @SaCheckPermission("device:family:edit") + @Log(title = "我的家庭", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody EqFamilyBo bo) { @@ -91,12 +91,12 @@ public class EqFamilyController extends BaseController { } /** - * 删除家庭管理 + * 删除我的家庭 * * @param familyIds 主键串 */ - @SaCheckPermission("system:family:remove") - @Log(title = "家庭管理", businessType = BusinessType.DELETE) + @SaCheckPermission("device:family:remove") + @Log(title = "我的家庭", businessType = BusinessType.DELETE) @DeleteMapping("/{familyIds}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] familyIds) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqShareController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/EqShareController.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqShareController.java rename to ruoyi-admin/src/main/java/org/dromara/web/controller/EqShareController.java index 396619cd9..14307c98f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqShareController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/EqShareController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller; +package org.dromara.web.controller; import java.util.List; @@ -17,21 +17,21 @@ 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.web.domain.vo.EqShareVo; +import org.dromara.web.domain.bo.EqShareBo; +import org.dromara.web.service.IEqShareService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** * 分享 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/share") +@RequestMapping("/device/share") public class EqShareController extends BaseController { private final IEqShareService eqShareService; @@ -39,7 +39,7 @@ public class EqShareController extends BaseController { /** * 查询分享列表 */ - @SaCheckPermission("system:share:list") + @SaCheckPermission("device:share:list") @GetMapping("/list") public TableDataInfo list(EqShareBo bo, PageQuery pageQuery) { return eqShareService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class EqShareController extends BaseController { /** * 导出分享列表 */ - @SaCheckPermission("system:share:export") + @SaCheckPermission("device:share:export") @Log(title = "分享", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(EqShareBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class EqShareController extends BaseController { * * @param shareId 主键 */ - @SaCheckPermission("system:share:query") + @SaCheckPermission("device:share:query") @GetMapping("/{shareId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long shareId) { @@ -71,7 +71,7 @@ public class EqShareController extends BaseController { /** * 新增分享 */ - @SaCheckPermission("system:share:add") + @SaCheckPermission("device:share:add") @Log(title = "分享", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class EqShareController extends BaseController { /** * 修改分享 */ - @SaCheckPermission("system:share:edit") + @SaCheckPermission("device:share:edit") @Log(title = "分享", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class EqShareController extends BaseController { * * @param shareIds 主键串 */ - @SaCheckPermission("system:share:remove") + @SaCheckPermission("device:share:remove") @Log(title = "分享", businessType = BusinessType.DELETE) @DeleteMapping("/{shareIds}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqUserConfigController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/EqUserConfigController.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqUserConfigController.java rename to ruoyi-admin/src/main/java/org/dromara/web/controller/EqUserConfigController.java index f5dde870e..26e2b3a4a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqUserConfigController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/EqUserConfigController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller; +package org.dromara.web.controller; import java.util.List; @@ -17,21 +17,21 @@ 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.web.domain.vo.EqUserConfigVo; +import org.dromara.web.domain.bo.EqUserConfigBo; +import org.dromara.web.service.IEqUserConfigService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** * 用户配置 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/userConfig") +@RequestMapping("/device/userConfig") public class EqUserConfigController extends BaseController { private final IEqUserConfigService eqUserConfigService; @@ -39,7 +39,7 @@ public class EqUserConfigController extends BaseController { /** * 查询用户配置列表 */ - @SaCheckPermission("system:userConfig:list") + @SaCheckPermission("device:userConfig:list") @GetMapping("/list") public TableDataInfo list(EqUserConfigBo bo, PageQuery pageQuery) { return eqUserConfigService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class EqUserConfigController extends BaseController { /** * 导出用户配置列表 */ - @SaCheckPermission("system:userConfig:export") + @SaCheckPermission("device:userConfig:export") @Log(title = "用户配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(EqUserConfigBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class EqUserConfigController extends BaseController { * * @param configId 主键 */ - @SaCheckPermission("system:userConfig:query") + @SaCheckPermission("device:userConfig:query") @GetMapping("/{configId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long configId) { @@ -71,7 +71,7 @@ public class EqUserConfigController extends BaseController { /** * 新增用户配置 */ - @SaCheckPermission("system:userConfig:add") + @SaCheckPermission("device:userConfig:add") @Log(title = "用户配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class EqUserConfigController extends BaseController { /** * 修改用户配置 */ - @SaCheckPermission("system:userConfig:edit") + @SaCheckPermission("device:userConfig:edit") @Log(title = "用户配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class EqUserConfigController extends BaseController { * * @param configIds 主键串 */ - @SaCheckPermission("system:userConfig:remove") + @SaCheckPermission("device:userConfig:remove") @Log(title = "用户配置", businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/EqHomeController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java similarity index 82% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/EqHomeController.java rename to ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java index e206da3c2..eebf3c80e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/EqHomeController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java @@ -1,26 +1,18 @@ -package org.dromara.system.controller.app; +package org.dromara.web.controller.app; -import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.*; -import org.dromara.system.domain.vo.*; -import org.dromara.system.service.*; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysUserService; +import org.dromara.web.domain.bo.*; +import org.dromara.web.domain.vo.*; +import org.dromara.web.service.*; +import org.dromara.web.domain.bo.EqAppHomeBo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -42,8 +34,6 @@ public class EqHomeController extends BaseController { private final IEqAreaService eqAreaService; - private final IEqAreaEquipmentService eqAreaEquipmentService; - private final IEqEquipmentService eqEquipmentService; private final IEqShareService shareService; @@ -87,15 +77,6 @@ public class EqHomeController extends BaseController { EqEquipmentBo eqEquipmentBo = new EqEquipmentBo(); eqEquipmentBo.setCreateBy(bo.getUserId()); return eqEquipmentService.queryPageList(eqEquipmentBo, pageQuery); //在设备表中增加了分布id - /*if (bo.getAreaId() == null){ //无设备分布 - EqEquipmentBo eqEquipmentBo = new EqEquipmentBo(); - eqEquipmentBo.setCreateBy(bo.getUserId()); - return eqEquipmentService.queryPageList(eqEquipmentBo, pageQuery); - }else{ - EqAreaEquipmentBo eqAreaEquipmentBo = new EqAreaEquipmentBo(); - eqAreaEquipmentBo.setAreaId(bo.getAreaId()); - return eqAreaEquipmentService.selectPageEquipmentList(bo, pageQuery); - }*/ } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqArea.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqArea.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqArea.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/EqArea.java index 4838552a9..3a27a5edd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqArea.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqArea.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package org.dromara.web.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; @@ -10,8 +10,8 @@ import java.io.Serial; /** * 分布管理对象 eq_area * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @EqualsAndHashCode(callSuper = true) @@ -33,7 +33,7 @@ public class EqArea extends BaseEntity { private Long userId; /** - * 分布位置名称 + * 分布名称 */ private String areaName; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqEquipment.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqEquipment.java similarity index 73% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqEquipment.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/EqEquipment.java index 640e79ad9..90c38501c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqEquipment.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqEquipment.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package org.dromara.web.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; @@ -12,8 +12,8 @@ import java.io.Serial; /** * 设备信息对象 eq_equipment * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @EqualsAndHashCode(callSuper = true) @@ -30,30 +30,45 @@ public class EqEquipment extends BaseEntity { private Long equipmentId; /** - * 设备类型(0 卷帘门) + * 分布id + */ + private Long areaId; + + /** + * 设备类型 */ private Integer type; /** - * 绑定账号，即登录账号 + * 登录账号 */ private String userName; /** - * 绑定人，即登录账号昵称 + * 账号昵称 */ private String nickName; /** - * 设备编码，唯一 + * 设备编码 */ private String equipmentCode; /** - * 设备状态（1:开门停止 2:关门停止 3:开门故障停止 4:关门故障停止 5:开门故障反弹 6:关门故障反弹 ） + * 设备名称 + */ + private String equipmentName; + + /** + * 设备状态 */ private Integer status; + /** + * 故障状态 + */ + private Integer faultStatus; + /** * 离线状态 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqEquipmentLog.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqEquipmentLog.java similarity index 71% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqEquipmentLog.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/EqEquipmentLog.java index 7cef15066..2f732a8b6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqEquipmentLog.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqEquipmentLog.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package org.dromara.web.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; @@ -12,8 +12,8 @@ import java.io.Serial; /** * 设备状态日志对象 eq_equipment_log * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @EqualsAndHashCode(callSuper = true) @@ -29,31 +29,46 @@ public class EqEquipmentLog extends BaseEntity { @TableId(value = "log_id") private Long logId; + /** + * 用户id + */ + private Long userId; + /** * 设备ID */ private Long equipmentId; /** - * 创建时间（年月日时分秒） + * 设备编码 */ - private Date createdDatetime; - - /** - * 创建年月日 - */ - private Date createdYearDay; - - /** - * 创建时分秒 - */ - private Date createdHourSecond; + private String equipmentCode; /** * 状态 */ private Integer status; + /** + * 故障状态 + */ + private Integer faultStatus; + + /** + * 离线状态 + */ + private Integer lineStatus; + + /** + * 年月日 + */ + private Date createdYearDay; + + /** + * 时分秒 + */ + private Date createdHourSecond; + /** * 星期几 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqFamily.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqFamily.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqFamily.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/EqFamily.java index c234fd174..82cda3e5e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqFamily.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqFamily.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package org.dromara.web.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; @@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode; import java.io.Serial; /** - * 家庭管理对象 eq_family + * 我的家庭对象 eq_family * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqShare.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqShare.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqShare.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/EqShare.java index d636bb885..5ea74e34d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqShare.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqShare.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package org.dromara.web.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; @@ -10,8 +10,8 @@ import java.io.Serial; /** * 分享对象 eq_share * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @EqualsAndHashCode(callSuper = true) @@ -28,22 +28,22 @@ public class EqShare extends BaseEntity { private Long shareId; /** - * 分享者用户ID + * 分享者ID */ private Long shareUserId; /** - * 分享者用户名称 + * 分享者名称 */ private String shareUserName; /** - * 被分享者用户ID + * 被分享者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-admin/src/main/java/org/dromara/web/domain/EqUserConfig.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqUserConfig.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/EqUserConfig.java index 5d059ebe6..37b57cc6c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqUserConfig.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqUserConfig.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package org.dromara.web.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; @@ -10,8 +10,8 @@ import java.io.Serial; /** * 用户配置对象 eq_user_config * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAppHomeBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAppHomeBo.java similarity index 80% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAppHomeBo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAppHomeBo.java index 419254122..7fffc695c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAppHomeBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAppHomeBo.java @@ -1,12 +1,7 @@ -package org.dromara.system.domain.bo; +package org.dromara.web.domain.bo; -import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.EqEquipment; - -import java.io.Serializable; /** * @ClassName : EqAppHomeBo diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAreaBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAreaBo.java similarity index 80% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAreaBo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAreaBo.java index 933972b8f..6cba99811 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAreaBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAreaBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.bo; +package org.dromara.web.domain.bo; -import org.dromara.system.domain.EqArea; +import org.dromara.web.domain.EqArea; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -12,8 +12,8 @@ import jakarta.validation.constraints.*; /** * 分布管理业务对象 eq_area * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @EqualsAndHashCode(callSuper = true) @@ -33,9 +33,9 @@ public class EqAreaBo extends BaseEntity { private Long userId; /** - * 分布位置名称 + * 分布名称 */ - @NotBlank(message = "分布位置名称不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "分布名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String areaName; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqEquipmentBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java similarity index 55% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqEquipmentBo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java index 76e032926..9e238e79a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqEquipmentBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.bo; +package org.dromara.web.domain.bo; -import org.dromara.system.domain.EqEquipment; +import org.dromara.web.domain.EqEquipment; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -14,8 +14,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; /** * 设备信息业务对象 eq_equipment * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @EqualsAndHashCode(callSuper = true) @@ -29,35 +29,53 @@ public class EqEquipmentBo extends BaseEntity { private Long equipmentId; /** - * 设备类型(0 卷帘门) + * 分布id */ - @NotNull(message = "设备类型(0 卷帘门)不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "分布id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long areaId; + + /** + * 设备类型 + */ + @NotNull(message = "设备类型不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer type; /** - * 绑定账号，即登录账号 + * 登录账号 */ - @NotBlank(message = "绑定账号，即登录账号不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "登录账号不能为空", groups = { AddGroup.class, EditGroup.class }) private String userName; /** - * 绑定人，即登录账号昵称 + * 账号昵称 */ - @NotBlank(message = "绑定人，即登录账号昵称不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "账号昵称不能为空", groups = { AddGroup.class, EditGroup.class }) private String nickName; /** - * 设备编码，唯一 + * 设备编码 */ - @NotBlank(message = "设备编码，唯一不能为空", groups = { AddGroup.class, EditGroup.class }) + @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 }) + @NotBlank(message = "设备名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String equipmentName; + + /** + * 设备状态 + */ + @NotNull(message = "设备状态不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer status; + /** + * 故障状态 + */ + @NotNull(message = "故障状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer faultStatus; + /** * 离线状态 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqEquipmentLogBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java similarity index 57% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqEquipmentLogBo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java index dda88bf9a..b209b1dc7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqEquipmentLogBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.bo; +package org.dromara.web.domain.bo; -import org.dromara.system.domain.EqEquipmentLog; +import org.dromara.web.domain.EqEquipmentLog; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -14,8 +14,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; /** * 设备状态日志业务对象 eq_equipment_log * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @EqualsAndHashCode(callSuper = true) @@ -28,6 +28,12 @@ public class EqEquipmentLogBo extends BaseEntity { @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) private Long logId; + /** + * 用户id + */ + @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + /** * 设备ID */ @@ -35,22 +41,10 @@ public class EqEquipmentLogBo extends BaseEntity { 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; + @NotBlank(message = "设备编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String equipmentCode; /** * 状态 @@ -58,6 +52,30 @@ public class EqEquipmentLogBo extends BaseEntity { @NotNull(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer status; + /** + * 故障状态 + */ + @NotNull(message = "故障状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer faultStatus; + + /** + * 离线状态 + */ + @NotNull(message = "离线状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer lineStatus; + + /** + * 年月日 + */ + @NotNull(message = "年月日不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date createdYearDay; + + /** + * 时分秒 + */ + @NotNull(message = "时分秒不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date createdHourSecond; + /** * 星期几 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqFamilyBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqFamilyBo.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqFamilyBo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqFamilyBo.java index 9078ca85c..cb3586622 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqFamilyBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqFamilyBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.bo; +package org.dromara.web.domain.bo; -import org.dromara.system.domain.EqFamily; +import org.dromara.web.domain.EqFamily; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -10,10 +10,10 @@ import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; /** - * 家庭管理业务对象 eq_family + * 我的家庭业务对象 eq_family * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqShareBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqShareBo.java similarity index 56% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqShareBo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqShareBo.java index 53fcccac8..6b055a713 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqShareBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqShareBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.bo; +package org.dromara.web.domain.bo; -import org.dromara.system.domain.EqShare; +import org.dromara.web.domain.EqShare; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -12,8 +12,8 @@ import jakarta.validation.constraints.*; /** * 分享业务对象 eq_share * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @EqualsAndHashCode(callSuper = true) @@ -27,27 +27,27 @@ public class EqShareBo extends BaseEntity { private Long shareId; /** - * 分享者用户ID + * 分享者ID */ - @NotNull(message = "分享者用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "分享者ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long shareUserId; /** - * 分享者用户名称 + * 分享者名称 */ - @NotBlank(message = "分享者用户名称不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "分享者名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String shareUserName; /** - * 被分享者用户ID + * 被分享者ID */ - @NotNull(message = "被分享者用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "被分享者ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long sharedUserId; /** - * 被分享者用户名称 + * 被分享者名称 */ - @NotBlank(message = "被分享者用户名称不能为空", groups = { AddGroup.class, EditGroup.class }) + @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-admin/src/main/java/org/dromara/web/domain/bo/EqUserConfigBo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqUserConfigBo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqUserConfigBo.java index 9a3ed0509..c0dddfd92 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqUserConfigBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqUserConfigBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.bo; +package org.dromara.web.domain.bo; -import org.dromara.system.domain.EqUserConfig; +import org.dromara.web.domain.EqUserConfig; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -12,8 +12,8 @@ import jakarta.validation.constraints.*; /** * 用户配置业务对象 eq_user_config * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqAreaVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqAreaVo.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqAreaVo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqAreaVo.java index 412c6bcf5..f03adce78 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqAreaVo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqAreaVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.vo; +package org.dromara.web.domain.vo; -import org.dromara.system.domain.EqArea; +import org.dromara.web.domain.EqArea; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -17,8 +17,8 @@ import java.util.Date; /** * 分布管理视图对象 eq_area * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @ExcelIgnoreUnannotated @@ -41,9 +41,9 @@ public class EqAreaVo implements Serializable { private Long userId; /** - * 分布位置名称 + * 分布名称 */ - @ExcelProperty(value = "分布位置名称") + @ExcelProperty(value = "分布名称") private String areaName; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqEquipmentLogVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentLogVo.java similarity index 63% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqEquipmentLogVo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentLogVo.java index 047ad9d31..dd8bf1e42 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqEquipmentLogVo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentLogVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package org.dromara.web.domain.vo; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.system.domain.EqEquipmentLog; +import org.dromara.web.domain.EqEquipmentLog; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -19,8 +19,8 @@ import java.util.Date; /** * 设备状态日志视图对象 eq_equipment_log * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @ExcelIgnoreUnannotated @@ -36,6 +36,12 @@ public class EqEquipmentLogVo implements Serializable { @ExcelProperty(value = "主键ID") private Long logId; + /** + * 用户id + */ + @ExcelProperty(value = "用户id") + private Long userId; + /** * 设备ID */ @@ -43,23 +49,10 @@ public class EqEquipmentLogVo implements Serializable { 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 = "设备编码") + private String equipmentCode; /** * 状态 @@ -68,6 +61,32 @@ public class EqEquipmentLogVo implements Serializable { @ExcelDictFormat(dictType = "eq_status_type") private Integer status; + /** + * 故障状态 + */ + @ExcelProperty(value = "故障状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_fault_status") + private Integer faultStatus; + + /** + * 离线状态 + */ + @ExcelProperty(value = "离线状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_line_status") + private Integer lineStatus; + + /** + * 年月日 + */ + @ExcelProperty(value = "年月日") + private Date createdYearDay; + + /** + * 时分秒 + */ + @ExcelProperty(value = "时分秒") + private Date createdHourSecond; + /** * 星期几 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqEquipmentVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentVo.java similarity index 66% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqEquipmentVo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentVo.java index ccd27952f..d0d870595 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqEquipmentVo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package org.dromara.web.domain.vo; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.system.domain.EqEquipment; +import org.dromara.web.domain.EqEquipment; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -19,8 +19,8 @@ import java.util.Date; /** * 设备信息视图对象 eq_equipment * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @ExcelIgnoreUnannotated @@ -37,37 +37,56 @@ public class EqEquipmentVo implements Serializable { private Long equipmentId; /** - * 设备类型(0 卷帘门) + * 分布id */ - @ExcelProperty(value = "设备类型(0 卷帘门)", converter = ExcelDictConvert.class) + @ExcelProperty(value = "分布id") + private Long areaId; + + /** + * 设备类型 + */ + @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "eq_equipment_type") private Integer type; /** - * 绑定账号，即登录账号 + * 登录账号 */ - @ExcelProperty(value = "绑定账号，即登录账号") + @ExcelProperty(value = "登录账号") private String userName; /** - * 绑定人，即登录账号昵称 + * 账号昵称 */ - @ExcelProperty(value = "绑定人，即登录账号昵称") + @ExcelProperty(value = "账号昵称") private String nickName; /** - * 设备编码，唯一 + * 设备编码 */ - @ExcelProperty(value = "设备编码，唯一") + @ExcelProperty(value = "设备编码") private String equipmentCode; /** - * 设备状态（1:开门停止 2:关门停止 3:开门故障停止 4:关门故障停止 5:开门故障反弹 6:关门故障反弹 ） + * 设备名称 + */ + @ExcelProperty(value = "设备名称") + private String equipmentName; + + /** + * 设备状态 */ @ExcelProperty(value = "设备状态", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "eq_status_type") private Integer status; + /** + * 故障状态 + */ + @ExcelProperty(value = "故障状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_fault_status") + private Integer faultStatus; + /** * 离线状态 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqFamilyVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqFamilyVo.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqFamilyVo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqFamilyVo.java index 6409babe9..92bd0d21d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqFamilyVo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqFamilyVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.vo; +package org.dromara.web.domain.vo; -import org.dromara.system.domain.EqFamily; +import org.dromara.web.domain.EqFamily; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -15,10 +15,10 @@ import java.util.Date; /** - * 家庭管理视图对象 eq_family + * 我的家庭视图对象 eq_family * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @ExcelIgnoreUnannotated diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqShareVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqShareVo.java similarity index 67% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqShareVo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqShareVo.java index 0f74152d0..beb9ce258 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqShareVo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqShareVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.vo; +package org.dromara.web.domain.vo; -import org.dromara.system.domain.EqShare; +import org.dromara.web.domain.EqShare; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -17,8 +17,8 @@ import java.util.Date; /** * 分享视图对象 eq_share * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @ExcelIgnoreUnannotated @@ -35,27 +35,27 @@ public class EqShareVo implements Serializable { private Long shareId; /** - * 分享者用户ID + * 分享者ID */ - @ExcelProperty(value = "分享者用户ID") + @ExcelProperty(value = "分享者ID") private Long shareUserId; /** - * 分享者用户名称 + * 分享者名称 */ - @ExcelProperty(value = "分享者用户名称") + @ExcelProperty(value = "分享者名称") private String shareUserName; /** - * 被分享者用户ID + * 被分享者ID */ - @ExcelProperty(value = "被分享者用户ID") + @ExcelProperty(value = "被分享者ID") private Long sharedUserId; /** - * 被分享者用户名称 + * 被分享者名称 */ - @ExcelProperty(value = "被分享者用户名称") + @ExcelProperty(value = "被分享者名称") private String sharedUserName; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqUserConfigVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqUserConfigVo.java similarity index 67% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqUserConfigVo.java rename to ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqUserConfigVo.java index 4d0222ea1..76a39f653 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqUserConfigVo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqUserConfigVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.vo; +package org.dromara.web.domain.vo; -import org.dromara.system.domain.EqUserConfig; +import org.dromara.web.domain.EqUserConfig; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -17,8 +17,8 @@ import java.util.Date; /** * 用户配置视图对象 eq_user_config * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @Data @ExcelIgnoreUnannotated @@ -43,19 +43,22 @@ public class EqUserConfigVo implements Serializable { /** * 时区类型 */ - @ExcelProperty(value = "时区类型") + @ExcelProperty(value = "时区类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_timezone_type") private Integer timezoneType; /** * 时间格式 */ - @ExcelProperty(value = "时间格式") + @ExcelProperty(value = "时间格式", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_time_format_type") private Integer timeFormat; /** * 语言种类 */ - @ExcelProperty(value = "语言种类") + @ExcelProperty(value = "语言种类", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_language_type") private Integer languageType; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqAreaMapper.java b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqAreaMapper.java similarity index 52% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqAreaMapper.java rename to ruoyi-admin/src/main/java/org/dromara/web/mapper/EqAreaMapper.java index 81f59302e..b4980d819 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqAreaMapper.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqAreaMapper.java @@ -1,14 +1,14 @@ -package org.dromara.system.mapper; +package org.dromara.web.mapper; -import org.dromara.system.domain.EqArea; -import org.dromara.system.domain.vo.EqAreaVo; +import org.dromara.web.domain.EqArea; +import org.dromara.web.domain.vo.EqAreaVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 分布管理Mapper接口 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ public interface EqAreaMapper extends BaseMapperPlus { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqEquipmentLogMapper.java b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqEquipmentLogMapper.java similarity index 54% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqEquipmentLogMapper.java rename to ruoyi-admin/src/main/java/org/dromara/web/mapper/EqEquipmentLogMapper.java index ab5d1b003..2cdbb8185 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqEquipmentLogMapper.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqEquipmentLogMapper.java @@ -1,14 +1,14 @@ -package org.dromara.system.mapper; +package org.dromara.web.mapper; -import org.dromara.system.domain.EqEquipmentLog; -import org.dromara.system.domain.vo.EqEquipmentLogVo; +import org.dromara.web.domain.EqEquipmentLog; +import org.dromara.web.domain.vo.EqEquipmentLogVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 设备状态日志Mapper接口 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ public interface EqEquipmentLogMapper extends BaseMapperPlus { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqEquipmentMapper.java b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqEquipmentMapper.java similarity index 53% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqEquipmentMapper.java rename to ruoyi-admin/src/main/java/org/dromara/web/mapper/EqEquipmentMapper.java index 1ff1bdf5b..74f07b6cc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqEquipmentMapper.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqEquipmentMapper.java @@ -1,14 +1,14 @@ -package org.dromara.system.mapper; +package org.dromara.web.mapper; -import org.dromara.system.domain.EqEquipment; -import org.dromara.system.domain.vo.EqEquipmentVo; +import org.dromara.web.domain.EqEquipment; +import org.dromara.web.domain.vo.EqEquipmentVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 设备信息Mapper接口 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ public interface EqEquipmentMapper extends BaseMapperPlus { diff --git a/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqFamilyMapper.java b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqFamilyMapper.java new file mode 100644 index 000000000..fdf43e177 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqFamilyMapper.java @@ -0,0 +1,15 @@ +package org.dromara.web.mapper; + +import org.dromara.web.domain.EqFamily; +import org.dromara.web.domain.vo.EqFamilyVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 我的家庭Mapper接口 + * + * @author zzc + * @date 2024-07-19 + */ +public interface EqFamilyMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqShareMapper.java b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqShareMapper.java similarity index 51% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqShareMapper.java rename to ruoyi-admin/src/main/java/org/dromara/web/mapper/EqShareMapper.java index ac56be82d..f5ab99a05 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqShareMapper.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqShareMapper.java @@ -1,14 +1,14 @@ -package org.dromara.system.mapper; +package org.dromara.web.mapper; -import org.dromara.system.domain.EqShare; -import org.dromara.system.domain.vo.EqShareVo; +import org.dromara.web.domain.EqShare; +import org.dromara.web.domain.vo.EqShareVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 分享Mapper接口 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ public interface EqShareMapper extends BaseMapperPlus { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqUserConfigMapper.java b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqUserConfigMapper.java similarity index 53% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqUserConfigMapper.java rename to ruoyi-admin/src/main/java/org/dromara/web/mapper/EqUserConfigMapper.java index 2c3caa086..308ec9654 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqUserConfigMapper.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/mapper/EqUserConfigMapper.java @@ -1,14 +1,14 @@ -package org.dromara.system.mapper; +package org.dromara.web.mapper; -import org.dromara.system.domain.EqUserConfig; -import org.dromara.system.domain.vo.EqUserConfigVo; +import org.dromara.web.domain.EqUserConfig; +import org.dromara.web.domain.vo.EqUserConfigVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 用户配置Mapper接口 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ public interface EqUserConfigMapper extends BaseMapperPlus { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqAreaService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqAreaService.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqAreaService.java rename to ruoyi-admin/src/main/java/org/dromara/web/service/IEqAreaService.java index 3990599e4..b1e24ec8f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqAreaService.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqAreaService.java @@ -1,7 +1,7 @@ -package org.dromara.system.service; +package org.dromara.web.service; -import org.dromara.system.domain.vo.EqAreaVo; -import org.dromara.system.domain.bo.EqAreaBo; +import org.dromara.web.domain.vo.EqAreaVo; +import org.dromara.web.domain.bo.EqAreaBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -11,8 +11,8 @@ import java.util.List; /** * 分布管理Service接口 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ public interface IEqAreaService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqEquipmentLogService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqEquipmentLogService.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqEquipmentLogService.java rename to ruoyi-admin/src/main/java/org/dromara/web/service/IEqEquipmentLogService.java index 81ce9c571..aa3a5e536 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqEquipmentLogService.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqEquipmentLogService.java @@ -1,7 +1,7 @@ -package org.dromara.system.service; +package org.dromara.web.service; -import org.dromara.system.domain.vo.EqEquipmentLogVo; -import org.dromara.system.domain.bo.EqEquipmentLogBo; +import org.dromara.web.domain.vo.EqEquipmentLogVo; +import org.dromara.web.domain.bo.EqEquipmentLogBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -11,8 +11,8 @@ import java.util.List; /** * 设备状态日志Service接口 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ public interface IEqEquipmentLogService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqEquipmentService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqEquipmentService.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqEquipmentService.java rename to ruoyi-admin/src/main/java/org/dromara/web/service/IEqEquipmentService.java index 418bcd1a1..c29e22afc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqEquipmentService.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqEquipmentService.java @@ -1,8 +1,8 @@ -package org.dromara.system.service; +package org.dromara.web.service; -import org.dromara.system.domain.bo.EqAppHomeBo; -import org.dromara.system.domain.vo.EqEquipmentVo; -import org.dromara.system.domain.bo.EqEquipmentBo; +import org.dromara.web.domain.bo.EqAppHomeBo; +import org.dromara.web.domain.vo.EqEquipmentVo; +import org.dromara.web.domain.bo.EqEquipmentBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -12,8 +12,8 @@ import java.util.List; /** * 设备信息Service接口 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ public interface IEqEquipmentService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqFamilyService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqFamilyService.java similarity index 63% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqFamilyService.java rename to ruoyi-admin/src/main/java/org/dromara/web/service/IEqFamilyService.java index b2a70099c..37950e2d1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqFamilyService.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqFamilyService.java @@ -1,7 +1,7 @@ -package org.dromara.system.service; +package org.dromara.web.service; -import org.dromara.system.domain.vo.EqFamilyVo; -import org.dromara.system.domain.bo.EqFamilyBo; +import org.dromara.web.domain.vo.EqFamilyVo; +import org.dromara.web.domain.bo.EqFamilyBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -9,56 +9,56 @@ import java.util.Collection; import java.util.List; /** - * 家庭管理Service接口 + * 我的家庭Service接口 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ public interface IEqFamilyService { /** - * 查询家庭管理 + * 查询我的家庭 * * @param familyId 主键 - * @return 家庭管理 + * @return 我的家庭 */ EqFamilyVo queryById(Long familyId); /** - * 分页查询家庭管理列表 + * 分页查询我的家庭列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 家庭管理分页列表 + * @return 我的家庭分页列表 */ TableDataInfo queryPageList(EqFamilyBo bo, PageQuery pageQuery); /** - * 查询符合条件的家庭管理列表 + * 查询符合条件的我的家庭列表 * * @param bo 查询条件 - * @return 家庭管理列表 + * @return 我的家庭列表 */ List queryList(EqFamilyBo bo); /** - * 新增家庭管理 + * 新增我的家庭 * - * @param bo 家庭管理 + * @param bo 我的家庭 * @return 是否新增成功 */ Boolean insertByBo(EqFamilyBo bo); /** - * 修改家庭管理 + * 修改我的家庭 * - * @param bo 家庭管理 + * @param bo 我的家庭 * @return 是否修改成功 */ Boolean updateByBo(EqFamilyBo bo); /** - * 校验并批量删除家庭管理信息 + * 校验并批量删除我的家庭信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqShareService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqShareService.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqShareService.java rename to ruoyi-admin/src/main/java/org/dromara/web/service/IEqShareService.java index a013381e6..095ce24e1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqShareService.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqShareService.java @@ -1,7 +1,7 @@ -package org.dromara.system.service; +package org.dromara.web.service; -import org.dromara.system.domain.vo.EqShareVo; -import org.dromara.system.domain.bo.EqShareBo; +import org.dromara.web.domain.vo.EqShareVo; +import org.dromara.web.domain.bo.EqShareBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -11,8 +11,8 @@ import java.util.List; /** * 分享Service接口 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ public interface IEqShareService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqUserConfigService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqUserConfigService.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqUserConfigService.java rename to ruoyi-admin/src/main/java/org/dromara/web/service/IEqUserConfigService.java index 02420bec8..a1bc9e149 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqUserConfigService.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IEqUserConfigService.java @@ -1,7 +1,7 @@ -package org.dromara.system.service; +package org.dromara.web.service; -import org.dromara.system.domain.vo.EqUserConfigVo; -import org.dromara.system.domain.bo.EqUserConfigBo; +import org.dromara.web.domain.vo.EqUserConfigVo; +import org.dromara.web.domain.bo.EqUserConfigBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -11,8 +11,8 @@ import java.util.List; /** * 用户配置Service接口 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ public interface IEqUserConfigService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqAreaServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqAreaServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqAreaServiceImpl.java rename to ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqAreaServiceImpl.java index a46f57e46..448024f29 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqAreaServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqAreaServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package org.dromara.web.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -9,11 +9,11 @@ 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 org.dromara.web.domain.bo.EqAreaBo; +import org.dromara.web.domain.vo.EqAreaVo; +import org.dromara.web.domain.EqArea; +import org.dromara.web.mapper.EqAreaMapper; +import org.dromara.web.service.IEqAreaService; import java.util.List; import java.util.Map; @@ -22,8 +22,8 @@ import java.util.Collection; /** * 分布管理Service业务层处理 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @RequiredArgsConstructor @Service @@ -73,7 +73,7 @@ public class EqAreaServiceImpl implements IEqAreaService { 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()); + lqw.like(StringUtils.isNotBlank(bo.getDescription()), EqArea::getDescription, bo.getDescription()); return lqw; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentLogServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentLogServiceImpl.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentLogServiceImpl.java rename to ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentLogServiceImpl.java index 369261b06..28c1285ab 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentLogServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentLogServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package org.dromara.web.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -9,11 +9,11 @@ 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 org.dromara.web.domain.bo.EqEquipmentLogBo; +import org.dromara.web.domain.vo.EqEquipmentLogVo; +import org.dromara.web.domain.EqEquipmentLog; +import org.dromara.web.mapper.EqEquipmentLogMapper; +import org.dromara.web.service.IEqEquipmentLogService; import java.util.List; import java.util.Map; @@ -22,8 +22,8 @@ import java.util.Collection; /** * 设备状态日志Service业务层处理 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @RequiredArgsConstructor @Service @@ -71,11 +71,14 @@ public class EqEquipmentLogServiceImpl implements IEqEquipmentLogService { private LambdaQueryWrapper buildQueryWrapper(EqEquipmentLogBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, EqEquipmentLog::getUserId, bo.getUserId()); lqw.eq(bo.getEquipmentId() != null, EqEquipmentLog::getEquipmentId, bo.getEquipmentId()); - lqw.eq(bo.getCreatedDatetime() != null, EqEquipmentLog::getCreatedDatetime, bo.getCreatedDatetime()); + lqw.eq(StringUtils.isNotBlank(bo.getEquipmentCode()), EqEquipmentLog::getEquipmentCode, bo.getEquipmentCode()); + lqw.eq(bo.getStatus() != null, EqEquipmentLog::getStatus, bo.getStatus()); + lqw.eq(bo.getFaultStatus() != null, EqEquipmentLog::getFaultStatus, bo.getFaultStatus()); + lqw.eq(bo.getLineStatus() != null, EqEquipmentLog::getLineStatus, bo.getLineStatus()); 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; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentServiceImpl.java rename to ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java index 7d8732f21..480640c01 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package org.dromara.web.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -8,13 +8,13 @@ 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.dromara.system.domain.bo.EqAppHomeBo; +import org.dromara.web.domain.bo.EqAppHomeBo; 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 org.dromara.web.domain.bo.EqEquipmentBo; +import org.dromara.web.domain.vo.EqEquipmentVo; +import org.dromara.web.domain.EqEquipment; +import org.dromara.web.mapper.EqEquipmentMapper; +import org.dromara.web.service.IEqEquipmentService; import java.util.List; import java.util.Map; @@ -23,8 +23,8 @@ import java.util.Collection; /** * 设备信息Service业务层处理 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @RequiredArgsConstructor @Service @@ -72,14 +72,15 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { private LambdaQueryWrapper buildQueryWrapper(EqEquipmentBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getAreaId() != null, EqEquipment::getAreaId, bo.getAreaId()); 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.getSearchValue()), EqEquipment::getEquipmentCode, bo.getSearchValue()); - lqw.like(StringUtils.isNotBlank(bo.getEquipmentCode()), EqEquipment::getEquipmentCode, bo.getEquipmentCode()); + lqw.eq(StringUtils.isNotBlank(bo.getEquipmentCode()), EqEquipment::getEquipmentCode, bo.getEquipmentCode()); + lqw.like(StringUtils.isNotBlank(bo.getEquipmentName()), EqEquipment::getEquipmentName, bo.getEquipmentName()); lqw.eq(bo.getStatus() != null, EqEquipment::getStatus, bo.getStatus()); + lqw.eq(bo.getFaultStatus() != null, EqEquipment::getFaultStatus, bo.getFaultStatus()); lqw.eq(bo.getLineStatus() != null, EqEquipment::getLineStatus, bo.getLineStatus()); - lqw.eq(bo.getCreateBy() != null, EqEquipment::getCreateBy, bo.getCreateBy()); return lqw; } @@ -155,4 +156,5 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { //增加操作次数 更新到设备表中 return null; } + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqFamilyServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqFamilyServiceImpl.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqFamilyServiceImpl.java rename to ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqFamilyServiceImpl.java index a95860e87..a7239a297 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqFamilyServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqFamilyServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package org.dromara.web.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -9,21 +9,21 @@ 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 org.dromara.web.domain.bo.EqFamilyBo; +import org.dromara.web.domain.vo.EqFamilyVo; +import org.dromara.web.domain.EqFamily; +import org.dromara.web.mapper.EqFamilyMapper; +import org.dromara.web.service.IEqFamilyService; import java.util.List; import java.util.Map; import java.util.Collection; /** - * 家庭管理Service业务层处理 + * 我的家庭Service业务层处理 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @RequiredArgsConstructor @Service @@ -32,10 +32,10 @@ public class EqFamilyServiceImpl implements IEqFamilyService { private final EqFamilyMapper baseMapper; /** - * 查询家庭管理 + * 查询我的家庭 * * @param familyId 主键 - * @return 家庭管理 + * @return 我的家庭 */ @Override public EqFamilyVo queryById(Long familyId){ @@ -43,11 +43,11 @@ public class EqFamilyServiceImpl implements IEqFamilyService { } /** - * 分页查询家庭管理列表 + * 分页查询我的家庭列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 家庭管理分页列表 + * @return 我的家庭分页列表 */ @Override public TableDataInfo queryPageList(EqFamilyBo bo, PageQuery pageQuery) { @@ -57,10 +57,10 @@ public class EqFamilyServiceImpl implements IEqFamilyService { } /** - * 查询符合条件的家庭管理列表 + * 查询符合条件的我的家庭列表 * * @param bo 查询条件 - * @return 家庭管理列表 + * @return 我的家庭列表 */ @Override public List queryList(EqFamilyBo bo) { @@ -77,9 +77,9 @@ public class EqFamilyServiceImpl implements IEqFamilyService { } /** - * 新增家庭管理 + * 新增我的家庭 * - * @param bo 家庭管理 + * @param bo 我的家庭 * @return 是否新增成功 */ @Override @@ -94,9 +94,9 @@ public class EqFamilyServiceImpl implements IEqFamilyService { } /** - * 修改家庭管理 + * 修改我的家庭 * - * @param bo 家庭管理 + * @param bo 我的家庭 * @return 是否修改成功 */ @Override @@ -114,7 +114,7 @@ public class EqFamilyServiceImpl implements IEqFamilyService { } /** - * 校验并批量删除家庭管理信息 + * 校验并批量删除我的家庭信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqShareServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqShareServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqShareServiceImpl.java rename to ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqShareServiceImpl.java index b0de1f91d..ea6af7771 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqShareServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqShareServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package org.dromara.web.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -9,11 +9,11 @@ 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 org.dromara.web.domain.bo.EqShareBo; +import org.dromara.web.domain.vo.EqShareVo; +import org.dromara.web.domain.EqShare; +import org.dromara.web.mapper.EqShareMapper; +import org.dromara.web.service.IEqShareService; import java.util.List; import java.util.Map; @@ -22,8 +22,8 @@ import java.util.Collection; /** * 分享Service业务层处理 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @RequiredArgsConstructor @Service diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqUserConfigServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqUserConfigServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqUserConfigServiceImpl.java rename to ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqUserConfigServiceImpl.java index f5e2c3321..74a7865f8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqUserConfigServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqUserConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package org.dromara.web.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -9,11 +9,11 @@ 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 org.dromara.web.domain.bo.EqUserConfigBo; +import org.dromara.web.domain.vo.EqUserConfigVo; +import org.dromara.web.domain.EqUserConfig; +import org.dromara.web.mapper.EqUserConfigMapper; +import org.dromara.web.service.IEqUserConfigService; import java.util.List; import java.util.Map; @@ -22,8 +22,8 @@ import java.util.Collection; /** * 用户配置Service业务层处理 * - * @author Lion Li - * @date 2024-07-14 + * @author zzc + * @date 2024-07-19 */ @RequiredArgsConstructor @Service diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 1c0e76b2e..1dc000d07 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -42,9 +42,9 @@ 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-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://124.223.36.143: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 + password: 8hifXZpjLdhmD1wq6wsi # 从库数据源 slave: lazy: true diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/EqAreaMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaMapper.xml rename to ruoyi-admin/src/main/resources/mapper/device/EqAreaMapper.xml index 9ad13eb4f..0444fc399 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/device/EqAreaMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqEquipmentMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentLogMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqEquipmentMapper.xml rename to ruoyi-admin/src/main/resources/mapper/device/EqEquipmentLogMapper.xml index 0fad8aa9a..9e26e5094 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqEquipmentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentLogMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml new file mode 100644 index 000000000..f907d9c10 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqFamilyMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/EqFamilyMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqFamilyMapper.xml rename to ruoyi-admin/src/main/resources/mapper/device/EqFamilyMapper.xml index a7590e292..15bcdb65a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqFamilyMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/device/EqFamilyMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqShareMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/EqShareMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqShareMapper.xml rename to ruoyi-admin/src/main/resources/mapper/device/EqShareMapper.xml index 02bacbe5c..c8b4d91f7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqShareMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/device/EqShareMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/device/EqUserConfigMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/EqUserConfigMapper.xml new file mode 100644 index 000000000..3b855d051 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/device/EqUserConfigMapper.xml @@ -0,0 +1,7 @@ + + + + + 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 deleted file mode 100644 index 6e4e7988b..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqAreaEquipmentController.java +++ /dev/null @@ -1,105 +0,0 @@ -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/domain/EqAreaEquipment.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqAreaEquipment.java deleted file mode 100644 index 4a3d2c9c8..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqAreaEquipment.java +++ /dev/null @@ -1,46 +0,0 @@ -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; - - /** - * 排序 - */ - private Integer sort; - - -} 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 deleted file mode 100644 index a10bd015a..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAreaEquipmentBo.java +++ /dev/null @@ -1,45 +0,0 @@ -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; - - /** - * 排序 - */ - private Integer sort; -} 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 deleted file mode 100644 index a0f5cdb1a..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqAreaEquipmentVo.java +++ /dev/null @@ -1,54 +0,0 @@ -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; - - /** - * 排序 - */ - private Integer sort; - -} 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 deleted file mode 100644 index ebda3f8cb..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqAreaEquipmentMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.dromara.system.mapper; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.system.domain.EqAreaEquipment; -import org.dromara.system.domain.EqEquipment; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.EqAreaEquipmentVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.vo.EqEquipmentVo; -import org.dromara.system.domain.vo.SysUserVo; - -/** - * 用户分布设备关联Mapper接口 - * - * @author Lion Li - * @date 2024-07-14 - */ -public interface EqAreaEquipmentMapper extends BaseMapperPlus { - - Page selectPageEquipmentList(@Param("page") Page page,@Param(Constants.WRAPPER) Wrapper queryWrapper); -} 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 deleted file mode 100644 index dff7207b1..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/EqFamilyMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -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/service/IEqAreaEquipmentService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqAreaEquipmentService.java deleted file mode 100644 index cfca68b08..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqAreaEquipmentService.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.system.domain.bo.EqAppHomeBo; -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 org.dromara.system.domain.vo.EqEquipmentVo; - -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 - * @param pageQuery - * @return - */ - TableDataInfo selectPageEquipmentList(EqAppHomeBo 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/impl/EqAreaEquipmentServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqAreaEquipmentServiceImpl.java deleted file mode 100644 index ee371e9f7..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqAreaEquipmentServiceImpl.java +++ /dev/null @@ -1,148 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -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.dromara.system.domain.EqEquipment; -import org.dromara.system.domain.bo.EqAppHomeBo; -import org.dromara.system.domain.vo.EqEquipmentVo; -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); - } - - @Override - public TableDataInfo selectPageEquipmentList(EqAppHomeBo bo, PageQuery pageQuery) { - QueryWrapper lqw = buildQueryEquipmentWrapper(bo); - Page result = baseMapper.selectPageEquipmentList(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; - } - - private QueryWrapper buildQueryEquipmentWrapper(EqAppHomeBo bo) { - QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.eq(ObjectUtil.isNotNull(bo.getAreaId()), "ae.area_id", bo.getAreaId()); - return queryWrapper; - } - - /** - * 新增用户分布设备关联 - * - * @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/resources/mapper/EqAreaEquipmentMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaEquipmentMapper.xml deleted file mode 100644 index 8300795b1..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaEquipmentMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqEquipmentLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqEquipmentLogMapper.xml deleted file mode 100644 index 03fbe471a..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqEquipmentLogMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqUserConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqUserConfigMapper.xml deleted file mode 100644 index 6186cac25..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqUserConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - -