新增家具表

This commit is contained in:
2025-07-08 17:47:16 +08:00
parent 878b754d16
commit 5e331360bd
8 changed files with 647 additions and 0 deletions

View File

@@ -0,0 +1,101 @@
package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.oa.domain.vo.OaFurnitureTableVo;
import com.ruoyi.oa.domain.bo.OaFurnitureTableBo;
import com.ruoyi.oa.service.IOaFurnitureTableService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 家具
*
* @author liujingchao
* @date 2025-07-08
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/furnitureTable")
public class OaFurnitureTableController extends BaseController {
private final IOaFurnitureTableService iOaFurnitureTableService;
/**
* 查询家具列表
*/
@GetMapping("/list")
public TableDataInfo<OaFurnitureTableVo> list(OaFurnitureTableBo bo, PageQuery pageQuery) {
return iOaFurnitureTableService.queryPageList(bo, pageQuery);
}
/**
* 导出家具列表
*/
@Log(title = "家具", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaFurnitureTableBo bo, HttpServletResponse response) {
List<OaFurnitureTableVo> list = iOaFurnitureTableService.queryList(bo);
ExcelUtil.exportExcel(list, "家具", OaFurnitureTableVo.class, response);
}
/**
* 获取家具详细信息
*
* @param furnitureId 主键
*/
@GetMapping("/{furnitureId}")
public R<OaFurnitureTableVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long furnitureId) {
return R.ok(iOaFurnitureTableService.queryById(furnitureId));
}
/**
* 新增家具
*/
@Log(title = "家具", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody OaFurnitureTableBo bo) {
return toAjax(iOaFurnitureTableService.insertByBo(bo));
}
/**
* 修改家具
*/
@Log(title = "家具", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody OaFurnitureTableBo bo) {
return toAjax(iOaFurnitureTableService.updateByBo(bo));
}
/**
* 删除家具
*
* @param furnitureIds 主键串
*/
@Log(title = "家具", businessType = BusinessType.DELETE)
@DeleteMapping("/{furnitureIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] furnitureIds) {
return toAjax(iOaFurnitureTableService.deleteWithValidByIds(Arrays.asList(furnitureIds), true));
}
}

View File

