liding
2 天以前 79828b3a3174ceccf3445a9364f708ecf1712c8f
供应商
已修改1个文件
已删除1个文件
已添加7个文件
316 ■■■■■ 文件已修改
basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/java/com/ruoyi/basic/controller/TestController1.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/java/com/ruoyi/basic/dto/SupplyDto.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/java/com/ruoyi/basic/mapper/SupplyMapper.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/java/com/ruoyi/basic/service/SupplyService.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/resources/mapper/SupplyMapper.xml 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
package com.ruoyi.basic.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.SupplyDto;
import com.ruoyi.basic.entity.Supply;
import com.ruoyi.basic.service.SupplyService;
import com.ruoyi.common.core.domain.R;
import org.springframework.web.bind.annotation.*;
import lombok.AllArgsConstructor;
import java.util.List;
/**
 * <p>
 * ä¾›åº”商信息表 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author ruoyi
 * @since 2025-05-30
 */
@RestController
@AllArgsConstructor
@RequestMapping("/basic/supply")
public class SupplyController {
    private SupplyService supplyService;
    /**
     * æŸ¥è¯¢
     */
    @GetMapping("/list")
    public R<IPage<Supply>> list(Page page,SupplyDto supplyDto) {
        IPage<Supply> list = supplyService.selectSupplyList(page,supplyDto);
        return R.ok(list);
    }
    /**
     * æ–°å¢žä¿®æ”¹
     */
    @PostMapping("/addOrEditSupply")
    public R addOrEditSupply(@RequestBody SupplyDto supplyDto) {
        return R.ok(supplyService.addOrEditSupply(supplyDto));
    }
    /**
     * åˆ é™¤
     */
    @DeleteMapping("/delSupply")
    public R remove(@RequestBody Long[] ids) {
        return R.ok(supplyService.delSupplyByIds(ids));
    }
}
basic-server/src/main/java/com/ruoyi/basic/controller/TestController1.java
ÎļþÒÑɾ³ý
basic-server/src/main/java/com/ruoyi/basic/dto/SupplyDto.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
package com.ruoyi.basic.dto;
import com.ruoyi.basic.entity.Supply;
import lombok.Data;
@Data
public class SupplyDto extends Supply {
}
basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,74 @@
package com.ruoyi.basic.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.domain.MyBaseEntity;
import lombok.Data;
/**
 * ä¾›åº”商信息表 å®žä½“ç±»
 *
 * @author ruoyi
 * @date 2025-05-30
 */
@Data
@TableName("supply")
public class Supply extends MyBaseEntity {
    private static final long serialVersionUID = 1L;
    /**
     * ä¾›åº”商唯一标识,采用BIGSERIAL自增主键,确保数据唯一性
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     * ä¾›åº”商全称,业务场景中唯一识别的名称,
     */
    @TableField(value = "supplier_name")
    private String supplierName;
    /**
     * ä¾›åº”商税务登记唯一标识(如统一社会信用代码),用于财税管理
     */
    @TableField(value = "taxpayer_id")
    private String taxpayerId;
    /**
     * ä¾›åº”商营业执照注册地址或主要经营场所,默认空字符串
     */
    @TableField(value = "business_address")
    private String businessAddress;
    /**
     * ä¾›åº”商收款银行账户信息,默认空字符串,用于资金往来
     */
    @TableField(value = "bank_account")
    private String bankAccount;
    /**
     * ä¾›åº”商银行账户的开户机构名称,默认空字符串,
     */
    @TableField(value = "bank_name")
    private String bankName;
    /**
     * ä¾›åº”商业务对接人姓名
     */
    @TableField(value = "contact_person")
    private String contactPerson;
    /**
     * ä¾›åº”商联系人的联系地址
     */
    @TableField(value = "contact_address")
    private String contactAddress;
    /**
     * ä¾›åº”商所在省份的ID(关联地址字典表),默认0
     */
    @TableField(value = "province_id")
    private Long provinceId;
    /**
     * ä¾›åº”商所在城市的ID(关联地址字典表),默认0
     */
    @TableField(value = "city_id")
    private Long cityId;
    /**
     * ä¾›åº”商所在区县的ID(关联地址字典表),默认0,用于地址层级划分
     */
    @TableField(value = "district_id")
    private Long districtId;
}
basic-server/src/main/java/com/ruoyi/basic/mapper/SupplyMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.basic.entity.Supply;
import org.apache.ibatis.annotations.Mapper;
/**
 * <p>
 * ä¾›åº”商信息表 Mapper æŽ¥å£
 * </p>
 *
 * @author ruoyi
 * @since 2025-05-30
 */
@Mapper
public interface SupplyMapper extends BaseMapper<Supply> {
}
basic-server/src/main/java/com/ruoyi/basic/service/SupplyService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.SupplyDto;
import com.ruoyi.basic.entity.Supply;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
 * <p>
 * ä¾›åº”商信息表 æœåŠ¡ç±»
 * </p>
 *
 * @author ruoyi
 * @since 2025-05-30
 */
