diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/mch/MchDeptUserDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/mch/MchDeptUserDto.java new file mode 100644 index 000000000..b98412a0c --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/mch/MchDeptUserDto.java @@ -0,0 +1,9 @@ +package com.bsd.pjcloud.wallet.api.dto.mch; + +import com.bsd.pjcloud.wallet.api.entity.mch.MchDeptUserEntity; +import lombok.Data; + +@Data +public class MchDeptUserDto extends MchDeptUserEntity { + +} diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchDeptUserEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchDeptUserEntity.java new file mode 100644 index 000000000..800cf19dc --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchDeptUserEntity.java @@ -0,0 +1,91 @@ +package com.bsd.pjcloud.wallet.api.entity.mch; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 用户部门商户关系表 + * + * @author pjcloud + * @date 2025-03-28 15:28:00 + */ +@Data +@TenantTable +@TableName("mch_dept_user") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "用户部门商户关系表") +public class MchDeptUserEntity extends Model { + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="主键") + private Long id; + + /** + * 商户id + */ + @Schema(description="商户id") + private Long mchId; + + /** + * 用户id + */ + @Schema(description="用户id") + private Long userId; + + /** + * 用户部门id + */ + @Schema(description="用户部门id") + private Long userDeptId; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改人") + private String updateBy; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改时间") + private LocalDateTime updateTime; + + /** + * 删除标记 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="删除标记") + private String delFlag; + + /** + * 租户ID + */ + @Schema(description="租户ID") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/mch/MchDeptUserVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/mch/MchDeptUserVo.java new file mode 100644 index 000000000..e8f1be2cb --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/mch/MchDeptUserVo.java @@ -0,0 +1,9 @@ +package com.bsd.pjcloud.wallet.api.vo.mch; + +import com.bsd.pjcloud.wallet.api.entity.mch.MchDeptUserEntity; +import lombok.Data; + +@Data +public class MchDeptUserVo extends MchDeptUserEntity { + +} diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchDeptUserController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchDeptUserController.java new file mode 100644 index 000000000..b88af388c --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchDeptUserController.java @@ -0,0 +1,116 @@ +package com.bsd.pjcloud.wallet.controller.mch; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.wallet.api.entity.mch.MchDeptUserEntity; +import com.bsd.pjcloud.wallet.service.MchDeptUserService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 用户部门商户关系表 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/mchDeptUser" ) +@Tag(description = "mchDeptUser" , name = "用户部门商户关系表管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class MchDeptUserController { + + private final MchDeptUserService mchDeptUserService; + + /** + * 分页查询 + * @param page 分页对象 + * @param mchDeptUser 用户部门商户关系表 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('wallet_mchDeptUser_view')" ) + public R getMchDeptUserPage(@ParameterObject Page page, @ParameterObject MchDeptUserEntity mchDeptUser) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + return R.ok(mchDeptUserService.page(page, wrapper)); + } + + + /** + * 通过id查询用户部门商户关系表 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('wallet_mchDeptUser_view')" ) + public R getById(@PathVariable("id" ) Long id) { + return R.ok(mchDeptUserService.getById(id)); + } + + /** + * 新增用户部门商户关系表 + * @param mchDeptUser 用户部门商户关系表 + * @return R + */ + @Operation(summary = "新增用户部门商户关系表" , description = "新增用户部门商户关系表" ) + @SysLog("新增用户部门商户关系表" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('wallet_mchDeptUser_add')" ) + public R save(@RequestBody MchDeptUserEntity mchDeptUser) { + return R.ok(mchDeptUserService.save(mchDeptUser)); + } + + /** + * 修改用户部门商户关系表 + * @param mchDeptUser 用户部门商户关系表 + * @return R + */ + @Operation(summary = "修改用户部门商户关系表" , description = "修改用户部门商户关系表" ) + @SysLog("修改用户部门商户关系表" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('wallet_mchDeptUser_edit')" ) + public R updateById(@RequestBody MchDeptUserEntity mchDeptUser) { + return R.ok(mchDeptUserService.updateById(mchDeptUser)); + } + + /** + * 通过id删除用户部门商户关系表 + * @param ids id列表 + * @return R + */ + @Operation(summary = "通过id删除用户部门商户关系表" , description = "通过id删除用户部门商户关系表" ) + @SysLog("通过id删除用户部门商户关系表" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('wallet_mchDeptUser_del')" ) + public R removeById(@RequestBody Long[] ids) { + return R.ok(mchDeptUserService.removeBatchByIds(CollUtil.toList(ids))); + } + + + /** + * 导出excel 表格 + * @param mchDeptUser 查询条件 + * @param ids 导出指定ID + * @return excel 文件流 + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('wallet_mchDeptUser_export')" ) + public List export(MchDeptUserEntity mchDeptUser,Long[] ids) { + return mchDeptUserService.list(Wrappers.lambdaQuery(mchDeptUser).in(ArrayUtil.isNotEmpty(ids), MchDeptUserEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/mch/MchDeptUserMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/mch/MchDeptUserMapper.java new file mode 100644 index 000000000..149256664 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/mch/MchDeptUserMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.wallet.mapper.mch; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.wallet.api.entity.mch.MchDeptUserEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface MchDeptUserMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/MchDeptUserService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/MchDeptUserService.java new file mode 100644 index 000000000..ee20ebe7a --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/MchDeptUserService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.wallet.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.wallet.api.entity.mch.MchDeptUserEntity; + +public interface MchDeptUserService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchDeptUserServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchDeptUserServiceImpl.java new file mode 100644 index 000000000..d9c017e83 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchDeptUserServiceImpl.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.wallet.service.impl.mch; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.wallet.api.entity.mch.MchDeptUserEntity; +import com.bsd.pjcloud.wallet.mapper.mch.MchDeptUserMapper; +import com.bsd.pjcloud.wallet.service.MchDeptUserService; +import org.springframework.stereotype.Service; +/** + * 用户部门商户关系表 + */ +@Service +public class MchDeptUserServiceImpl extends ServiceImpl implements MchDeptUserService { +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchDeptUserMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchDeptUserMapper.xml new file mode 100644 index 000000000..0d82e8ccf --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchDeptUserMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file