SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

模板管理优化

Browse Source
This commit is contained in:
18792927508
2024-02-06 10:54:39 +08:00
parent c7149351bc
commit d73e891c3c
12 changed files with 385 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/IDeptIdentifyService.java
+18 -2
View File
@@ -9,6 +9,7 @@ import com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage;
import com.ruoyi.wisdomarbitrate.domain.dto.template.TemplateManage;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
public interface IDeptIdentifyService {
@@ -37,9 +38,9 @@ public interface IDeptIdentifyService {
AjaxResult updateDeptIdentify(DeptIdentify deptIdentify);
AjaxResult insertTemplate(TemplateManage templateManage , MultipartFile file);
AjaxResult insertTemplate(TemplateManage templateManage );
AjaxResult updateTemplate(TemplateManage templateManage, MultipartFile file);
AjaxResult updateTemplate(TemplateManage templateManage);
AjaxResult deleteTemplate(Long id);
@@ -62,4 +63,19 @@ public interface IDeptIdentifyService {
* @return
*/
List<FatchRule> getTemplateInfoById(TemplateManage templateManage);
/**
* 上传附件
* @param file
* @param annexType
* @return
*/
AjaxResult uploadFile(MultipartFile file, Integer annexType) throws IOException;
/**
* 根据模板id查询详情
* @param id
* @return
*/
AjaxResult getTemplateDetail(Long id);
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/impl/DeptIdentifyServiceImpl.java
+72 -45
View File
@@ -13,10 +13,12 @@ import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.AnnexTypeEnum;
import com.ruoyi.common.enums.TemplateTypeEnum;
import com.ruoyi.common.exception.EsignDemoException;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SealUtil;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.system.mapper.*;
import com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify;
import com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage;
@@ -41,6 +43,7 @@ import java.io.File;
import java.io.IOException;
import java.time.LocalDate;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -73,6 +76,7 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
private SysDictDataMapper dictDataMapper;
@Override
@Transactional
public List<DeptIdentify> selectDeptIdentify(DeptIdentify deptIdentify) {
@@ -405,70 +409,41 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
return null;
}
@Transactional
@Override
public AjaxResult insertTemplate(TemplateManage templateManage, MultipartFile file) {
//参数校验
if (templateManage.getIdentifyId() == null || file == null || templateManage.getTemName() == null) {
return AjaxResult.error("请检查参数是否完整");
}
if (templateManage.getTemType() == null) {
templateManage.setTemType(1); //默认模板类型为1(裁决书)
}
try {
String filePath = RuoYiConfig.getUploadPath();
// 上传
String fileName = FileUploadUtils.upload(filePath, file);
templateManage.setTemOrigPath(fileName);
String format = getFileExtension(fileName);
templateManage.setTemFormat(format);
templateManage.setFileName(file.getOriginalFilename());
public AjaxResult insertTemplate(TemplateManage templateManage) {
templateManage.setCreateBy(getUsername());
int i = templateManageMapper.insertTemplateManage(templateManage);
templateManage.setId(templateManage.getId());
templateManageMapper.updateFileByIds(templateManage);
if (i > 0) {
return AjaxResult.success("新增成功");
}
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
@Transactional
@Override
public AjaxResult updateTemplate(TemplateManage templateManage, MultipartFile file) {
public AjaxResult updateTemplate(TemplateManage templateManage) {
Long id = templateManage.getId();
if (id == null) {
return AjaxResult.error();
}
try {
if (file != null && file.getSize() > 0) {
String filePath = RuoYiConfig.getUploadPath();
// 上传
String fileName = FileUploadUtils.upload(filePath, file);
templateManage.setTemOrigPath(fileName);
templateManage.setFileName(file.getOriginalFilename());
String format = getFileExtension(fileName);
templateManage.setTemFormat(format);
}
templateManage.setUpdateBy(getUsername());
int i = templateManageMapper.updateTemplateManage(templateManage);
// 先删除附件
if(CollectionUtil.isNotEmpty(templateManage.getAnnexIds())) {
templateManageMapper.deleteTemplateManageFileById(id, templateManage.getAnnexIds());
// 修改附件表
templateManageMapper.updateFileByIds(templateManage);
}
if (i > 0) {
return AjaxResult.success("修改成功");
}
} catch (IOException e) {
e.printStackTrace();
}
return AjaxResult.error();
}
@Transactional
@Override
public AjaxResult deleteTemplate(Long id) {
TemplateManage templateManage = new TemplateManage();
templateManage.setId(id);
templateManage.setDelFlag(2);
int i = templateManageMapper.updateTemplateManage(templateManage);
int i = templateManageMapper.deleteTemplateManage(id);
if (i > 0) {
return AjaxResult.success("删除成功");
}
@@ -620,6 +595,58 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
return fatchRuleList;
}
@Transactional
@Override
public AjaxResult uploadFile(MultipartFile file, Integer annexType) throws IOException {
// 上传文件路径
String filePath = RuoYiConfig.getUploadPath();
// 上传并返回新文件名称
String fileName = FileUploadUtils.upload(filePath, file);
TemplateManage templateManage=new TemplateManage();
templateManage.setTemOrigPath(fileName);
String format = getFileExtension(fileName);
templateManage.setTemFormat(format);
templateManage.setFileName(file.getOriginalFilename());
templateManage.setTemType(annexType);
int i = templateManageMapper.insertTemplateManageFile(templateManage);
if(i<1){
return AjaxResult.error("上传失败");
}
AjaxResult ajax = AjaxResult.success();
ajax.put("annexId", templateManage.getFileId());
ajax.put("annexType", annexType);
ajax.put("url", fileName);
ajax.put("fileName", fileName);
ajax.put("newFileName", FileUtils.getName(fileName));
ajax.put("originalFilename", file.getOriginalFilename());
return ajax;
}
@Override
public AjaxResult getTemplateDetail(Long id) {
List<TemplateManage> list = templateManageMapper.selectTemplateListById(id);
if(CollectionUtil.isEmpty(list)){
return AjaxResult.error("模板不存在");
}
Map<Integer, TemplateManage> manageMap = list.stream().collect(Collectors.toMap(TemplateManage::getTemType, Function.identity(), (oldValue, newValue) -> newValue));
AjaxResult ajax = AjaxResult.success();
ajax.put("id",id);
ajax.put("identifyId",list.get(0).getIdentifyId());
if(list.get(0).getIdentifyId()!=null) {
// 查询机构名称
ajax.put("identifyName", deptIdentifyMapper.selectById(list.get(0).getIdentifyId()));
}
ajax.put("temName",list.get(0).getTemName());
// 调节申请书
ajax.put("applicationFile",manageMap.get(TemplateTypeEnum.MEDIATION_APPLICATION.getCode()));
// 和解协议
ajax.put("agreementFile",manageMap.get(TemplateTypeEnum.MEDIATION_AGREEMENT.getCode()));
// 调解书
ajax.put("bookFile",manageMap.get(TemplateTypeEnum.MEDIATE_BOOK.getCode()));
return ajax;
}
private String getFileExtension(String fileName) {
int lastDotIndex = fileName.lastIndexOf(".");