@@ -0,0 +1,98 @@
package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 家具对象 oa_furniture_table
*
* @author liujingchao
* @date 2025-07-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("oa_furniture_table")
public class OaFurnitureTable extends BaseEntity {
private static final long serialVersionUID=1L;
/**
*
*/
@TableId(value = "furniture_id")
private Long furnitureId;
/**
*
*/
private String companyName;
/**
*
*/
private String state;
/**
*
*/
private String procurementOfProducts;
/**
*
*/
private String contactGroup;
/**
*
*/
private String phone;
/**
*
*/
private String fax;
/**
*
*/
private String address;
/**
*
*/
private String zip;
/**
*
*/
private String email;
/**
*
*/
private String website;
/**
* 发送邮件次数
*/
private Long emailSendCount;
/**
* 上次发邮件时间
*/
private Date lastEmailSendTime;
/**
* 跟单人
*/
private String contactPerson;
/**
* 接收次数
*/
private Long receiveCount;
/**
* 删除标志0正常1已删除
*/
@TableLogic
private Integer delFlag;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,107 @@
package com.ruoyi.oa.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 家具业务对象 oa_furniture_table
*
* @author liujingchao
* @date 2025-07-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class OaFurnitureTableBo extends BaseEntity {
/**
*
*/
private Long furnitureId;
/**
*
*/
private String companyName;
/**
*
*/
private String state;
/**
*
*/
private String procurementOfProducts;
/**
*
*/
private String contactGroup;
/**
*
*/
private String phone;
/**
*
*/
private String fax;
/**
*
*/
private String address;
/**
*
*/
private String zip;
/**
*
*/
private String email;
/**
*
*/
private String website;
/**
* 发送邮件次数
*/
private Long emailSendCount;
/**
* 上次发邮件时间
*/
private Date lastEmailSendTime;
/**
* 跟单人
*/
private String contactPerson;
/**
* 接收次数
*/
private Long receiveCount;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,123 @@
package com.ruoyi.oa.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.Date;
/**
* 家具视图对象 oa_furniture_table
*
* @author liujingchao
* @date 2025-07-08
*/
@Data
@ExcelIgnoreUnannotated
public class OaFurnitureTableVo {
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Long furnitureId;
/**
*
*/
@ExcelProperty(value = "")
private String companyName;
/**
*
*/
@ExcelProperty(value = "")
private String state;
/**
*
*/
@ExcelProperty(value = "")
private String procurementOfProducts;
/**
*
*/
@ExcelProperty(value = "")
private String contactGroup;
/**
*
*/
@ExcelProperty(value = "")
private String phone;
/**
*
*/
@ExcelProperty(value = "")
private String fax;
/**
*
*/
@ExcelProperty(value = "")
private String address;
/**
*
*/
@ExcelProperty(value = "")
private String zip;
/**
*
*/
@ExcelProperty(value = "")
private String email;
/**
*
*/
@ExcelProperty(value = "")
private String website;
/**
* 发送邮件次数
*/
@ExcelProperty(value = "发送邮件次数")
private Long emailSendCount;
/**
* 上次发邮件时间
*/
@ExcelProperty(value = "上次发邮件时间")
private Date lastEmailSendTime;
/**
* 跟单人
*/
@ExcelProperty(value = "跟单人")
private String contactPerson;
/**
* 接收次数
*/
@ExcelProperty(value = "接收次数")
private Long receiveCount;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

View File

@@ -0,0 +1,15 @@
package com.ruoyi.oa.mapper;
import com.ruoyi.oa.domain.OaFurnitureTable;
import com.ruoyi.oa.domain.vo.OaFurnitureTableVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
/**
* 家具Mapper接口
*
* @author liujingchao
* @date 2025-07-08
*/
public interface OaFurnitureTableMapper extends BaseMapperPlus<OaFurnitureTableMapper, OaFurnitureTable, OaFurnitureTableVo> {
}

View File

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.OaFurnitureTable;
import com.ruoyi.oa.domain.vo.OaFurnitureTableVo;
import com.ruoyi.oa.domain.bo.OaFurnitureTableBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 家具Service接口
*
* @author liujingchao
* @date 2025-07-08
*/
public interface IOaFurnitureTableService {
/**
* 查询家具
*/
OaFurnitureTableVo queryById(Long furnitureId);
/**
* 查询家具列表
*/
TableDataInfo<OaFurnitureTableVo> queryPageList(OaFurnitureTableBo bo, PageQuery pageQuery);
/**
* 查询家具列表
*/
List<OaFurnitureTableVo> queryList(OaFurnitureTableBo bo);
/**
* 新增家具
*/
Boolean insertByBo(OaFurnitureTableBo bo);
/**
* 修改家具
*/
Boolean updateByBo(OaFurnitureTableBo bo);
/**
* 校验并批量删除家具信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@@ -0,0 +1,122 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.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 com.ruoyi.oa.domain.bo.OaFurnitureTableBo;
import com.ruoyi.oa.domain.vo.OaFurnitureTableVo;
import com.ruoyi.oa.domain.OaFurnitureTable;
import com.ruoyi.oa.mapper.OaFurnitureTableMapper;
import com.ruoyi.oa.service.IOaFurnitureTableService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 家具Service业务层处理
*
* @author liujingchao
* @date 2025-07-08
*/
@RequiredArgsConstructor
@Service
public class OaFurnitureTableServiceImpl implements IOaFurnitureTableService {
private final OaFurnitureTableMapper baseMapper;
/**
* 查询家具
*/
@Override
public OaFurnitureTableVo queryById(Long furnitureId){
return baseMapper.selectVoById(furnitureId);
}
/**
* 查询家具列表
*/
@Override
public TableDataInfo<OaFurnitureTableVo> queryPageList(OaFurnitureTableBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaFurnitureTable> lqw = buildQueryWrapper(bo);
Page<OaFurnitureTableVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询家具列表
*/
@Override
public List<OaFurnitureTableVo> queryList(OaFurnitureTableBo bo) {
LambdaQueryWrapper<OaFurnitureTable> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaFurnitureTable> buildQueryWrapper(OaFurnitureTableBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaFurnitureTable> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), OaFurnitureTable::getCompanyName, bo.getCompanyName());
lqw.eq(StringUtils.isNotBlank(bo.getState()), OaFurnitureTable::getState, bo.getState());
lqw.eq(StringUtils.isNotBlank(bo.getProcurementOfProducts()), OaFurnitureTable::getProcurementOfProducts, bo.getProcurementOfProducts());
lqw.eq(StringUtils.isNotBlank(bo.getContactGroup()), OaFurnitureTable::getContactGroup, bo.getContactGroup());
lqw.eq(StringUtils.isNotBlank(bo.getPhone()), OaFurnitureTable::getPhone, bo.getPhone());
lqw.eq(StringUtils.isNotBlank(bo.getFax()), OaFurnitureTable::getFax, bo.getFax());
lqw.eq(StringUtils.isNotBlank(bo.getAddress()), OaFurnitureTable::getAddress, bo.getAddress());
lqw.eq(StringUtils.isNotBlank(bo.getZip()), OaFurnitureTable::getZip, bo.getZip());
lqw.eq(StringUtils.isNotBlank(bo.getEmail()), OaFurnitureTable::getEmail, bo.getEmail());
lqw.eq(StringUtils.isNotBlank(bo.getWebsite()), OaFurnitureTable::getWebsite, bo.getWebsite());
lqw.eq(bo.getEmailSendCount() != null, OaFurnitureTable::getEmailSendCount, bo.getEmailSendCount());
lqw.eq(bo.getLastEmailSendTime() != null, OaFurnitureTable::getLastEmailSendTime, bo.getLastEmailSendTime());
lqw.eq(StringUtils.isNotBlank(bo.getContactPerson()), OaFurnitureTable::getContactPerson, bo.getContactPerson());
lqw.eq(bo.getReceiveCount() != null, OaFurnitureTable::getReceiveCount, bo.getReceiveCount());
return lqw;
}
/**
* 新增家具
*/
@Override
public Boolean insertByBo(OaFurnitureTableBo bo) {
OaFurnitureTable add = BeanUtil.toBean(bo, OaFurnitureTable.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setFurnitureId(add.getFurnitureId());
}
return flag;
}
/**
* 修改家具
*/
@Override
public Boolean updateByBo(OaFurnitureTableBo bo) {
OaFurnitureTable update = BeanUtil.toBean(bo, OaFurnitureTable.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OaFurnitureTable entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除家具
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

View File

@@ -0,0 +1,32 @@
<?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.oa.mapper.OaFurnitureTableMapper">
<resultMap type="com.ruoyi.oa.domain.OaFurnitureTable" id="OaFurnitureTableResult">
<result property="furnitureId" column="furniture_id"/>
<result property="companyName" column="company_name"/>
<result property="state" column="state"/>
<result property="procurementOfProducts" column="procurement_of_products"/>
<result property="contactGroup" column="contact_group"/>
<result property="phone" column="phone"/>
<result property="fax" column="fax"/>
<result property="address" column="address"/>
<result property="zip" column="zip"/>
<result property="email" column="email"/>
<result property="website" column="website"/>
<result property="emailSendCount" column="email_send_count"/>
<result property="lastEmailSendTime" column="last_email_send_time"/>
<result property="contactPerson" column="contact_person"/>
<result property="receiveCount" column="receive_count"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>