diff --git a/admin/src/api/pmownerhouserel.js b/admin/src/api/pmownerhouserel.js index cc01be3..7c7bc73 100644 --- a/admin/src/api/pmownerhouserel.js +++ b/admin/src/api/pmownerhouserel.js @@ -14,9 +14,9 @@ import request from '@/utils/request' * 新增PmOwnerHouseRel * @param pram */ -export function PmOwnerHouseRelCreateApi(data) { +export function pmownerhouserelCreateApi(data) { return request({ - url: 'autogencode/pmownerhouserel/save', + url: '/autogencode/pmownerhouserel/save', method: 'POST', data }) @@ -28,7 +28,7 @@ export function PmOwnerHouseRelCreateApi(data) { */ export function pmownerhouserelUpdateApi(data) { return request({ - url: 'autogencode/pmownerhouserel/update', + url: '/autogencode/pmownerhouserel/update', method: 'POST', data }) @@ -40,19 +40,20 @@ export function pmownerhouserelUpdateApi(data) { */ export function pmownerhouserelDetailApi(id) { return request({ - url: `autogencode/pmownerhouserel/info/${id}`, + url: `/autogencode/pmownerhouserel/info/${id}`, method: 'GET' }) } /** - * pmownerhouserel删除 - * @param pram + * pmownerhouserel批量删除 + * @param ids */ -export function pmownerhouserelDeleteApi(id) { +export function pmownerhouserelDeleteApi(ids) { return request({ - url: `autogencode/pmownerhouserel/delete/${id}`, - method: 'get' + url: '/autogencode/pmownerhouserel/delete', + method: 'POST', + data: ids }) } @@ -63,7 +64,7 @@ export function pmownerhouserelDeleteApi(id) { */ export function pmownerhouserelListApi(params) { return request({ - url: 'autogencode/pmownerhouserel/list', + url: '/autogencode/pmownerhouserel/list', method: 'GET', params }) diff --git a/admin/src/views/pm/houser/index.vue b/admin/src/views/pm/houser/index.vue index a18773c..358695f 100644 --- a/admin/src/views/pm/houser/index.vue +++ b/admin/src/views/pm/houser/index.vue @@ -66,7 +66,7 @@ label="操作"> @@ -155,18 +155,30 @@ this.$refs.addOrUpdate.init(id) }) }, - // 删除 + // 删除处理（支持单个删除和批量删除） deleteHandle (id) { - var ids = id ? [id] : this.dataListSelections.map(item => { - return item.id - }) - this.$confirm(`您确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { + let ids = [] + let idText = '' + + // 如果传入了单个id参数，则为单个删除 + if (id) { + ids = [id] + idText = id + } else { + // 否则为批量删除 + ids = this.dataListSelections.map(item => { + return item.id + }) + idText = ids.join(',') + } + + this.$confirm(`确定进行删除操作?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - api.pmownerhouserelDeleteApi(id).then(res => { - // TODO 处理删除 + // 调用批量删除API + api.pmownerhouserelDeleteApi(ids).then(res => { this.$message.success('删除成功') this.getDataList() }) diff --git a/admin/src/views/pm/houser/pmownerhouserel-add-and-update.vue b/admin/src/views/pm/houser/pmownerhouserel-add-and-update.vue index 1351b1d..02a28f4 100644 --- a/admin/src/views/pm/houser/pmownerhouserel-add-and-update.vue +++ b/admin/src/views/pm/houser/pmownerhouserel-add-and-update.vue @@ -61,19 +61,19 @@ visible: false, dataForm: { id: 0, - ownerId: '' , - houseId: '' , - relType: '' , - bindTime: '' , - unbindTime: '' , - remark: '' , - delFlag: '' , - createDept: '' , - createBy: '' , - createTime: '' , - updateBy: '' , - updateTime: '' , - tenantId: '' + ownerId: '' , + houseId: '' , + relType: '' , + bindTime: '' , + unbindTime: '' , + remark: '' , + delFlag: '' , + createDept: '' , + createBy: '' , + createTime: '' , + updateBy: '' , + updateTime: '' , + tenantId: '' }, dataRule: { ownerId: [ @@ -85,36 +85,36 @@ relType: [ { required: true, message: '关联类型 为必填项', trigger: 'blur' } ], - bindTime: [ - { required: true, message: '绑定时间 为必填项', trigger: 'blur' } - ], - unbindTime: [ - { required: true, message: '解绑时间 为必填项', trigger: 'blur' } - ], - remark: [ - { required: true, message: '备注 为必填项', trigger: 'blur' } - ], - delFlag: [ - { required: true, message: '删除标志（0代表存在 2代表删除） 为必填项', trigger: 'blur' } - ], - createDept: [ - { required: true, message: '创建部门 为必填项', trigger: 'blur' } - ], - createBy: [ - { required: true, message: '创建人 为必填项', trigger: 'blur' } - ], - createTime: [ - { required: true, message: '创建时间 为必填项', trigger: 'blur' } - ], - updateBy: [ - { required: true, message: '修改人 为必填项', trigger: 'blur' } - ], - updateTime: [ - { required: true, message: '修改时间 为必填项', trigger: 'blur' } - ], - tenantId: [ - { required: true, message: '租户ID 为必填项', trigger: 'blur' } - ] + // bindTime: [ + // { required: true, message: '绑定时间 为必填项', trigger: 'blur' } + // ], + // unbindTime: [ + // { required: true, message: '解绑时间 为必填项', trigger: 'blur' } + // ], + // remark: [ + // { required: true, message: '备注 为必填项', trigger: 'blur' } + // ], + // delFlag: [ + // { required: true, message: '删除标志（0代表存在 2代表删除） 为必填项', trigger: 'blur' } + // ], + // createDept: [ + // { required: true, message: '创建部门 为必填项', trigger: 'blur' } + // ], + // createBy: [ + // { required: true, message: '创建人 为必填项', trigger: 'blur' } + // ], + // createTime: [ + // { required: true, message: '创建时间 为必填项', trigger: 'blur' } + // ], + // updateBy: [ + // { required: true, message: '修改人 为必填项', trigger: 'blur' } + // ], + // updateTime: [ + // { required: true, message: '修改时间 为必填项', trigger: 'blur' } + // ], + // tenantId: [ + // { required: true, message: '租户ID 为必填项', trigger: 'blur' } + // ] } } }, @@ -133,9 +133,10 @@ }, // 表单数据提交 dataSubmit () { + console.log(this.dataForm); this.$refs['dataForm'].validate((valid) => { if (valid) { - if (dataForm.id) { + if (this.dataForm.id) { api.pmownerhouserelUpdateApi(this.dataForm).then(res =>{ this.$message.success('保存成功') @@ -150,7 +151,7 @@ this.$emit('refreshDataList') }); } - + } }) } 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 index 7c3743f..bf6d748 100644 --- 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 @@ -155,7 +155,7 @@ public class PmOwnerController { /** * 详情数据 */ - @RequestMapping("/info/{id}") + @RequestMapping(value = "/info/{id}", method = RequestMethod.GET) public CommonResult info(@PathVariable("id") Long id){ PmOwner pmOwner = pmOwnerService.getById(id); @@ -165,7 +165,7 @@ public class PmOwnerController { /** * 新增数据 */ - @RequestMapping("/save") + @RequestMapping(value = "/save", method = RequestMethod.POST) public CommonResult save(@RequestBody PmOwner pmOwner){ if (pmOwnerService.save(pmOwner)) { return CommonResult.success(); @@ -176,7 +176,7 @@ public class PmOwnerController { /** * 修改数据 */ - @RequestMapping("/update") + @RequestMapping(value = "/update", method = RequestMethod.POST) public CommonResult update(@RequestBody PmOwner pmOwner){ if (pmOwnerService.updateById(pmOwner)) { return CommonResult.success(); @@ -187,7 +187,7 @@ public class PmOwnerController { /** * 删除:根据id集合 */ - @RequestMapping("/delete") + @RequestMapping(value = "/delete", method = RequestMethod.GET) public CommonResult delete(@RequestBody Long[] ids){ if (pmOwnerService.removeByIds(Arrays.asList(ids))) { return CommonResult.success(); 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 index e568065..759c289 100644 --- 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 @@ -1,5 +1,8 @@ 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; @@ -8,31 +11,21 @@ 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.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") @@ -43,27 +36,111 @@ public class PmOwnerHouseRelController { /** - * 分页显示业主房屋关联列表 + * 条件设置 + * 根据实体类字段自动生成查询条件 + */ + private void condition(LambdaQueryWrapper queryWrapper, PmOwnerHouseRel request) { + if (request == null) { + return; + } + + // 根据实体类字段自动生成查询条件 + + // id + if (request.getId() != null) { + queryWrapper.eq(PmOwnerHouseRel::getId, request.getId()); + } + + // 业主id + if (request.getOwnerId() != null) { + queryWrapper.eq(PmOwnerHouseRel::getOwnerId, request.getOwnerId()); + } + + // 房屋id + if (request.getHouseId() != null) { + queryWrapper.eq(PmOwnerHouseRel::getHouseId, request.getHouseId()); + } + + // 关联类型 + if (StrUtil.isNotBlank(request.getRelType())) { + queryWrapper.eq(PmOwnerHouseRel::getRelType, request.getRelType()); + } + + // 绑定时间 + if (request.getBindTime() != null) { + queryWrapper.eq(PmOwnerHouseRel::getBindTime, request.getBindTime()); + } + + // 解绑时间 + if (request.getUnbindTime() != null) { + queryWrapper.eq(PmOwnerHouseRel::getUnbindTime, request.getUnbindTime()); + } + + // 备注 + if (StrUtil.isNotBlank(request.getRemark())) { + queryWrapper.eq(PmOwnerHouseRel::getRemark, request.getRemark()); + } + + // 删除标志（0代表存在 2代表删除） + if (StrUtil.isNotBlank(request.getDelFlag())) { + queryWrapper.eq(PmOwnerHouseRel::getDelFlag, request.getDelFlag()); + } + + // 创建部门 + if (request.getCreateDept() != null) { + queryWrapper.eq(PmOwnerHouseRel::getCreateDept, request.getCreateDept()); + } + + // 创建人 + if (request.getCreateBy() != null) { + queryWrapper.eq(PmOwnerHouseRel::getCreateBy, request.getCreateBy()); + } + + // 创建时间 + if (request.getCreateTime() != null) { + queryWrapper.eq(PmOwnerHouseRel::getCreateTime, request.getCreateTime()); + } + + // 修改人 + if (request.getUpdateBy() != null) { + queryWrapper.eq(PmOwnerHouseRel::getUpdateBy, request.getUpdateBy()); + } + + // 修改时间 + if (request.getUpdateTime() != null) { + queryWrapper.eq(PmOwnerHouseRel::getUpdateTime, request.getUpdateTime()); + } + + // 租户ID + if (StrUtil.isNotBlank(request.getTenantId())) { + queryWrapper.eq(PmOwnerHouseRel::getTenantId, request.getTenantId()); + } + + } + + + /** + * 分页显示业主房屋关联表 * @param request 搜索条件 * @param pageParamRequest 分页参数 */ + @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated PmOwnerHouseRel request, @Validated PageParamRequest pageParamRequest){ + 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); + CommonPage page = CommonPage.restPage(pmOwnerHouseRelService.pageList(queryWrapper, pageParamRequest)); + return CommonResult.success(page); } /** * 详情数据 */ - @RequestMapping("/info/{id}") + @RequestMapping(value = "/info/{id}", method = RequestMethod.GET) public CommonResult info(@PathVariable("id") Long id){ PmOwnerHouseRel pmOwnerHouseRel = pmOwnerHouseRelService.getById(id); @@ -84,7 +161,7 @@ public class PmOwnerHouseRelController { /** * 修改数据 */ - @RequestMapping("/update") + @RequestMapping(value = "/update", method = RequestMethod.POST) public CommonResult update(@RequestBody PmOwnerHouseRel pmOwnerHouseRel){ if (pmOwnerHouseRelService.updateById(pmOwnerHouseRel)) { return CommonResult.success(); @@ -95,7 +172,7 @@ public class PmOwnerHouseRelController { /** * 删除:根据id集合 */ - @RequestMapping("/delete") + @RequestMapping(value = "/delete", method = RequestMethod.POST) public CommonResult delete(@RequestBody Long[] ids){ if (pmOwnerHouseRelService.removeByIds(Arrays.asList(ids))) { return CommonResult.success(); @@ -103,26 +180,4 @@ public class PmOwnerHouseRelController { 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/PmOwnerHouseRelDao.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/PmOwnerHouseRelDao.java index a0c3ad8..e2be15b 100644 --- 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 @@ -4,7 +4,9 @@ import com.zbkj.modules.autogencode.entity.PmOwnerHouseRel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; - +/** + * 业主房屋关联表 DAO 映射层 + */ @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 index 19cd8d1..ab9e2a4 100644 --- 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 @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; + import java.io.Serializable; import java.util.Date; import lombok.Data; 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 index 49a8431..081cace 100644 --- 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 @@ -2,88 +2,88 @@ 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; -/** - * 业主房屋关联表 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; - + /** + * id + */ + @ApiModelProperty(value = "id") + @TableId + private Long id; + /** + * 业主id + */ + @ApiModelProperty(value = "业主id") + private Long ownerId; + /** + * 房屋id + */ + @ApiModelProperty(value = "房屋id") + private Long houseId; + /** + * 关联类型 + */ + @ApiModelProperty(value = "关联类型") + private String relType; + /** + * 绑定时间 + */ + @ApiModelProperty(value = "绑定时间") + private Date bindTime; + /** + * 解绑时间 + */ + @ApiModelProperty(value = "解绑时间") + private Date unbindTime; + /** + * 备注 + */ + @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/service/PmOwnerHouseRelService.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/PmOwnerHouseRelService.java index 9776530..e2c88fb 100644 --- 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 @@ -1,19 +1,10 @@ -/* - * @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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + import java.util.List; import java.util.Map; @@ -21,30 +12,14 @@ 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 查询结果 - */ + /** + * PmOwnerHouseRel 列表查询 + * @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 index ff12108..aac2206 100644 --- 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 @@ -1,13 +1,11 @@ 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 org.springframework.stereotype.Service; import com.zbkj.modules.autogencode.dao.PmOwnerHouseRelDao; import com.zbkj.modules.autogencode.entity.PmOwnerHouseRel; diff --git a/crmeb/crmeb-admin/src/main/resources/application-beta.yml b/crmeb/crmeb-admin/src/main/resources/application-beta.yml index 06ceb71..33171ab 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-beta.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-beta.yml @@ -29,7 +29,7 @@ spring: # 数据库配置 datasource: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8&allowPublicKeyRetrieval=true&useSSL=false&verifyServerCertificate=false&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&authenticationPlugins=mysql_native_password username: root password: root diff --git a/crmeb/crmeb-admin/src/main/resources/application-dev.yml b/crmeb/crmeb-admin/src/main/resources/application-dev.yml index 1f066f1..14843a6 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-dev.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-dev.yml @@ -23,7 +23,7 @@ spring: max-request-size: 50MB #设置单次请求文件的总大小 datasource: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8&allowPublicKeyRetrieval=true&useSSL=false&verifyServerCertificate=false&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&authenticationPlugins=mysql_native_password username: root password: root diff --git a/crmeb/crmeb-admin/src/main/resources/application-prod.yml b/crmeb/crmeb-admin/src/main/resources/application-prod.yml index c43eef1..952e1a3 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-prod.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-prod.yml @@ -23,7 +23,7 @@ spring: # 数据库配置 datasource: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8&allowPublicKeyRetrieval=true&useSSL=false&verifyServerCertificate=false&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&authenticationPlugins=mysql_native_password username: root password: root diff --git a/crmeb/crmeb-admin/src/main/resources/application.yml b/crmeb/crmeb-admin/src/main/resources/application.yml index cf458e4..7fb090f 100644 --- a/crmeb/crmeb-admin/src/main/resources/application.yml +++ b/crmeb/crmeb-admin/src/main/resources/application.yml @@ -37,10 +37,10 @@ spring: # 数据库配置 datasource: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://124.71.134.146:63306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8&allowPublicKeyRetrieval=true&useSSL=false&verifyServerCertificate=false&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&maxReconnects=10 username: root - password: fastrise@chain + password: root redis: host: localhost #地址 diff --git a/crmeb/crmeb-admin/src/main/resources/mapper/autogencode/PmOwnerHouseRelDao.xml b/crmeb/crmeb-admin/src/main/resources/mapper/autogencode/PmOwnerHouseRelDao.xml new file mode 100644 index 0000000..f06275a --- /dev/null +++ b/crmeb/crmeb-admin/src/main/resources/mapper/autogencode/PmOwnerHouseRelDao.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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 b12c384..92224fe 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 @@ -87,7 +87,7 @@ public class ${className}Controller { /** * 详情数据 */ - @RequestMapping("/info/{${pk.attrname}}") + @RequestMapping(value = "/info/{${pk.attrname}}", method = RequestMethod.GET) public CommonResult<${className}> info(@PathVariable("${pk.attrname}") ${pk.attrType} ${pk.attrname}){ ${className} ${classname} = ${classname}Service.getById(${pk.attrname}); @@ -97,7 +97,7 @@ public class ${className}Controller { /** * 新增数据 */ - @RequestMapping("/save") + @RequestMapping(value = "/save", method = RequestMethod.POST) public CommonResult save(@RequestBody ${className} ${classname}){ if (${classname}Service.save(${classname})) { return CommonResult.success(); @@ -108,7 +108,7 @@ public class ${className}Controller { /** * 修改数据 */ - @RequestMapping("/update") + @RequestMapping(value = "/update", method = RequestMethod.POST) public CommonResult update(@RequestBody ${className} ${classname}){ if (${classname}Service.updateById(${classname})) { return CommonResult.success(); @@ -119,7 +119,7 @@ public class ${className}Controller { /** * 删除:根据id集合 */ - @RequestMapping("/delete") + @RequestMapping(value = "/delete", method = RequestMethod.POST) public CommonResult delete(@RequestBody ${pk.attrType}[] ${pk.attrname}s){ if (${classname}Service.removeByIds(Arrays.asList(${pk.attrname}s))) { return CommonResult.success();