lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

联系单等各个单据的数据录入

Browse Source
This commit is contained in:
xiaozhou
2025-07-03 20:22:41 +08:00
parent ed866615c6
commit a4ed96f448
13 changed files with 504 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/documentOperations/WordToPdfToImg.java
View File

@ -1,5 +1,6 @@
package org.dromara.common.utils.documentOperations;
import io.swagger.v3.oas.annotations.security.OAuthFlow;
import jakarta.annotation.Resource;
import org.docx4j.Docx4J;
import org.docx4j.openpackaging.exceptions.Docx4JException;
@ -10,6 +11,7 @@ import org.apache.pdfbox.rendering.PDFRenderer;
import org.dromara.common.oss.core.OssClient;
import org.dromara.system.domain.vo.SysOssUploadVo;
import org.dromara.system.service.ISysOssService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
@ -25,7 +27,7 @@ import static org.dromara.common.constant.MinioPathConstant.ContactNotice;
@Component
public class WordToPdfToImg {
@Resource
@Autowired
private ISysOssService ossService;
/**
@ -117,7 +119,7 @@ public class WordToPdfToImg {
"image/png", // ContentType
new ByteArrayInputStream(imageOut.toByteArray()) // 文件内容
);
return ossService.uploadWithNoSave(image,ossService.minioFileName(ContactNotice,wordFile));
return ossService.uploadWithNoSave(image,ossService.minioFileName(ContactNotice,image));
}
// public static void main(String[] args) throws Exception {

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/controller/BusContactformtemplateController.java
View File

@ -21,6 +21,7 @@ import org.dromara.cory.domain.vo.BusContactformtemplateVo;
import org.dromara.cory.domain.bo.BusContactformtemplateBo;
import org.dromara.cory.service.IBusContactformtemplateService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
/**
* 联系单模板
@ -45,6 +46,16 @@ public class BusContactformtemplateController extends BaseController {
return busContactformtemplateService.queryPageList(bo, pageQuery);
}
/**
* 查询联系单模板列表
*/
@SaCheckPermission("cory:contactformtemplate:listNoPage")
@GetMapping("/listNoPage")
public R<List<BusContactformtemplateVo>> listNoPage(BusContactformtemplateBo bo) {
return R.ok(busContactformtemplateService.queryList(bo));
}
/**
* 导出联系单模板列表
*/
@ -75,10 +86,13 @@ public class BusContactformtemplateController extends BaseController {
@Log(title = "联系单模板", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody BusContactformtemplateBo bo) {
return toAjax(busContactformtemplateService.insertByBo(bo));
public R<Void> add(
BusContactformtemplateBo bo,
@RequestPart("file") MultipartFile file) {
return toAjax(busContactformtemplateService.insertByBo(bo,file));
}
/**
* 修改联系单模板
*/

105
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/controller/BusContactnoticeController.java Normal file
View File

@ -0,0 +1,105 @@
package org.dromara.cory.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.cory.domain.vo.BusContactnoticeVo;
import org.dromara.cory.domain.bo.BusContactnoticeBo;
import org.dromara.cory.service.IBusContactnoticeService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 联系单
*
* @author Lion Li
* @date 2025-07-03
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/cory/contactnotice")
public class BusContactnoticeController extends BaseController {
private final IBusContactnoticeService busContactnoticeService;
/**
* 查询联系单列表
*/
@SaCheckPermission("cory:contactnotice:list")
@GetMapping("/list")
public TableDataInfo<BusContactnoticeVo> list(BusContactnoticeBo bo, PageQuery pageQuery) {
return busContactnoticeService.queryPageList(bo, pageQuery);
}
/**
* 导出联系单列表
*/
@SaCheckPermission("cory:contactnotice:export")
@Log(title = "联系单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(BusContactnoticeBo bo, HttpServletResponse response) {
List<BusContactnoticeVo> list = busContactnoticeService.queryList(bo);
ExcelUtil.exportExcel(list, "联系单", BusContactnoticeVo.class, response);
}
/**
* 获取联系单详细信息
*
* @param id 主键
*/
@SaCheckPermission("cory:contactnotice:query")
@GetMapping("/{id}")
public R<BusContactnoticeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(busContactnoticeService.queryById(id));
}
/**
* 新增联系单
*/
@SaCheckPermission("cory:contactnotice:add")
@Log(title = "联系单", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody BusContactnoticeBo bo) {
return toAjax(busContactnoticeService.insertByBo(bo));
}
/**
* 修改联系单
*/
@SaCheckPermission("cory:contactnotice:edit")
@Log(title = "联系单", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusContactnoticeBo bo) {
return toAjax(busContactnoticeService.updateByBo(bo));
}
/**
* 删除联系单
*
* @param ids 主键串
*/
@SaCheckPermission("cory:contactnotice:remove")
@Log(title = "联系单", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(busContactnoticeService.deleteWithValidByIds(List.of(ids), true));
}
}

51
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/BusContactnotice.java Normal file
View File

@ -0,0 +1,51 @@
package org.dromara.cory.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 联系单对象 bus_contactnotice
*
* @author Lion Li
* @date 2025-07-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("bus_contactnotice")
public class BusContactnotice extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 自增ID
*/
@TableId(value = "id")
private Long id;
/**
* 项目ID
*/
private Long projectId;
/**
* 模板类型
*/
private Long type;
/**
* 文档内容
*/
private String detail;
/**
* 备注
*/
private String remark;
}

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/BusContactformtemplateBo.java
View File

@ -29,6 +29,7 @@ public class BusContactformtemplateBo extends BaseEntity {
*/
private String name;
/**
* 模板路径
*/
@ -44,6 +45,4 @@ public class BusContactformtemplateBo extends BaseEntity {
*/
private String remark;
private MultipartFile file;
}

42
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/BusContactnoticeBo.java Normal file
View File

@ -0,0 +1,42 @@
package org.dromara.cory.domain.bo;
import org.dromara.cory.domain.BusContactnotice;
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.*;
/**
* 联系单业务对象 bus_contactnotice
*
* @author Lion Li
* @date 2025-07-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = BusContactnotice.class, reverseConvertGenerate = false)
public class BusContactnoticeBo extends BaseEntity {
/**
* 项目ID
*/
@NotNull(message = "项目ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long projectId;
/**
* 模板类型
*/
@NotNull(message = "模板类型不能为空", groups = { AddGroup.class, EditGroup.class })
private Long type;
/**
* 文档内容
*/
@NotBlank(message = "文档内容不能为空", groups = { AddGroup.class, EditGroup.class })
private String detail;
}

56
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/BusContactnoticeVo.java Normal file
View File

@ -0,0 +1,56 @@
package org.dromara.cory.domain.vo;
import org.dromara.cory.domain.BusContactnotice;
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;
/**
* 联系单视图对象 bus_contactnotice
*
* @author Lion Li
* @date 2025-07-03
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = BusContactnotice.class)
public class BusContactnoticeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 自增ID
*/
@ExcelProperty(value = "自增ID")
private Long id;
/**
* 项目ID
*/
@ExcelProperty(value = "项目ID")
private Long projectId;
/**
* 模板类型
*/
@ExcelProperty(value = "模板类型")
private Long type;
/**
* 文档内容
*/
@ExcelProperty(value = "文档内容")
private String detail;
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/BusContactnoticeMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.cory.mapper;
import org.dromara.cory.domain.BusContactnotice;
import org.dromara.cory.domain.vo.BusContactnoticeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 联系单Mapper接口
*
* @author Lion Li
* @date 2025-07-03
*/
public interface BusContactnoticeMapper extends BaseMapperPlus<BusContactnotice, BusContactnoticeVo> {
}

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IBusContactformtemplateService.java
View File

@ -5,6 +5,7 @@ import org.dromara.cory.domain.vo.BusContactformtemplateVo;
import org.dromara.cory.domain.bo.BusContactformtemplateBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.Collection;
@ -49,7 +50,7 @@ public interface IBusContactformtemplateService {
* @param bo 联系单模板
* @return 是否新增成功
*/
Boolean insertByBo(BusContactformtemplateBo bo);
Boolean insertByBo(BusContactformtemplateBo bo, MultipartFile file);
/**
* 修改联系单模板

68
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IBusContactnoticeService.java Normal file
View File

@ -0,0 +1,68 @@
package org.dromara.cory.service;
import org.dromara.cory.domain.vo.BusContactnoticeVo;
import org.dromara.cory.domain.bo.BusContactnoticeBo;
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 Lion Li
* @date 2025-07-03
*/
public interface IBusContactnoticeService {
/**
* 查询联系单
*
* @param id 主键
* @return 联系单
*/
BusContactnoticeVo queryById(Long id);
/**
* 分页查询联系单列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 联系单分页列表
*/
TableDataInfo<BusContactnoticeVo> queryPageList(BusContactnoticeBo bo, PageQuery pageQuery);
/**
* 查询符合条件的联系单列表
*
* @param bo 查询条件
* @return 联系单列表
*/
List<BusContactnoticeVo> queryList(BusContactnoticeBo bo);
/**
* 新增联系单
*
* @param bo 联系单
* @return 是否新增成功
*/
Boolean insertByBo(BusContactnoticeBo bo);
/**
* 修改联系单
*
* @param bo 联系单
* @return 是否修改成功
*/
Boolean updateByBo(BusContactnoticeBo bo);
/**
* 校验并批量删除联系单信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/BusContactformtemplateServiceImpl.java
View File

@ -46,6 +46,9 @@ public class BusContactformtemplateServiceImpl implements IBusContactformtemplat
@Autowired
private ISysOssService ossService;
@Autowired
private WordToPdfToImg wordToPdfToImg;
/**
* 查询联系单模板
@ -101,22 +104,22 @@ public class BusContactformtemplateServiceImpl implements IBusContactformtemplat
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(BusContactformtemplateBo bo) {
public Boolean insertByBo(BusContactformtemplateBo bo,MultipartFile file) {
//1、将word文档转换成图片,随后存储到minio
try {
MultipartFile file = bo.getFile();
SysOssUploadVo wordEntity = ossService.uploadWithNoSave(file, ossService.minioFileName(ContactNotice,file));
SysOssUploadVo wordEntity = ossService.uploadWithNoSave(file, ossService.minioFileName(ContactNoticeTemplate,file));
if (wordEntity==null) {
throw new RuntimeException("未找到word模板文件！");
}
SysOssUploadVo imgEntity = new WordToPdfToImg().convertWordToImage(file);
SysOssUploadVo imgEntity = wordToPdfToImg.convertWordToImage(file);
if (imgEntity==null) {
throw new RuntimeException("未找到缩略图模板文件！");
}
bo.setName(wordEntity.getUrl());
bo.setPath(wordEntity.getUrl());
bo.setThumbnail(imgEntity.getUrl());
}catch (Exception e){
throw new RuntimeException("word转图片错误！"+e.getMessage());
// throw new RuntimeException("word转图片错误！"+e.getMessage());
System.out.println("word转图片错误！"+e.getMessage());
}
//2、新增数据
BusContactformtemplate add = MapstructUtils.convert(bo, BusContactformtemplate.class);

128
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/BusContactnoticeServiceImpl.java Normal file
View File

@ -0,0 +1,128 @@
package org.dromara.cory.service.impl;
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.cory.domain.bo.BusContactnoticeBo;
import org.dromara.cory.domain.vo.BusContactnoticeVo;
import org.dromara.cory.domain.BusContactnotice;
import org.dromara.cory.mapper.BusContactnoticeMapper;
import org.dromara.cory.service.IBusContactnoticeService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 联系单Service业务层处理
*
* @author Lion Li
* @date 2025-07-03
*/
@RequiredArgsConstructor
@Service
public class BusContactnoticeServiceImpl implements IBusContactnoticeService {
private final BusContactnoticeMapper baseMapper;
/**
* 查询联系单
*
* @param id 主键
* @return 联系单
*/
@Override
public BusContactnoticeVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询联系单列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 联系单分页列表
*/
@Override
public TableDataInfo<BusContactnoticeVo> queryPageList(BusContactnoticeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<BusContactnotice> lqw = buildQueryWrapper(bo);
Page<BusContactnoticeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的联系单列表
*
* @param bo 查询条件
* @return 联系单列表
*/
@Override
public List<BusContactnoticeVo> queryList(BusContactnoticeBo bo) {
LambdaQueryWrapper<BusContactnotice> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<BusContactnotice> buildQueryWrapper(BusContactnoticeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<BusContactnotice> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(BusContactnotice::getId);
lqw.eq(bo.getProjectId() != null, BusContactnotice::getProjectId, bo.getProjectId());
lqw.eq(bo.getType() != null, BusContactnotice::getType, bo.getType());
lqw.eq(StringUtils.isNotBlank(bo.getDetail()), BusContactnotice::getDetail, bo.getDetail());
return lqw;
}
/**
* 新增联系单
*
* @param bo 联系单
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(BusContactnoticeBo bo) {
BusContactnotice add = MapstructUtils.convert(bo, BusContactnotice.class);
validEntityBeforeSave(add);
return baseMapper.insert(add) > 0;
}
/**
* 修改联系单
*
* @param bo 联系单
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(BusContactnoticeBo bo) {
BusContactnotice update = MapstructUtils.convert(bo, BusContactnotice.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(BusContactnotice entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除联系单信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/cory/BusContactnoticeMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?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.cory.mapper.BusContactnoticeMapper">
</mapper>