From 73387d7ac2c1f81f9f07e39b60fd06b6ddf36741 Mon Sep 17 00:00:00 2001 From: zzc <1278921369@qq.com> Date: Wed, 17 Jul 2024 01:13:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/generator/util/VelocityUtils.java | 2 +- .../system/controller/EqFamilyController.java | 24 ++--- .../controller/app/EqHomeController.java | 97 +++++++++++++++++++ .../org/dromara/system/domain/EqFamily.java | 2 +- .../dromara/system/domain/bo/EqAppHomeBo.java | 22 +++++ .../dromara/system/domain/bo/EqFamilyBo.java | 2 +- .../dromara/system/domain/vo/EqFamilyVo.java | 2 +- .../system/mapper/EqAreaEquipmentMapper.java | 11 +++ .../dromara/system/mapper/EqFamilyMapper.java | 2 +- .../service/IEqAreaEquipmentService.java | 10 ++ .../system/service/IEqFamilyService.java | 24 ++--- .../impl/EqAreaEquipmentServiceImpl.java | 18 ++++ .../service/impl/EqEquipmentServiceImpl.java | 1 + .../service/impl/EqFamilyServiceImpl.java | 24 ++--- .../mapper/EqAreaEquipmentMapper.xml | 7 ++ 15 files changed, 207 insertions(+), 41 deletions(-) create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/EqHomeController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAppHomeBo.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java index 49bfbfbab..b3dabce18 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java @@ -54,7 +54,7 @@ public class VelocityUtils { VelocityContext velocityContext = new VelocityContext(); velocityContext.put("tplCategory", genTable.getTplCategory()); velocityContext.put("tableName", genTable.getTableName()); - velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【家庭管理】"); + velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "家庭管理"); velocityContext.put("ClassName", genTable.getClassName()); velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName())); velocityContext.put("moduleName", genTable.getModuleName()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqFamilyController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqFamilyController.java index b65b3b8e8..5d0e86319 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqFamilyController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/EqFamilyController.java @@ -23,7 +23,7 @@ import org.dromara.system.service.IEqFamilyService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** - * 【家庭管理】 + * 家庭管理 * * @author Lion Li * @date 2024-07-14 @@ -37,7 +37,7 @@ public class EqFamilyController extends BaseController { private final IEqFamilyService eqFamilyService; /** - * 查询【家庭管理】列表 + * 查询家庭管理列表 */ @SaCheckPermission("system:family:list") @GetMapping("/list") @@ -46,18 +46,18 @@ public class EqFamilyController extends BaseController { } /** - * 导出【家庭管理】列表 + * 导出家庭管理列表 */ @SaCheckPermission("system:family:export") - @Log(title = "【家庭管理】", businessType = BusinessType.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 主键 */ @@ -69,10 +69,10 @@ public class EqFamilyController extends BaseController { } /** - * 新增【家庭管理】 + * 新增家庭管理 */ @SaCheckPermission("system:family:add") - @Log(title = "【家庭管理】", businessType = BusinessType.INSERT) + @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) + @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) + @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/app/EqHomeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/EqHomeController.java new file mode 100644 index 000000000..d24b14e07 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/EqHomeController.java @@ -0,0 +1,97 @@ +package org.dromara.system.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.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * app首页 + * + * @author Lion Li + * @date 2024-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/app/home") +public class EqHomeController extends BaseController { + + private final IEqAreaService eqAreaService; + + private final IEqAreaEquipmentService eqAreaEquipmentService; + + private final IEqEquipmentService eqEquipmentService; + + private final IEqShareService shareService; + private final ISysUserService userService; + + /** + * 查询家庭主体 + */ + @GetMapping("/familyList") + public R> familyList(){ + Long userId = LoginHelper.getUserId(); + SysUserVo sysUserVo = userService.selectUserById(userId); + EqShareVo firstVo = new EqShareVo(); + firstVo.setSharedUserId(sysUserVo.getUserId());//为了方便前端操作 统一放在被分享者字段中 + firstVo.setSharedUserName(sysUserVo.getNickName()); + + EqShareBo bo = new EqShareBo(); + bo.setSharedUserId(userId); + List eqShareVos = shareService.queryList(bo); + eqShareVos.add(0,firstVo); + + return R.ok(eqShareVos); + } + + /** + * 查询指定用户下分布列表 + */ + @GetMapping("/areaList") + public R> areaList(EqAreaBo bo){ + if (bo.getUserId() == null) throw new ServiceException("用户ID不能为空"); + return R.ok(eqAreaService.queryList(bo)); + } + + /** + * 首页查看设备列表 + */ + @GetMapping("/list") + public TableDataInfo list(EqAppHomeBo bo, PageQuery pageQuery){ + if (bo.getUserId() == null) throw new ServiceException("用户ID不能为空"); + //TODO 下面返回的状态可能会修改成实时状态 + 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/EqFamily.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqFamily.java index c650b22a2..c234fd174 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqFamily.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/EqFamily.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; import java.io.Serial; /** - * 【家庭管理】对象 eq_family + * 家庭管理对象 eq_family * * @author Lion Li * @date 2024-07-14 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAppHomeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAppHomeBo.java new file mode 100644 index 000000000..cc3dba0f2 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqAppHomeBo.java @@ -0,0 +1,22 @@ +package org.dromara.system.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 + * @Author : ZZC + * @Date : 2024/7/16 23:01 + * @Description : + **/ +@Data +public class EqAppHomeBo extends BaseEntity{ + private Long userId; + private Long areaId; + private Long equipmentId; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqFamilyBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqFamilyBo.java index 8d0e27ceb..9078ca85c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqFamilyBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/EqFamilyBo.java @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; /** - * 【家庭管理】业务对象 eq_family + * 家庭管理业务对象 eq_family * * @author Lion Li * @date 2024-07-14 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqFamilyVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqFamilyVo.java index febe9870e..6409babe9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqFamilyVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EqFamilyVo.java @@ -15,7 +15,7 @@ import java.util.Date; /** - * 【家庭管理】视图对象 eq_family + * 家庭管理视图对象 eq_family * * @author Lion Li * @date 2024-07-14 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 index e27b40859..ebda3f8cb 100644 --- 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 @@ -1,8 +1,18 @@ 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接口 @@ -12,4 +22,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ 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 index cd24abc54..dff7207b1 100644 --- 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 @@ -5,7 +5,7 @@ import org.dromara.system.domain.vo.EqFamilyVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** - * 【家庭管理】Mapper接口 + * 家庭管理Mapper接口 * * @author Lion Li * @date 2024-07-14 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 index 35ba2bd91..cfca68b08 100644 --- 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 @@ -1,9 +1,11 @@ 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; @@ -33,6 +35,14 @@ public interface IEqAreaEquipmentService { */ TableDataInfo queryPageList(EqAreaEquipmentBo bo, PageQuery pageQuery); + /** + * 查询用户分布设备关联列表详情 + * @param bo + * @param pageQuery + * @return + */ + TableDataInfo selectPageEquipmentList(EqAppHomeBo bo, PageQuery pageQuery); + /** * 查询符合条件的用户分布设备关联列表 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqFamilyService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqFamilyService.java index 9f1958db9..b2a70099c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqFamilyService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEqFamilyService.java @@ -9,7 +9,7 @@ import java.util.Collection; import java.util.List; /** - * 【家庭管理】Service接口 + * 家庭管理Service接口 * * @author Lion Li * @date 2024-07-14 @@ -17,48 +17,48 @@ import java.util.List; 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/impl/EqAreaEquipmentServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqAreaEquipmentServiceImpl.java index 1b9340be8..ee371e9f7 100644 --- 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 @@ -1,5 +1,7 @@ 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; @@ -8,6 +10,9 @@ 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; @@ -56,6 +61,13 @@ public class EqAreaEquipmentServiceImpl implements IEqAreaEquipmentService { 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); + } + /** * 查询符合条件的用户分布设备关联列表 * @@ -76,6 +88,12 @@ public class EqAreaEquipmentServiceImpl implements IEqAreaEquipmentService { return lqw; } + private QueryWrapper buildQueryEquipmentWrapper(EqAppHomeBo bo) { + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.eq(ObjectUtil.isNotNull(bo.getAreaId()), "ae.area_id", bo.getAreaId()); + return queryWrapper; + } + /** * 新增用户分布设备关联 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentServiceImpl.java index 27f594b69..041ffbbb3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqEquipmentServiceImpl.java @@ -77,6 +77,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { lqw.like(StringUtils.isNotBlank(bo.getEquipmentCode()), EqEquipment::getEquipmentCode, bo.getEquipmentCode()); lqw.eq(bo.getStatus() != null, EqEquipment::getStatus, bo.getStatus()); lqw.eq(bo.getLineStatus() != null, EqEquipment::getLineStatus, bo.getLineStatus()); + lqw.eq(bo.getCreateBy() != null, EqEquipment::getCreateBy, bo.getCreateBy()); return lqw; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqFamilyServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqFamilyServiceImpl.java index 435f8d838..a95860e87 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqFamilyServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EqFamilyServiceImpl.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.Collection; /** - * 【家庭管理】Service业务层处理 + * 家庭管理Service业务层处理 * * @author Lion Li * @date 2024-07-14 @@ -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/resources/mapper/EqAreaEquipmentMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaEquipmentMapper.xml index f8b0a6c6f..8300795b1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaEquipmentMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/EqAreaEquipmentMapper.xml @@ -4,4 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + +