营业员功能

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtOperatorController.java

@@ -0,0 +1,106 @@
+package org.dromara.backstage.basics.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.basics.domain.vo.PtOperatorVo;
+import org.dromara.backstage.basics.domain.bo.PtOperatorBo;
+import org.dromara.backstage.basics.service.IPtOperatorService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 营业员
+ * 前端访问路由地址为:/merchant/ptOperator
+ *
+ * @author bing
+ * @date 2024-08-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/merchant/ptOperator")
+public class PtOperatorController extends BaseController {
+
+    private final IPtOperatorService ptOperatorService;
+
+    /**
+     * 查询营业员列表
+     */
+    @SaCheckPermission("merchant:ptOperator:list")
+    @GetMapping("/list")
+    public TableDataInfo<PtOperatorVo> list(PtOperatorBo bo, PageQuery pageQuery) {
+        return ptOperatorService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出营业员列表
+     */
+    @SaCheckPermission("merchant:ptOperator:export")
+    @Log(title = "营业员", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(PtOperatorBo bo, HttpServletResponse response) {
+        List<PtOperatorVo> list = ptOperatorService.queryList(bo);
+        ExcelUtil.exportExcel(list, "营业员", PtOperatorVo.class, response);
+    }
+
+    /**
+     * 获取营业员详细信息
+     *
+     * @param operatorId 主键
+     */
+    @SaCheckPermission("merchant:ptOperator:query")
+    @GetMapping("/{operatorId}")
+    public R<PtOperatorVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long operatorId) {
+        return R.ok(ptOperatorService.queryById(operatorId));
+    }
+
+    /**
+     * 新增营业员
+     */
+    @SaCheckPermission("merchant:ptOperator:add")
+    @Log(title = "营业员", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PtOperatorBo bo) {
+        return toAjax(ptOperatorService.insertByBo(bo));
+    }
+
+    /**
+     * 修改营业员
+     */
+    @SaCheckPermission("merchant:ptOperator:edit")
+    @Log(title = "营业员", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtOperatorBo bo) {
+        return toAjax(ptOperatorService.updateByBo(bo));
+    }
+
+    /**
+     * 删除营业员
+     *
+     * @param operatorIds 主键串
+     */
+    @SaCheckPermission("merchant:ptOperator:remove")
+    @Log(title = "营业员", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{operatorIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] operatorIds) {
+        return toAjax(ptOperatorService.deleteWithValidByIds(List.of(operatorIds), true));
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/PtOperator.java

@@ -0,0 +1,78 @@
+package org.dromara.backstage.basics.domain;
+
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 营业员对象 t_pt_operator
+ *
+ * @author bing
+ * @date 2024-08-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_pt_operator")
+public class PtOperator extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 营业员Id,主键
+     */
+    @TableId(value = "operator_id")
+    private Long operatorId;
+
+    /**
+     * 所属结算账户Id
+     */
+    private Long accountId;
+
+    /**
+     * 营业员名称
+     */
+    private String operatorName;
+
+    /**
+     * 卡流水号，默认已有最大流水号+1
+     */
+    private Long cardNumber;
+
+    /**
+     * 物理卡号,卡片出厂的唯一id
+     */
+    private String factoryId;
+
+    /**
+     * 营业员卡密码，会和硬件对接
+     */
+    private String cardPwd;
+
+    /**
+     * 营业员卡有效期，会和硬件对接
+     */
+    private Date lifespan;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+    @TableField(exist = false)
+    private String accountName;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/bo/PtOperatorBo.java

@@ -0,0 +1,76 @@
+package org.dromara.backstage.basics.domain.bo;
+
+import org.springframework.format.annotation.DateTimeFormat;
+import org.dromara.backstage.basics.domain.PtOperator;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 营业员业务对象 t_pt_operator
+ *
+ * @author bing
+ * @date 2024-08-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PtOperator.class, reverseConvertGenerate = false)
+public class PtOperatorBo extends BaseEntity {
+
+    /**
+     * 营业员Id,主键
+     */
+    @NotNull(message = "营业员Id,主键不能为空", groups = { EditGroup.class })
+    private Long operatorId;
+
+    /**
+     * 所属结算账户Id
+     */
+    @NotNull(message = "所属结算账户Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long accountId;
+
+    /**
+     * 营业员名称
+     */
+    @NotBlank(message = "营业员名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String operatorName;
+
+    /**
+     * 卡流水号，默认已有最大流水号+1
+     */
+    private Long cardNumber;
+
+    /**
+     * 物理卡号,卡片出厂的唯一id
+     */
+    private String factoryId;
+
+    /**
+     * 营业员卡密码，会和硬件对接
+     */
+//    @NotBlank(message = "营业员卡密码，会和硬件对接不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String cardPwd;
+
+    /**
+     * 营业员卡有效期，会和硬件对接
+     */
+//    @NotNull(message = "营业员卡有效期，会和硬件对接不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date lifespan;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private String accountName;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/vo/PtOperatorVo.java

@@ -0,0 +1,85 @@
+package org.dromara.backstage.basics.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.backstage.basics.domain.PtOperator;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 营业员视图对象 t_pt_operator
+ *
+ * @author bing
+ * @date 2024-08-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = PtOperator.class)
+public class PtOperatorVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 营业员Id,主键
+     */
+    //@ExcelProperty(value = "营业员Id,主键")
+    private Long operatorId;
+
+    /**
+     * 所属结算账户Id
+     */
+    //@ExcelProperty(value = "所属结算账户Id")
+    private Long accountId;
+
+    @ExcelProperty(value = "所属结算账户")
+    private String accountName;
+
+    /**
+     * 营业员名称
+     */
+    @ExcelProperty(value = "营业员名称")
+    private String operatorName;
+
+    /**
+     * 卡流水号，默认已有最大流水号+1
+     */
+    @ExcelProperty(value = "卡流水号，默认已有最大流水号+1")
+    private Long cardNumber;
+
+    /**
+     * 物理卡号,卡片出厂的唯一id
+     */
+    @ExcelProperty(value = "物理卡号,卡片出厂的唯一id")
+    private String factoryId;
+
+    /**
+     * 营业员卡密码，会和硬件对接
+     */
+    @ExcelProperty(value = "营业员卡密码，会和硬件对接")
+    private String cardPwd;
+
+    /**
+     * 营业员卡有效期，会和硬件对接
+     */
+    @ExcelProperty(value = "营业员卡有效期，会和硬件对接")
+    private Date lifespan;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/mapper/PtOperatorMapper.java

@@ -0,0 +1,26 @@
+package org.dromara.backstage.basics.mapper;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.backstage.basics.domain.PtOperator;
+import org.dromara.backstage.basics.domain.vo.PtOperatorVo;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+import java.io.Serializable;
+
+/**
+ * 营业员Mapper接口
+ *
+ * @author bing
+ * @date 2024-08-01
+ */
+public interface PtOperatorMapper extends BaseMapperPlus<PtOperator, PtOperatorVo> {
+
+    PtOperatorVo selectVoById(Long id);
+
+    Page<PtOperatorVo> customPageList(@Param("page") Page<PtOperator> page, @Param("ew") Wrapper<PtOperator> wrapper);
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/IPtOperatorService.java

@@ -0,0 +1,69 @@
+package org.dromara.backstage.basics.service;
+
+import org.dromara.backstage.basics.domain.PtOperator;
+import org.dromara.backstage.basics.domain.vo.PtOperatorVo;
+import org.dromara.backstage.basics.domain.bo.PtOperatorBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 营业员Service接口
+ *
+ * @author bing
+ * @date 2024-08-01
+ */
+public interface IPtOperatorService {
+
+    /**
+     * 查询营业员
+     *
+     * @param operatorId 主键
+     * @return 营业员
+     */
+    PtOperatorVo queryById(Long operatorId);
+
+    /**
+     * 分页查询营业员列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 营业员分页列表
+     */
+    TableDataInfo<PtOperatorVo> queryPageList(PtOperatorBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的营业员列表
+     *
+     * @param bo 查询条件
+     * @return 营业员列表
+     */
+    List<PtOperatorVo> queryList(PtOperatorBo bo);
+
+    /**
+     * 新增营业员
+     *
+     * @param bo 营业员
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(PtOperatorBo bo);
+
+    /**
+     * 修改营业员
+     *
+     * @param bo 营业员
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(PtOperatorBo bo);
+
+    /**
+     * 校验并批量删除营业员信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtOperatorServiceImpl.java

@@ -0,0 +1,152 @@
+package org.dromara.backstage.basics.service.impl;
+
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.basics.domain.bo.PtOperatorBo;
+import org.dromara.backstage.basics.domain.vo.PtOperatorVo;
+import org.dromara.backstage.basics.domain.PtOperator;
+import org.dromara.backstage.basics.mapper.PtOperatorMapper;
+import org.dromara.backstage.basics.service.IPtOperatorService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 营业员Service业务层处理
+ *
+ * @author bing
+ * @date 2024-08-01
+ */
+@RequiredArgsConstructor
+@Service
+public class PtOperatorServiceImpl implements IPtOperatorService {
+
+    private final PtOperatorMapper baseMapper;
+
+    /**
+     * 查询营业员
+     *
+     * @param operatorId 主键
+     * @return 营业员
+     */
+    @Override
+    public PtOperatorVo queryById(Long operatorId){
+        return baseMapper.selectVoById(operatorId);
+    }
+
+    /**
+     * 分页查询营业员列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 营业员分页列表
+     */
+    @Override
+    public TableDataInfo<PtOperatorVo> queryPageList(PtOperatorBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PtOperator> lqw = buildQueryWrapper(bo);
+        Page<PtOperatorVo> result = baseMapper.customPageList(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的营业员列表
+     *
+     * @param bo 查询条件
+     * @return 营业员列表
+     */
+    @Override
+    public List<PtOperatorVo> queryList(PtOperatorBo bo) {
+        LambdaQueryWrapper<PtOperator> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<PtOperator> buildQueryWrapper(PtOperatorBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PtOperator> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getAccountId() != null, PtOperator::getAccountId, bo.getAccountId());
+        lqw.like(StringUtils.isNotBlank(bo.getOperatorName()), PtOperator::getOperatorName, bo.getOperatorName());
+        lqw.eq(bo.getCardNumber() != null, PtOperator::getCardNumber, bo.getCardNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getFactoryId()), PtOperator::getFactoryId, bo.getFactoryId());
+        lqw.eq(bo.getLifespan() != null, PtOperator::getLifespan, bo.getLifespan());
+        lqw.eq(StringUtils.isNotBlank(bo.getAccountName()), PtOperator::getAccountName, bo.getAccountName());
+        return lqw;
+    }
+
+    /*private LambdaQueryWrapper<PtOperatorVo> buildQueryVoWrapper(PtOperatorBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PtOperatorVo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getAccountId() != null, PtOperatorVo::getAccountId, bo.getAccountId());
+        lqw.like(StringUtils.isNotBlank(bo.getOperatorName()), PtOperatorVo::getOperatorName, bo.getOperatorName());
+        lqw.eq(bo.getCardNumber() != null, PtOperatorVo::getCardNumber, bo.getCardNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getFactoryId()), PtOperatorVo::getFactoryId, bo.getFactoryId());
+        lqw.eq(bo.getLifespan() != null, PtOperatorVo::getLifespan, bo.getLifespan());
+        return lqw;
+    }*/
+
+    /**
+     * 新增营业员
+     *
+     * @param bo 营业员
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(PtOperatorBo bo) {
+        PtOperator add = MapstructUtils.convert(bo, PtOperator.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setOperatorId(add.getOperatorId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改营业员
+     *
+     * @param bo 营业员
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(PtOperatorBo bo) {
+        PtOperator update = MapstructUtils.convert(bo, PtOperator.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PtOperator entity){
+        //做一些数据校验,如唯一约束
+        LambdaQueryWrapper<PtOperator> lqw = Wrappers.lambdaQuery();
+        lqw.eq(PtOperator::getOperatorName, entity.getOperatorName())
+            .ne(entity.getOperatorId()!=null,PtOperator::getOperatorId, entity.getOperatorId());
+        if (baseMapper.selectCount(lqw) > 0) {
+            throw new ServiceException(String.format("数据已存在, %s=%s", "营业员", entity.getOperatorName()));
+        }
+    }
+
+    /**
+     * 校验并批量删除营业员信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/merchant/PtOperatorMapper.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.backstage.basics.mapper.PtOperatorMapper">
+
+    <resultMap type="org.dromara.backstage.basics.domain.PtOperator" id="PtOperatorResult">
+        <result property="operatorId"    column="operator_id"    />
+        <result property="tenantId"    column="tenant_id"    />
+        <result property="accountId"    column="account_id"    />
+        <result property="operatorName"    column="operator_name"    />
+        <result property="cardNumber"    column="card_number"    />
+        <result property="factoryId"    column="factory_id"    />
+        <result property="cardPwd"    column="card_pwd"    />
+        <result property="lifespan"    column="lifespan"    />
+        <result property="remark"    column="remark"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createDept"    column="create_dept"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <resultMap type="org.dromara.backstage.basics.domain.vo.PtOperatorVo" id="PtOperatorVoResult">
+        <result property="operatorId"    column="operator_id"    />
+        <result property="accountId"    column="account_id"    />
+        <result property="operatorName"    column="operator_name"    />
+        <result property="cardNumber"    column="card_number"    />
+        <result property="factoryId"    column="factory_id"    />
+        <result property="cardPwd"    column="card_pwd"    />
+        <result property="lifespan"    column="lifespan"    />
+        <result property="remark"    column="remark"    />
+        <result property="accountName"    column="account_name"    />
+    </resultMap>
+
+    <select id="selectVoById" resultType="org.dromara.backstage.basics.domain.vo.PtOperatorVo" parameterType="Long">
+        select o.*,a.account_name accountName
+        from t_pt_operator o left join t_pt_account a on o.account_id = a.account_id
+        where operator_id = #{id}
+    </select>
+
+    <select id="customPageList" resultType="org.dromara.backstage.basics.domain.vo.PtOperatorVo">
+        SELECT o.*,a.account_name FROM t_pt_operator o left join t_pt_account a on o.account_id = a.account_id and o.del_flag = '0' ${ew.customSqlSegment}
+    </select>
+</mapper>