From d2d117af365b52fb25c544fbcef580f92ae6321f Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 21 一月 2025 14:51:21 +0800 Subject: [PATCH] 租户管理 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 5 + ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java | 8 ++ ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 34 ++++++++++ ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java | 20 ------ ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java | 18 ++++- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java | 12 ++++ ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java | 9 +++ ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java | 14 ++++ ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml | 19 ++++++ 9 files changed, 113 insertions(+), 26 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java index 602f5d8..175648d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java @@ -1,9 +1,19 @@ package com.ruoyi.web.controller.api; -import org.springframework.web.bind.annotation.RequestMapping; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.model.TContract; +import com.ruoyi.system.model.TTenant; +import com.ruoyi.system.query.TTenantQuery; +import com.ruoyi.system.service.TContractService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; +import java.util.List; /** * <p> @@ -13,9 +23,29 @@ * @author xiaochen * @since 2025-01-17 */ +@Api(tags = "合同管理") @RestController @RequestMapping("/t-contract") public class TContractController { + private final TContractService contractService; + + @Autowired + public TContractController(TContractService contractService) { + this.contractService = contractService; + } + + + /** + * 查询用户合同列表 + */ + @ApiOperation(value = "查询用户合同列表") + @GetMapping(value = "/queryListByTenantId") + public AjaxResult<PageInfo<TTenant>> queryListByTenantId(@RequestParam String tenantId) { + List<TContract> list = contractService.list(Wrappers.lambdaQuery(TContract.class) + .eq(TContract::getTenantId, tenantId)); + return AjaxResult.success(list); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java index 31b8618..10fe7a4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java @@ -5,6 +5,8 @@ import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.dto.TTenantDTO; import com.ruoyi.system.model.TTenant; import com.ruoyi.system.query.TTenantQuery; @@ -39,11 +41,11 @@ /** * 获取租户管理列表 */ -// @ApiOperation(value = "获取租户分页列表") -// @PostMapping(value = "/pageList") -// public AjaxResult<PageInfo<TTenant>> pageList(@RequestBody TTenantQuery query) { -// return AjaxResult.success(tenantService.pageList(query)); -// } + @ApiOperation(value = "获取租户分页列表") + @PostMapping(value = "/pageList") + public AjaxResult<PageInfo<TTenant>> pageList(@RequestBody TTenantQuery query) { + return AjaxResult.success(tenantService.pageList(query)); + } /** * 添加租户管理 @@ -52,6 +54,8 @@ @ApiOperation(value = "添加租户") @PostMapping(value = "/add") public AjaxResult<Boolean> add(@Validated @RequestBody TTenantDTO dto) { + // 密码加密 + dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword())); return AjaxResult.success(tenantService.save(dto)); } @@ -62,6 +66,10 @@ @ApiOperation(value = "修改租户") @PostMapping(value = "/update") public AjaxResult<Boolean> update(@Validated @RequestBody TTenantDTO dto) { + // 密码加密 + if(StringUtils.isNotBlank(dto.getPassword())){ + dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword())); + } return AjaxResult.success(tenantService.updateById(dto)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index d8f207d..18f47f7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -3,6 +3,9 @@ import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -30,6 +33,7 @@ * * @author ruoyi */ +@Api(tags = "数据字典信息") @RestController @RequestMapping("/system/dict/data") public class SysDictDataController extends BaseController @@ -72,6 +76,7 @@ /** * 根据字典类型查询字典数据信息 */ + @ApiOperation(value = "根据字典类型查询字典数据信息") @GetMapping(value = "/type/{dictType}") public AjaxResult dictType(@PathVariable String dictType) { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java index 97e7d37..5a5ce48 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java @@ -57,23 +57,7 @@ */ CLEAN, /** - * 现场作业修改时间 + * 查询 */ - UPDATETIME, - /** - * 现场作业修改经理 - */ - UPDATEMANAGER, - /** - * 现场作业修改负责人 - */ - UPDATEHEADER, - /** - * 现场作业修改人员 - */ - UPDATEUSERADD, - /** - * 现场作业修改人员 - */ - UPDATEUSERREMOVE, + SELECT, } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java index 6eb7042..8bf23ff 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java @@ -1,7 +1,12 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TTenant; +import com.ruoyi.system.query.TTenantQuery; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * <p> @@ -13,4 +18,13 @@ */ public interface TTenantMapper extends BaseMapper<TTenant> { + /** + * 获取租户分页列表 + * @param query + * @param pageInfo + * @return + */ + List<TTenant> pageList(@Param("query") TTenantQuery query, @Param("pageInfo")PageInfo<TTenant> pageInfo); + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java index c0b8fb4..7ec52d0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java @@ -90,4 +90,13 @@ @TableField("mail_address") private String mailAddress; + @ApiModelProperty(value = "登录账号") + @NotBlank(message = "登录账号不能为空") + @TableField("account") + private String account; + + @ApiModelProperty(value = "登录密码") + @TableField("password") + private String password; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java index 992fb71..883c195 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java @@ -1,7 +1,9 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TTenant; +import com.ruoyi.system.query.TTenantQuery; /** * <p> @@ -13,4 +15,10 @@ */ public interface TTenantService extends IService<TTenant> { + /** + * 获取租户分页列表 + * @param query + * @return + */ + PageInfo<TTenant> pageList(TTenantQuery query); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java index 700c385..068a061 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java @@ -1,10 +1,15 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.mapper.TTenantMapper; import com.ruoyi.system.model.TTenant; +import com.ruoyi.system.query.TTenantQuery; import com.ruoyi.system.service.TTenantService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.system.vo.SysUserVO; import org.springframework.stereotype.Service; + +import java.util.List; /** * <p> @@ -17,4 +22,11 @@ @Service public class TTenantServiceImpl extends ServiceImpl<TTenantMapper, TTenant> implements TTenantService { + @Override + public PageInfo<TTenant> pageList(TTenantQuery query) { + PageInfo<TTenant> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + List<TTenant> list = this.baseMapper.pageList(query,pageInfo); + pageInfo.setRecords(list); + return pageInfo; + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml index 24ecc4b..96f74cc 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml @@ -22,11 +22,28 @@ <result column="create_by" property="createBy" /> <result column="update_by" property="updateBy" /> <result column="disabled" property="disabled" /> + <result column="account" property="account" /> + <result column="password" property="password" /> </resultMap> <!-- 通用查询结果列 --> <sql id="Base_Column_List"> - id, resident_name, checkIn_time, tenant_attributes, tenant_type, tenant_building, room_number, building_area, phone, id_card, email, bank_number, mail_address, create_time, update_time, create_by, update_by, disabled + id, resident_name, checkIn_time, tenant_attributes, tenant_type, tenant_building, room_number, building_area, phone, id_card, email, + bank_number, mail_address, create_time, update_time, create_by, update_by, disabled,account,password </sql> + <select id="pageList" resultType="com.ruoyi.system.model.TTenant"> + SELECT <include refid="Base_Column_List"/> + FROM t_tenant + <where> + <if test="residentName != null and residentName != ''"> + AND resident_name LIKE concat('%',#{residentName},'%') + </if> + <if test="phone != null and phone != ''"> + AND phone LIKE concat('%',#{phone},'%') + </if> + AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} + </where> + ORDER BY create_time DESC + </select> </mapper> -- Gitblit v1.7.1