public interface SupplyService extends IService<Supply> {
    IPage<Supply> selectSupplyList(Page page, SupplyDto supplyDto);
    int addOrEditSupply(SupplyDto supplyDto);
    int delSupplyByIds(Long[] ids);
}
basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.SupplyDto;
import com.ruoyi.basic.entity.Supply;
import com.ruoyi.basic.mapper.SupplyMapper;
import com.ruoyi.basic.service.SupplyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.bean.BeanUtils;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import org.springframework.util.StringUtils;
import java.util.List;
import java.util.Objects;
/**
 * <p>
 * ä¾›åº”商信息表 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author ruoyi
 * @since 2025-05-30
 */
@Service
@RequiredArgsConstructor
public class SupplyServiceImpl extends ServiceImpl<SupplyMapper, Supply> implements SupplyService {
    private final SupplyMapper supplyMapper;
    @Override
    public IPage<Supply> selectSupplyList(Page page, SupplyDto supplyDto) {
        LambdaQueryWrapper<Supply> queryWrapper = new LambdaQueryWrapper<>();
        // ä¾›åº”商名称模糊查询
        if (StringUtils.hasText(supplyDto.getSupplierName())) {
            queryWrapper.like(Supply::getSupplierName, supplyDto.getSupplierName());
        }
        // çº³ç¨Žäººè¯†åˆ«å·ç²¾ç¡®æŸ¥è¯¢
        if (StringUtils.hasText(supplyDto.getTaxpayerId())) {
            queryWrapper.eq(Supply::getTaxpayerId, supplyDto.getTaxpayerId());
        }
        queryWrapper.orderByDesc(Supply::getCreateTime);
        return supplyMapper.selectPage(page, queryWrapper);
    }
    @Override
    public int addOrEditSupply(SupplyDto supplyDto) {
        Supply supply = new Supply();
        BeanUtils.copyProperties(supplyDto, supply);
        if (Objects.isNull(supplyDto.getId())) {
            return supplyMapper.insert(supply);
        } else {
            return supplyMapper.updateById(supply);
        }
    }
    @Override
    public int delSupplyByIds(Long[] ids) {
        // æ£€æŸ¥å‚æ•°
        if (ids == null || ids.length == 0) {
            return 0;
        }
        // æž„造更新条件
        UpdateWrapper<Supply> updateWrapper = new UpdateWrapper<>();
        updateWrapper.in("id", ids)
                .set("deleted", 1);  // è®¾ç½® deleted ä¸º 1 è¡¨ç¤ºå·²åˆ é™¤
        // æ‰§è¡Œæ‰¹é‡é€»è¾‘删除
        return supplyMapper.update(null, updateWrapper);
    }
}
basic-server/src/main/resources/mapper/SupplyMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
<?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="com.ruoyi.basic.mapper.SupplyMapper">
        <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
        <resultMap id="BaseResultMap" type="com.ruoyi.basic.entity.Supply">
                    <id column="id" property="id" />
                <result column="create_time" property="createTime" />
                <result column="deleted" property="deleted" />
                <result column="update_time" property="updateTime" />
                <result column="create_by" property="createBy" />
                <result column="update_by" property="updateBy" />
                    <result column="supplier_name" property="supplierName" />
                    <result column="taxpayer_id" property="taxpayerId" />
                    <result column="business_address" property="businessAddress" />
                    <result column="bank_account" property="bankAccount" />
                    <result column="bank_name" property="bankName" />
                    <result column="contact_person" property="contactPerson" />
                    <result column="contact_address" property="contactAddress" />
                    <result column="province_id" property="provinceId" />
                    <result column="city_id" property="cityId" />
                    <result column="district_id" property="districtId" />
        </resultMap>
        <!-- é€šç”¨æŸ¥è¯¢ç»“果列 -->
        <sql id="Base_Column_List">
                create_time,
                deleted,
                update_time,
                create_by,
                update_by,
            id, supplier_name, taxpayer_id, business_address, bank_account, bank_name, contact_person, contact_address, province_id, city_id, district_id
        </sql>
</mapper>
ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java
@@ -38,8 +38,8 @@
    public static void main(String[] args) {
        String projectPath = System.getProperty("user.dir"); // èŽ·å–é¡¹ç›®æ ¹è·¯å¾„
        String path = "ruoyi-common"; // æ¨¡å—名称
        String table = "storage_attachment"; // è¡¨åï¼Œå¤šä¸ªè¡¨é€—号隔开
        String path = "basic-server"; // æ¨¡å—名称
        String table = "supply"; // è¡¨åï¼Œå¤šä¸ªè¡¨é€—号隔开
        // ä»£ç è¾“出路径配置
        String outputBasePath = Paths.get(projectPath, path, "src", "main", "java").toString();
@@ -48,7 +48,7 @@
        // ä»£ç ç”Ÿæˆæ ¸å¿ƒé…ç½®
        FastAutoGenerator.create(DB_URL, DB_USERNAME, DB_PASSWORD)
                .globalConfig(builder -> {
                    builder.author("chen") // ä½œè€…信息
                    builder.author("ld") // ä½œè€…信息
                            .outputDir(outputBasePath) // ä»£ç è¾“出目录
                            .dateType(DateType.ONLY_DATE) // æ—¥æœŸç±»åž‹
                            .commentDate("yyyy-MM-dd") // æ³¨é‡Šæ—¥æœŸæ ¼å¼