diff --git a/admin/src/api/pmowner.js b/admin/src/api/pmowner.js new file mode 100644 index 0000000..669bfd2 --- /dev/null +++ b/admin/src/api/pmowner.js @@ -0,0 +1,62 @@ + +import request from '@/utils/request' + +/** + * 新增pmowner + * @param pram + */ +export function pmownerCreateApi(data) { + return request({ + url: 'autogencode/pmowner/save', + method: 'POST', + data + }) +} + +/** + * pmowner更新 + * @param pram + */ +export function pmownerUpdateApi(data) { + return request({ + url: 'autogencode/pmowner/update', + method: 'POST', + data + }) +} + +/** + * pmowner详情 + * @param pram + */ +export function pmownerDetailApi(id) { + return request({ + url: `autogencode/pmowner/info/${id}`, + method: 'GET' + }) +} + +/** + * pmowner删除 + * @param pram + */ +export function pmownerDeleteApi(id) { + return request({ + url: `autogencode/pmowner/delete/${id}`, + method: 'get' + }) +} + + +/** + * pmowner列表 + * @param pram + */ +export function pmownerListApi(params) { + return request({ + url: 'autogencode/pmowner/list', + method: 'GET', + params + }) +} + diff --git a/admin/src/api/pmownerhouserel.js b/admin/src/api/pmownerhouserel.js new file mode 100644 index 0000000..cc01be3 --- /dev/null +++ b/admin/src/api/pmownerhouserel.js @@ -0,0 +1,71 @@ +// +---------------------------------------------------------------------- +// | CRMEB [ CRMEB赋能开发者，助力企业发展 ] +// +---------------------------------------------------------------------- +// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved. +// +---------------------------------------------------------------------- +// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 +// +---------------------------------------------------------------------- +// | Author: CRMEB Team +// +---------------------------------------------------------------------- + +import request from '@/utils/request' + +/** + * 新增PmOwnerHouseRel + * @param pram + */ +export function PmOwnerHouseRelCreateApi(data) { + return request({ + url: 'autogencode/pmownerhouserel/save', + method: 'POST', + data + }) +} + +/** + * pmownerhouserel更新 + * @param pram + */ +export function pmownerhouserelUpdateApi(data) { + return request({ + url: 'autogencode/pmownerhouserel/update', + method: 'POST', + data + }) +} + +/** + * pmownerhouserel详情 + * @param pram + */ +export function pmownerhouserelDetailApi(id) { + return request({ + url: `autogencode/pmownerhouserel/info/${id}`, + method: 'GET' + }) +} + +/** + * pmownerhouserel删除 + * @param pram + */ +export function pmownerhouserelDeleteApi(id) { + return request({ + url: `autogencode/pmownerhouserel/delete/${id}`, + method: 'get' + }) +} + + +/** + * pmownerhouserel列表 + * @param pram + */ +export function pmownerhouserelListApi(params) { + return request({ + url: 'autogencode/pmownerhouserel/list', + method: 'GET', + params + }) +} + diff --git a/admin/src/components/uploadPicture/uploadFrom/index.vue b/admin/src/components/uploadPicture/uploadFrom/index.vue index 9de88ac..057c262 100644 --- a/admin/src/components/uploadPicture/uploadFrom/index.vue +++ b/admin/src/components/uploadPicture/uploadFrom/index.vue @@ -14,7 +14,7 @@ diff --git a/admin/src/views/pm/houser/pmownerhouserel-add-and-update.vue b/admin/src/views/pm/houser/pmownerhouserel-add-and-update.vue new file mode 100644 index 0000000..1351b1d --- /dev/null +++ b/admin/src/views/pm/houser/pmownerhouserel-add-and-update.vue @@ -0,0 +1,159 @@ + + + diff --git a/admin/src/views/pm/pmowner/index.vue b/admin/src/views/pm/pmowner/index.vue new file mode 100644 index 0000000..a413aef --- /dev/null +++ b/admin/src/views/pm/pmowner/index.vue @@ -0,0 +1,230 @@ + + + diff --git a/admin/src/views/pm/pmowner/pmowner-add-and-update.vue b/admin/src/views/pm/pmowner/pmowner-add-and-update.vue new file mode 100644 index 0000000..557fe0b --- /dev/null +++ b/admin/src/views/pm/pmowner/pmowner-add-and-update.vue @@ -0,0 +1,180 @@ + + + diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmOwnerController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmOwnerController.java new file mode 100644 index 0000000..7c3743f --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmOwnerController.java @@ -0,0 +1,198 @@ +package com.zbkj.modules.autogencode.controller; + +import java.util.Arrays; +import java.util.Map; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.response.CommonResult; +import com.zbkj.common.page.CommonPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; + + + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zbkj.modules.autogencode.entity.PmOwner; +import com.zbkj.modules.autogencode.service.PmOwnerService; + + + + +/** + * 业主信息表 控制器 + */ +@RestController +@RequestMapping("autogencode/pmowner") +public class PmOwnerController { + @Autowired + private PmOwnerService pmOwnerService; + + + + /** + * 条件设置 + * 根据实体类字段自动生成查询条件 + */ + private void condition(LambdaQueryWrapper queryWrapper, PmOwner request) { + if (request == null) { + return; + } + + // 根据实体类字段自动生成查询条件 + + // id + if (request.getId() != null) { + queryWrapper.eq(PmOwner::getId, request.getId()); + } + + // 业主姓名 + if (StrUtil.isNotBlank(request.getOwnerName())) { + queryWrapper.eq(PmOwner::getOwnerName, request.getOwnerName()); + } + + // 业主类型 + if (StrUtil.isNotBlank(request.getOwnerType())) { + queryWrapper.eq(PmOwner::getOwnerType, request.getOwnerType()); + } + + // 业主身份证 + if (StrUtil.isNotBlank(request.getOwnerIdcard())) { + queryWrapper.eq(PmOwner::getOwnerIdcard, request.getOwnerIdcard()); + } + + // 联系电话 + if (StrUtil.isNotBlank(request.getPhone())) { + queryWrapper.eq(PmOwner::getPhone, request.getPhone()); + } + + // 电子邮箱 + if (StrUtil.isNotBlank(request.getEmail())) { + queryWrapper.eq(PmOwner::getEmail, request.getEmail()); + } + + // 紧急联系人 + if (StrUtil.isNotBlank(request.getEmergencyContact())) { + queryWrapper.eq(PmOwner::getEmergencyContact, request.getEmergencyContact()); + } + + // 紧急联系电话 + if (StrUtil.isNotBlank(request.getEmergencyPhone())) { + queryWrapper.eq(PmOwner::getEmergencyPhone, request.getEmergencyPhone()); + } + + // 业主状态 + if (StrUtil.isNotBlank(request.getStatus())) { + queryWrapper.eq(PmOwner::getStatus, request.getStatus()); + } + + // 备注 + if (StrUtil.isNotBlank(request.getRemark())) { + queryWrapper.eq(PmOwner::getRemark, request.getRemark()); + } + + // 删除标志（0代表存在 2代表删除） + if (StrUtil.isNotBlank(request.getDelFlag())) { + queryWrapper.eq(PmOwner::getDelFlag, request.getDelFlag()); + } + + // 创建部门 + if (request.getCreateDept() != null) { + queryWrapper.eq(PmOwner::getCreateDept, request.getCreateDept()); + } + + // 创建人 + if (request.getCreateBy() != null) { + queryWrapper.eq(PmOwner::getCreateBy, request.getCreateBy()); + } + + // 创建时间 + if (request.getCreateTime() != null) { + queryWrapper.eq(PmOwner::getCreateTime, request.getCreateTime()); + } + + // 修改人 + if (request.getUpdateBy() != null) { + queryWrapper.eq(PmOwner::getUpdateBy, request.getUpdateBy()); + } + + // 修改时间 + if (request.getUpdateTime() != null) { + queryWrapper.eq(PmOwner::getUpdateTime, request.getUpdateTime()); + } + + // 租户ID + if (StrUtil.isNotBlank(request.getTenantId())) { + queryWrapper.eq(PmOwner::getTenantId, request.getTenantId()); + } + + } + + + /** + * 分页显示业主信息表 + * @param request 搜索条件 + * @param pageParamRequest 分页参数 + */ + @ApiOperation(value = "分页列表") + @RequestMapping(value = "/list", method = RequestMethod.GET) + public CommonResult> getList(@Validated PmOwner request, @Validated PageParamRequest pageParamRequest) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + + // 应用搜索条件 + condition(queryWrapper, request); + + CommonPage page = CommonPage.restPage(pmOwnerService.pageList(queryWrapper, pageParamRequest)); + return CommonResult.success(page); + } + + + /** + * 详情数据 + */ + @RequestMapping("/info/{id}") + public CommonResult info(@PathVariable("id") Long id){ + PmOwner pmOwner = pmOwnerService.getById(id); + + return CommonResult.success(pmOwner); + } + + /** + * 新增数据 + */ + @RequestMapping("/save") + public CommonResult save(@RequestBody PmOwner pmOwner){ + if (pmOwnerService.save(pmOwner)) { + return CommonResult.success(); + } + return CommonResult.failed(); + } + + /** + * 修改数据 + */ + @RequestMapping("/update") + public CommonResult update(@RequestBody PmOwner pmOwner){ + if (pmOwnerService.updateById(pmOwner)) { + return CommonResult.success(); + } + return CommonResult.failed(); + } + + /** + * 删除:根据id集合 + */ + @RequestMapping("/delete") + public CommonResult delete(@RequestBody Long[] ids){ + if (pmOwnerService.removeByIds(Arrays.asList(ids))) { + return CommonResult.success(); + } + return CommonResult.failed(); + } + +} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmOwnerHouseRelController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmOwnerHouseRelController.java new file mode 100644 index 0000000..e568065 --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmOwnerHouseRelController.java @@ -0,0 +1,128 @@ +package com.zbkj.modules.autogencode.controller; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.response.CommonResult; +import com.zbkj.common.page.CommonPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import com.zbkj.modules.autogencode.entity.PmOwnerHouseRel; +import com.zbkj.modules.autogencode.service.PmOwnerHouseRelService; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + * 业主房屋关联表 控制器 + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: 大粽子 + * +---------------------------------------------------------------------- + * ｜ @date Thu Oct 09 15:29:10 CST 2025 + * +---------------------------------------------------------------------- + * ｜ @date stivepeim@outlook.com + * +---------------------------------------------------------------------- + */ +@RestController +@RequestMapping("api/autogencode/pmownerhouserel") +public class PmOwnerHouseRelController { + @Autowired + private PmOwnerHouseRelService pmOwnerHouseRelService; + + + + /** + * 分页显示业主房屋关联列表 + * @param request 搜索条件 + * @param pageParamRequest 分页参数 + */ + @RequestMapping(value = "/list", method = RequestMethod.GET) + public CommonResult> getList(@Validated PmOwnerHouseRel request, @Validated PageParamRequest pageParamRequest){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + + // 应用搜索条件 + condition(queryWrapper, request); + + CommonPage storeProductRuleCommonPage = + CommonPage.restPage(pmOwnerHouseRelService.pageList(queryWrapper, pageParamRequest)); + return CommonResult.success(storeProductRuleCommonPage); + } + + + /** + * 详情数据 + */ + @RequestMapping("/info/{id}") + public CommonResult info(@PathVariable("id") Long id){ + PmOwnerHouseRel pmOwnerHouseRel = pmOwnerHouseRelService.getById(id); + + return CommonResult.success(pmOwnerHouseRel); + } + + /** + * 新增数据 + */ + @RequestMapping(value = "/save", method = RequestMethod.POST) + public CommonResult save(@RequestBody PmOwnerHouseRel pmOwnerHouseRel){ + if (pmOwnerHouseRelService.save(pmOwnerHouseRel)) { + return CommonResult.success(); + } + return CommonResult.failed(); + } + + /** + * 修改数据 + */ + @RequestMapping("/update") + public CommonResult update(@RequestBody PmOwnerHouseRel pmOwnerHouseRel){ + if (pmOwnerHouseRelService.updateById(pmOwnerHouseRel)) { + return CommonResult.success(); + } + return CommonResult.failed(); + } + + /** + * 删除:根据id集合 + */ + @RequestMapping("/delete") + public CommonResult delete(@RequestBody Long[] ids){ + if (pmOwnerHouseRelService.removeByIds(Arrays.asList(ids))) { + return CommonResult.success(); + } + return CommonResult.failed(); + } + + + /** + * 条件设置 + */ + private void condition(LambdaQueryWrapper queryWrapper, PmOwnerHouseRel request) { + if (request.getId() != null) { + queryWrapper.eq(PmOwnerHouseRel::getId, request.getId()); + } + if (request.getOwnerId() != null) { + queryWrapper.eq(PmOwnerHouseRel::getOwnerId, request.getOwnerId()); + } + if (request.getHouseId() != null) { + queryWrapper.eq(PmOwnerHouseRel::getHouseId, request.getHouseId()); + } + if (StrUtil.isNotBlank(request.getRelType())) { + queryWrapper.eq(PmOwnerHouseRel::getRelType, request.getRelType()); + } + // 按创建时间降序排序 + queryWrapper.orderByDesc(PmOwnerHouseRel::getCreateTime); + } + + +} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/PmOwnerDao.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/PmOwnerDao.java new file mode 100644 index 0000000..dc6ff39 --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/PmOwnerDao.java @@ -0,0 +1,13 @@ +package com.zbkj.modules.autogencode.dao; + +import com.zbkj.modules.autogencode.entity.PmOwner; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 业主信息表 DAO 映射层 + */ +@Mapper +public interface PmOwnerDao extends BaseMapper { + +} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/PmOwnerHouseRelDao.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/PmOwnerHouseRelDao.java new file mode 100644 index 0000000..a0c3ad8 --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/PmOwnerHouseRelDao.java @@ -0,0 +1,11 @@ +package com.zbkj.modules.autogencode.dao; + +import com.zbkj.modules.autogencode.entity.PmOwnerHouseRel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + + +@Mapper +public interface PmOwnerHouseRelDao extends BaseMapper { + +} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmOwner.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmOwner.java new file mode 100644 index 0000000..19cd8d1 --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmOwner.java @@ -0,0 +1,104 @@ +package com.zbkj.modules.autogencode.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +@Data +@TableName("pm_owner") +public class PmOwner implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ApiModelProperty(value = "id") + @TableId + private Long id; + /** + * 业主姓名 + */ + @ApiModelProperty(value = "业主姓名") + private String ownerName; + /** + * 业主类型 + */ + @ApiModelProperty(value = "业主类型") + private String ownerType; + /** + * 业主身份证 + */ + @ApiModelProperty(value = "业主身份证") + private String ownerIdcard; + /** + * 联系电话 + */ + @ApiModelProperty(value = "联系电话") + private String phone; + /** + * 电子邮箱 + */ + @ApiModelProperty(value = "电子邮箱") + private String email; + /** + * 紧急联系人 + */ + @ApiModelProperty(value = "紧急联系人") + private String emergencyContact; + /** + * 紧急联系电话 + */ + @ApiModelProperty(value = "紧急联系电话") + private String emergencyPhone; + /** + * 业主状态 + */ + @ApiModelProperty(value = "业主状态") + private String status; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）") + private String delFlag; + /** + * 创建部门 + */ + @ApiModelProperty(value = "创建部门") + private Long createDept; + /** + * 创建人 + */ + @ApiModelProperty(value = "创建人") + private Long createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + /** + * 修改人 + */ + @ApiModelProperty(value = "修改人") + private Long updateBy; + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间") + private Date updateTime; + /** + * 租户ID + */ + @ApiModelProperty(value = "租户ID") + private String tenantId; + +} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmOwnerHouseRel.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmOwnerHouseRel.java new file mode 100644 index 0000000..49a8431 --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmOwnerHouseRel.java @@ -0,0 +1,89 @@ +package com.zbkj.modules.autogencode.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + + import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 业主房屋关联表 Entity 实体类 + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * @author: 大粽子 + * +---------------------------------------------------------------------- + * @date Thu Oct 09 15:29:10 CST 2025 + * +---------------------------------------------------------------------- + * @email stivepeim@outlook.com + * +---------------------------------------------------------------------- + */ +@Data +@TableName("pm_owner_house_rel") +public class PmOwnerHouseRel implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 业主id + */ + private Long ownerId; + /** + * 房屋id + */ + private Long houseId; + /** + * 关联类型 + */ + private String relType; + /** + * 绑定时间 + */ + private Date bindTime; + /** + * 解绑时间 + */ + private Date unbindTime; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; + /** + * 创建部门 + */ + private Long createDept; + /** + * 创建人 + */ + private Long createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 修改人 + */ + private Long updateBy; + /** + * 修改时间 + */ + private Date updateTime; + /** + * 租户ID + */ + private String tenantId; + +} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/PmOwnerHouseRelService.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/PmOwnerHouseRelService.java new file mode 100644 index 0000000..9776530 --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/PmOwnerHouseRelService.java @@ -0,0 +1,50 @@ +/* + * @Author: zxf 1532322479@qq.com + * @Date: 2025-10-10 08:38:04 + * @LastEditors: zxf 1532322479@qq.com + * @LastEditTime: 2025-10-10 09:43:58 + * @FilePath: \crmebTwo\crmeb\crmeb-admin\src\main\java\com\zbkj\modules\autogencode\service\PmOwnerHouseRelService.java + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ +package com.zbkj.modules.autogencode.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.zbkj.modules.autogencode.entity.PmOwnerHouseRel; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; + +import java.util.List; +import java.util.Map; + +/** + * 业主房屋关联表 业务接口 + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * @author: 大粽子 + * +---------------------------------------------------------------------- + * @date Thu Oct 09 15:29:10 CST 2025 + * +---------------------------------------------------------------------- + * @email stivepeim@outlook.com + * +---------------------------------------------------------------------- + */ +public interface PmOwnerHouseRelService extends IService { + + + /** + * 带分页参数的列表查询 + * @param queryWrapper 查询条件 + * @param pageParamRequest 分页参数 + * @return List 查询结果 + */ + List pageList(LambdaQueryWrapper queryWrapper, PageParamRequest pageParamRequest); + + +} + diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/PmOwnerService.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/PmOwnerService.java new file mode 100644 index 0000000..070faae --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/PmOwnerService.java @@ -0,0 +1,25 @@ +package com.zbkj.modules.autogencode.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zbkj.modules.autogencode.entity.PmOwner; +import com.zbkj.common.request.PageParamRequest; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + + +import java.util.List; +import java.util.Map; + +/** + * 业主信息表 业务接口 + * +---------------------------------------------------------------------- + */ +public interface PmOwnerService extends IService { + + /** + * PmOwner 列表查询 + * @param pageParamRequest 分页参数对象 + * @return + */ + List pageList(LambdaQueryWrapper queryWrapper, PageParamRequest pageParamRequest); +} + diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/PmOwnerHouseRelServiceImpl.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/PmOwnerHouseRelServiceImpl.java new file mode 100644 index 0000000..ff12108 --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/PmOwnerHouseRelServiceImpl.java @@ -0,0 +1,44 @@ +package com.zbkj.modules.autogencode.service.impl; + +import com.github.pagehelper.PageHelper; +import com.zbkj.common.model.product.StoreProductRule; +import com.zbkj.service.dao.StoreProductRuleDao; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import com.zbkj.modules.autogencode.dao.PmOwnerHouseRelDao; +import com.zbkj.modules.autogencode.entity.PmOwnerHouseRel; +import com.zbkj.modules.autogencode.service.PmOwnerHouseRelService; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; + +import javax.annotation.Resource; +import java.util.Map; +import java.util.Arrays; +import java.util.List; + + +@Service("pmOwnerHouseRelService") +public class PmOwnerHouseRelServiceImpl extends ServiceImpl implements PmOwnerHouseRelService { + + + @Resource + private PmOwnerHouseRelDao dao; + + + /** + * 带分页参数的列表查询实现 + */ + @Override + public List pageList(LambdaQueryWrapper queryWrapper, PageParamRequest pageParamRequest) { + + PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); + + return dao.selectList(queryWrapper); + } + + +} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/PmOwnerServiceImpl.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/PmOwnerServiceImpl.java new file mode 100644 index 0000000..c0e027a --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/PmOwnerServiceImpl.java @@ -0,0 +1,42 @@ +package com.zbkj.modules.autogencode.service.impl; + +import com.github.pagehelper.PageHelper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import com.zbkj.modules.autogencode.dao.PmOwnerDao; +import com.zbkj.modules.autogencode.entity.PmOwner; +import com.zbkj.modules.autogencode.service.PmOwnerService; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; + +import javax.annotation.Resource; +import java.util.Map; +import java.util.Arrays; +import java.util.List; + + +@Service("pmOwnerService") +public class PmOwnerServiceImpl extends ServiceImpl implements PmOwnerService { + + + @Resource + private PmOwnerDao dao; + + + /** + * 带分页参数的列表查询实现 + */ + @Override + public List pageList(LambdaQueryWrapper queryWrapper, PageParamRequest pageParamRequest) { + + PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); + + return dao.selectList(queryWrapper); + } + + +} diff --git a/crmeb/crmeb-admin/src/main/resources/mapper/autogencode/PmOwnerDao.xml b/crmeb/crmeb-admin/src/main/resources/mapper/autogencode/PmOwnerDao.xml new file mode 100644 index 0000000..609b369 --- /dev/null +++ b/crmeb/crmeb-admin/src/main/resources/mapper/autogencode/PmOwnerDao.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodeUtils.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodeUtils.java index ebe2e72..efb1712 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodeUtils.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodeUtils.java @@ -195,7 +195,7 @@ public class GenCodeUtils { } if (template.contains("Entity.java.vm")) { - return packagePath + "entity" + File.separator + className + "Entity.java"; + return packagePath + "entity" + File.separator + className + ".java"; } if (template.contains("Dao.java.vm")) { @@ -224,7 +224,7 @@ public class GenCodeUtils { if (template.contains("index.vue.vm")) { return "main" + File.separator + "resources" + File.separator + "src" + File.separator + "views" + File.separator + "modules" + - File.separator + moduleName + File.separator + className.toLowerCase() + ".vue"; + File.separator + moduleName + File.separator + "index.vue"; } if (template.contains("api.js.vm")) { diff --git a/crmeb/crmeb-service/src/main/resources/template/java/Controller.java.vm b/crmeb/crmeb-service/src/main/resources/template/java/Controller.java.vm index 5615872..b12c384 100644 --- a/crmeb/crmeb-service/src/main/resources/template/java/Controller.java.vm +++ b/crmeb/crmeb-service/src/main/resources/template/java/Controller.java.vm @@ -3,37 +3,29 @@ package ${package}.${moduleName}.controller; import java.util.Arrays; import java.util.Map; -import org.apache.shiro.authz.annotation.RequiresPermissions; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.response.CommonResult; +import com.zbkj.common.page.CommonPage; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; -import ${package}.${moduleName}.entity.${className}Entity; + + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import ${package}.${moduleName}.entity.${className}; import ${package}.${moduleName}.service.${className}Service; -import ${mainPath}.common.utils.PageUtils; -import ${mainPath}.common.utils.R; /** * ${comments} 控制器 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: ${author} - * +---------------------------------------------------------------------- - * ｜ @date ${datetime} - * +---------------------------------------------------------------------- - * ｜ @date ${email} - * +---------------------------------------------------------------------- */ @RestController @RequestMapping("${moduleName}/${pathName}") @@ -41,14 +33,53 @@ public class ${className}Controller { @Autowired private ${className}Service ${classname}Service; + + /** - * 列表信息 + * 条件设置 + * 根据实体类字段自动生成查询条件 */ - @RequestMapping("/list") - @PreAuthorize("${moduleName}:${pathName}:list") - public CommonResult> list(@RequestParam Map params){ - CommonPage<${classname}> page = CommonPage.restPag(${classname}Service.queryPage(params)); + private void condition(LambdaQueryWrapper<${className}> queryWrapper, ${className} request) { + if (request == null) { + return; + } + + // 根据实体类字段自动生成查询条件 + #foreach ($column in $columns) + #set ($getter = "get" + ${column.attrname.substring(0, 1).toUpperCase()} + ${column.attrname.substring(1)}) + #set ($fieldType = $column.attrType) + #if ($fieldType == "String") + + // $column.comments + if (StrUtil.isNotBlank(request.${getter}())) { + queryWrapper.eq(${className}::${getter}, request.${getter}()); + } + #else + // $column.comments + if (request.${getter}() != null) { + queryWrapper.eq(${className}::${getter}, request.${getter}()); + } + #end + #end + + } + + + /** + * 分页显示${comments} + * @param request 搜索条件 + * @param pageParamRequest 分页参数 + */ + @ApiOperation(value = "分页列表") + @RequestMapping(value = "/list", method = RequestMethod.GET) + public CommonResult> getList(@Validated ${className} request, @Validated PageParamRequest pageParamRequest) { + LambdaQueryWrapper<${className}> queryWrapper = new LambdaQueryWrapper(); + + // 应用搜索条件 + condition(queryWrapper, request); + + CommonPage<${className}> page = CommonPage.restPage(${classname}Service.pageList(queryWrapper, pageParamRequest)); return CommonResult.success(page); } @@ -57,9 +88,8 @@ public class ${className}Controller { * 详情数据 */ @RequestMapping("/info/{${pk.attrname}}") - @PreAuthorize("${moduleName}:${pathName}:info") - public CommonResult<${classname}> info(@PathVariable("${pk.attrname}") ${pk.attrType} ${pk.attrname}){ - ${className}Entity ${classname} = ${classname}Service.getById(${pk.attrname}); + public CommonResult<${className}> info(@PathVariable("${pk.attrname}") ${pk.attrType} ${pk.attrname}){ + ${className} ${classname} = ${classname}Service.getById(${pk.attrname}); return CommonResult.success(${classname}); } @@ -68,8 +98,7 @@ public class ${className}Controller { * 新增数据 */ @RequestMapping("/save") - @PreAuthorize("${moduleName}:${pathName}:save") - public CommonResult save(@RequestBody ${className}Entity ${classname}){ + public CommonResult save(@RequestBody ${className} ${classname}){ if (${classname}Service.save(${classname})) { return CommonResult.success(); } @@ -80,8 +109,7 @@ public class ${className}Controller { * 修改数据 */ @RequestMapping("/update") - @PreAuthorize("${moduleName}:${pathName}:update") - public CommonResult update(@RequestBody ${className}Entity ${classname}){ + public CommonResult update(@RequestBody ${className} ${classname}){ if (${classname}Service.updateById(${classname})) { return CommonResult.success(); } @@ -92,9 +120,8 @@ public class ${className}Controller { * 删除:根据id集合 */ @RequestMapping("/delete") - @PreAuthorize("${moduleName}:${pathName}:delete") public CommonResult delete(@RequestBody ${pk.attrType}[] ${pk.attrname}s){ - if (${classname}Service.removeByIds(Arrays.asList(${pk.attrname}))) { + if (${classname}Service.removeByIds(Arrays.asList(${pk.attrname}s))) { return CommonResult.success(); } return CommonResult.failed(); diff --git a/crmeb/crmeb-service/src/main/resources/template/java/Dao.java.vm b/crmeb/crmeb-service/src/main/resources/template/java/Dao.java.vm index 56a70dc..aacf891 100644 --- a/crmeb/crmeb-service/src/main/resources/template/java/Dao.java.vm +++ b/crmeb/crmeb-service/src/main/resources/template/java/Dao.java.vm @@ -1,26 +1,13 @@ package ${package}.${moduleName}.dao; -import ${package}.${moduleName}.entity.${className}Entity; +import ${package}.${moduleName}.entity.${className}; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; /** * ${comments} DAO 映射层 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * @author: ${author} - * +---------------------------------------------------------------------- - * @date ${datetime} - * +---------------------------------------------------------------------- - * @email ${email} - * +---------------------------------------------------------------------- */ @Mapper -public interface ${className}Dao extends BaseMapper<${className}Entity> { +public interface ${className}Dao extends BaseMapper<${className}> { } diff --git a/crmeb/crmeb-service/src/main/resources/template/java/Entity.java.vm b/crmeb/crmeb-service/src/main/resources/template/java/Entity.java.vm index d48b625..1285974 100644 --- a/crmeb/crmeb-service/src/main/resources/template/java/Entity.java.vm +++ b/crmeb/crmeb-service/src/main/resources/template/java/Entity.java.vm @@ -2,43 +2,30 @@ package ${package}.${moduleName}.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; #if(${hasBigDecimal}) - import java.math.BigDecimal; +import java.math.BigDecimal; #end import java.io.Serializable; import java.util.Date; import lombok.Data; -/** - * ${comments} Entity 实体类 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * @author: ${author} - * +---------------------------------------------------------------------- - * @date ${datetime} - * +---------------------------------------------------------------------- - * @email ${email} - * +---------------------------------------------------------------------- - */ + @Data @TableName("${tableName}") -public class ${className}Entity implements Serializable { +public class ${className} implements Serializable { private static final long serialVersionUID = 1L; - #foreach ($column in $columns) - /** - * $column.comments - */ - #if($column.columnName == $pk.columnName) - @TableId - #end - private $column.attrType $column.attrname; +#foreach ($column in $columns) + /** + * $column.comments + */ + @ApiModelProperty(value = "$column.comments") + #if($column.columnName == $pk.columnName) + @TableId #end +private $column.attrType $column.attrname; +#end } diff --git a/crmeb/crmeb-service/src/main/resources/template/java/Service.java.vm b/crmeb/crmeb-service/src/main/resources/template/java/Service.java.vm index 2244ed8..87976e5 100644 --- a/crmeb/crmeb-service/src/main/resources/template/java/Service.java.vm +++ b/crmeb/crmeb-service/src/main/resources/template/java/Service.java.vm @@ -1,35 +1,25 @@ package ${package}.${moduleName}.service; import com.baomidou.mybatisplus.extension.service.IService; -import ${mainPath}.common.utils.PageUtils; -import ${package}.${moduleName}.entity.${className}Entity; +import ${package}.${moduleName}.entity.${className}; +import com.zbkj.common.request.PageParamRequest; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +import java.util.List; import java.util.Map; /** * ${comments} 业务接口 * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * @author: ${author} - * +---------------------------------------------------------------------- - * @date ${datetime} - * +---------------------------------------------------------------------- - * @email ${email} - * +---------------------------------------------------------------------- */ -public interface ${className}Service extends IService<${className}Entity> { +public interface ${className}Service extends IService<${className}> { /** * ${className} 列表查询 - * @param request 默认是是体类 根据自己需求修改或者创建自己的request * @param pageParamRequest 分页参数对象 * @return */ - List<${className}> getList(${className}Entity request, PageParamRequest pageParamRequest) + List<${className}> pageList(LambdaQueryWrapper<${className}> queryWrapper, PageParamRequest pageParamRequest); } diff --git a/crmeb/crmeb-service/src/main/resources/template/java/ServiceImpl.java.vm b/crmeb/crmeb-service/src/main/resources/template/java/ServiceImpl.java.vm index f7f928b..47c24c4 100644 --- a/crmeb/crmeb-service/src/main/resources/template/java/ServiceImpl.java.vm +++ b/crmeb/crmeb-service/src/main/resources/template/java/ServiceImpl.java.vm @@ -1,54 +1,42 @@ package ${package}.${moduleName}.service.impl; -import org.springframework.stereotype.Service; -import java.util.Map; -import com.baomidou.mybatisplus.core.conditions.pageQueryUtils.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.pagehelper.PageHelper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ${mainPath}.common.utils.PageUtils; -import ${mainPath}.common.utils.Query; +import org.springframework.stereotype.Service; import ${package}.${moduleName}.dao.${className}Dao; -import ${package}.${moduleName}.entity.${className}Entity; +import ${package}.${moduleName}.entity.${className}; import ${package}.${moduleName}.service.${className}Service; +import ${mainPath}.common.page.CommonPage; +import ${mainPath}.common.request.PageParamRequest; +import javax.annotation.Resource; +import java.util.Map; +import java.util.Arrays; +import java.util.List; -/** - * ${comments} 接口实现类 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * @author: ${author} - * +---------------------------------------------------------------------- - * @date ${datetime} - * +---------------------------------------------------------------------- - * @email ${email} - * +---------------------------------------------------------------------- - */ @Service("${classname}Service") -public class ${className}ServiceImpl extends ServiceImpl<${className}Dao, ${className}Entity> implements ${className}Service { +public class ${className}ServiceImpl extends ServiceImpl<${className}Dao, ${className}> implements ${className}Service { + + @Resource + private ${className}Dao dao; + + /** - * ${className}列表查询 - * @param request 默认是是体类 根据自己需求修改或者创建自己的request - * @param pageParamRequest 分页参数对象 - * @return + * 带分页参数的列表查询实现 */ @Override - public PageUtils queryPage(${className}Entity request, PageParamRequest pageParamRequest) { - PageHelper.startPage(pageParamRequest.getPageNum(), pageParamRequest.getPageSize()); - - //列表查询 ${className} 类的多条件查询 - LambdaQueryWrapper<${className}> lambdaQueryWrapper = new LambdaQueryWrapper<>(); - ${className} model = new ${className}(); - BeanUtils.copyProperties(request, model); - lambdaQueryWrapper.setEntity(model); - return dao.selectList(lambdaQueryWrapper); + public List<${className}> pageList(LambdaQueryWrapper<${className}> queryWrapper, PageParamRequest pageParamRequest) { + + PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); + + return dao.selectList(queryWrapper); } + } diff --git a/crmeb/crmeb-service/src/main/resources/template/vue/api.js.vm b/crmeb/crmeb-service/src/main/resources/template/vue/api.js.vm index d956d2e..c8ada32 100644 --- a/crmeb/crmeb-service/src/main/resources/template/vue/api.js.vm +++ b/crmeb/crmeb-service/src/main/resources/template/vue/api.js.vm @@ -1,12 +1,3 @@ -// +---------------------------------------------------------------------- -// | CRMEB [ CRMEB赋能开发者，助力企业发展 ] -// +---------------------------------------------------------------------- -// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved. -// +---------------------------------------------------------------------- -// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 -// +---------------------------------------------------------------------- -// | Author: CRMEB Team -// +---------------------------------------------------------------------- import request from '@/utils/request' diff --git a/crmeb/crmeb-service/src/main/resources/template/xml/Dao.xml.vm b/crmeb/crmeb-service/src/main/resources/template/xml/Dao.xml.vm index eba2268..e758c4e 100644 --- a/crmeb/crmeb-service/src/main/resources/template/xml/Dao.xml.vm +++ b/crmeb/crmeb-service/src/main/resources/template/xml/Dao.xml.vm @@ -4,7 +4,7 @@ - + #foreach($column in $columns) #end